From 1e5ce735fcf70ee03c64371839c0ef685f8fa1fc Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 17 Mar 2016 15:54:39 -0700 Subject: [PATCH] Fix typo in help for kubectl drain --- docs/man/man1/kubectl-drain.1 | 2 +- docs/user-guide/kubectl/kubectl_drain.md | 2 +- pkg/kubectl/cmd/drain.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/man/man1/kubectl-drain.1 b/docs/man/man1/kubectl-drain.1 index 0e5132ecfd6..7e6112373fb 100644 --- a/docs/man/man1/kubectl-drain.1 +++ b/docs/man/man1/kubectl-drain.1 @@ -21,7 +21,7 @@ Then drain deletes all pods except mirror pods (which cannot be deleted through the API server). If there are DaemonSet\-managed pods, drain will not proceed without \-\-ignore\-daemonsets, and regardless it will not delete any DaemonSet\-managed pods, because those pods would be immediately replaced by the -DaemonSet controller, which ignores unschedulable marknigs. If there are any +DaemonSet controller, which ignores unschedulable markings. If there are any pods that are neither mirror pods nor managed\-\-by ReplicationController, DaemonSet or Job\-\-, then drain will not delete any pods unless you use \-\-force. diff --git a/docs/user-guide/kubectl/kubectl_drain.md b/docs/user-guide/kubectl/kubectl_drain.md index 5c9e07821eb..4f121808281 100644 --- a/docs/user-guide/kubectl/kubectl_drain.md +++ b/docs/user-guide/kubectl/kubectl_drain.md @@ -46,7 +46,7 @@ Then drain deletes all pods except mirror pods (which cannot be deleted through the API server). If there are DaemonSet-managed pods, drain will not proceed without --ignore-daemonsets, and regardless it will not delete any DaemonSet-managed pods, because those pods would be immediately replaced by the -DaemonSet controller, which ignores unschedulable marknigs. If there are any +DaemonSet controller, which ignores unschedulable markings. If there are any pods that are neither mirror pods nor managed--by ReplicationController, DaemonSet or Job--, then drain will not delete any pods unless you use --force. diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go index 8314c183e84..1455f486e57 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain.go @@ -103,7 +103,7 @@ Then drain deletes all pods except mirror pods (which cannot be deleted through the API server). If there are DaemonSet-managed pods, drain will not proceed without --ignore-daemonsets, and regardless it will not delete any DaemonSet-managed pods, because those pods would be immediately replaced by the -DaemonSet controller, which ignores unschedulable marknigs. If there are any +DaemonSet controller, which ignores unschedulable markings. If there are any pods that are neither mirror pods nor managed--by ReplicationController, DaemonSet or Job--, then drain will not delete any pods unless you use --force.