Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fix the command output
  delete invalid link
  Revert "fix the command output"
  fix the command output
  Delete the useless spaces
  Dollar signs used before commands without showing output
  bare-url-used
  Fix typo in authorization docs
  Update networking.md

docs/admin/authorization/index.md

@@ -262,7 +262,7 @@ current-context: webhook
 contexts:
 - context:
     cluster: name-of-remote-authz-service
-    user: name-of-api-sever
+    user: name-of-api-server
   name: webhook
 ```
 

docs/admin/cluster-management.md

@@ -19,7 +19,7 @@ To install Kubernetes on a set of machines, consult one of the existing [Getting
 
 ## Upgrading a cluster
 
-The current state of cluster upgrades is provider dependent, and some releases may require special care when upgrading. It is recommended that administrators consult both the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md), as well as the version specific upgrade notes prior to upgrading their clusters.  
+The current state of cluster upgrades is provider dependent, and some releases may require special care when upgrading. It is recommended that administrators consult both the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md), as well as the version specific upgrade notes prior to upgrading their clusters.
 
 * [Upgrading to 1.6](/docs/admin/upgrade-1-6)
 
@@ -58,12 +58,12 @@ The node upgrade process is user-initiated and is described in the [GKE document
 
 ### Upgrading clusters on other platforms
 
-Different providers, and tools, will manage upgrades differently.  It is recommended that you consult their main documentation regarding upgrades. 
+Different providers, and tools, will manage upgrades differently.  It is recommended that you consult their main documentation regarding upgrades.
 
 * [kops](https://github.com/kubernetes/kops)
 * [kargo](https://github.com/kubernetes-incubator/kargo)
 * [CoreOS Tectonic](https://coreos.com/tectonic/docs/latest/admin/upgrade.html)
-* ... 
+* ...
 
 ## Resizing a cluster
 
@@ -78,7 +78,6 @@ Instance Group will take care of putting appropriate image on new machines and s
 
 In other environments you may need to configure the machine yourself and tell the Kubelet on which machine API server is running.
 
-
 ### Cluster autoscaling
 
 If you are using GCE or GKE, you can configure your cluster so that it is automatically rescaled based on
@@ -97,7 +96,7 @@ an extended period of time (10min but it may change in the future).
 
 Cluster autoscaler is configured per instance group (GCE) or node pool (GKE).
 
-If you are using GCE then you can either enable it while creating a cluster with kube-up.sh script. 
+If you are using GCE then you can either enable it while creating a cluster with kube-up.sh script.
 To configure cluster autoscaler you have to set three environment variables:
 
 * `KUBE_ENABLE_CLUSTER_AUTOSCALER` - it enables cluster autoscaler if set to true.
@@ -196,7 +195,7 @@ for changes to this variable to take effect.
 You can use `kubectl convert` command to convert config files between different API versions.
 
 ```shell
-$ kubectl convert -f pod.yaml --output-version v1
+kubectl convert -f pod.yaml --output-version v1
 ```
 
 For more options, please refer to the usage of [kubectl convert](/docs/user-guide/kubectl/kubectl_convert/) command.

docs/admin/federation/index.md

@@ -247,7 +247,7 @@ federation, and
 in your federation DNS.
 
 You can find more details about config maps in general at
-http://kubernetes.io/docs/user-guide/configmap/.
+[config map](http://kubernetes.io/docs/user-guide/configmap/).
 
 ### Kubernetes 1.4 and earlier: Setting federations flag on kube-dns-rc