Merge remote-tracking branch 'origin' into release-1.4

docs/user-guide/kubectl/kubectl_drain.md

@@ -12,13 +12,13 @@ Drain node in preparation for maintenance
 Drain node in preparation for maintenance.
 
 The given node will be marked unschedulable to prevent new pods from arriving.
-Then drain deletes all pods except mirror pods (which cannot be deleted through
+The `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 markings.  If there are any
-pods that are neither mirror pods nor managed--by ReplicationController,
-ReplicaSet, DaemonSet or Job--, then drain will not delete any pods unless you
+pods that are neither mirror pods nor managed by ReplicationController,
+ReplicaSet, DaemonSet or Job, then drain will not delete any pods unless you
 use --force.
 
 When you are ready to put the node back into service, use kubectl uncordon, which

docs/user-guide/kubectl/kubectl_version.md

@@ -49,7 +49,7 @@ kubectl version
 
 ### SEE ALSO
 
-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
+* [kubectl](../kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
 ###### Auto generated by spf13/cobra on 2-Sep-2016