Merge pull request #12651 from juanvallejo/jvallejo/fix-link-in-oadm-drain

OpenShift Bot · web-flow · commit 3e38a698185e · 2017-01-26T11:27:15.000-05:00
Merged by openshift-bot
diff --git a/docs/man/man1/oadm-drain.1 b/docs/man/man1/oadm-drain.1
@@ -27,7 +27,7 @@ When you are ready to put the node back into service, use kubectl uncordon, whic
 
 .PP
 ! 
-\[la]http://kubernetes.io/images/docs/kubectl\[ra] \_drain.svg
+\[la]http://kubernetes.io/images/docs/kubectl_drain.svg\[ra]
 
 
 .SH OPTIONS
diff --git a/docs/man/man1/oc-adm-drain.1 b/docs/man/man1/oc-adm-drain.1
@@ -27,7 +27,7 @@ When you are ready to put the node back into service, use kubectl uncordon, whic
 
 .PP
 ! 
-\[la]http://kubernetes.io/images/docs/kubectl\[ra] \_drain.svg
+\[la]http://kubernetes.io/images/docs/kubectl_drain.svg\[ra]
 
 
 .SH OPTIONS
diff --git a/docs/man/man1/openshift-admin-drain.1 b/docs/man/man1/openshift-admin-drain.1
@@ -27,7 +27,7 @@ When you are ready to put the node back into service, use kubectl uncordon, whic
 
 .PP
 ! 
-\[la]http://kubernetes.io/images/docs/kubectl\[ra] \_drain.svg
+\[la]http://kubernetes.io/images/docs/kubectl_drain.svg\[ra]
 
 
 .SH OPTIONS
diff --git a/docs/man/man1/openshift-cli-adm-drain.1 b/docs/man/man1/openshift-cli-adm-drain.1
@@ -27,7 +27,7 @@ When you are ready to put the node back into service, use kubectl uncordon, whic
 
 .PP
 ! 
-\[la]http://kubernetes.io/images/docs/kubectl\[ra] \_drain.svg
+\[la]http://kubernetes.io/images/docs/kubectl_drain.svg\[ra]
 
 
 .SH OPTIONS
diff --git a/pkg/cmd/admin/admin.go b/pkg/cmd/admin/admin.go
@@ -76,7 +76,7 @@ func NewCommandAdmin(name, fullName string, in io.Reader, out io.Writer, errout
 				node.NewCommandManageNode(f, node.ManageNodeCommandName, fullName+" "+node.ManageNodeCommandName, out, errout),
 				cmdutil.ReplaceCommandName("kubectl", fullName, templates.Normalize(kubecmd.NewCmdCordon(f, out))),
 				cmdutil.ReplaceCommandName("kubectl", fullName, templates.Normalize(kubecmd.NewCmdUncordon(f, out))),
-				cmdutil.ReplaceCommandName("kubectl", fullName, templates.Normalize(kubecmd.NewCmdDrain(f, out, errout))),
+				cmdutil.ReplaceCommandName("kubectl", fullName, kubecmd.NewCmdDrain(f, out, errout)),
 				cmdutil.ReplaceCommandName("kubectl", fullName, templates.Normalize(kubecmd.NewCmdTaint(f, out))),
 				network.NewCmdPodNetwork(network.PodNetworkCommandName, fullName+" "+network.PodNetworkCommandName, f, out, errout),
 			},

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ When you are ready to put the node back into service, use kubectl uncordon, whic`
`27`	`27`
`28`	`28`	`.PP`
`29`	`29`	`!`
`30`		`-\[la]http://kubernetes.io/images/docs/kubectl\[ra] \_drain.svg`
	`30`	`+\[la]http://kubernetes.io/images/docs/kubectl_drain.svg\[ra]`
`31`	`31`
`32`	`32`
`33`	`33`	`.SH OPTIONS`