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

@@ -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
@@ -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
 

docs/concepts/cluster-administration/networking.md

@@ -107,6 +107,10 @@ imply any preferential status.
 
 [Contiv](https://github.com/contiv/netplugin) provides configurable networking (native l3 using BGP, overlay using vxlan,  classic l2, or Cisco-SDN/ACI) for various use cases. [Contiv](http://contiv.io) is all open sourced.
 
+### Contrail
+
+[Contrail](http://www.juniper.net/us/en/products-services/sdn/contrail/contrail-networking/), based on [OpenContrail](http://www.opencontrail.org), is a truly open, multi-cloud network virtualization and policy management platform. Contrail / OpenContrail is integrated with various orchestration systems such as Kubernetes, OpenShift, OpenStack and Mesos, and provides different isolation modes for virtual machines, containers/pods and bare metal workloads.
+
 ### Flannel
 
 [Flannel](https://github.com/coreos/flannel#flannel) is a very simple overlay

docs/concepts/storage/volumes.md

@@ -44,9 +44,9 @@ medium that backs it, and the contents of it are determined by the particular
 volume type used.
 
 To use a volume, a pod specifies what volumes to provide for the pod (the
-[`spec.volumes`](http://kubernetes.io/kubernetes/third_party/swagger-ui/#!/v1/createPod)
+`spec.volumes`
 field) and where to mount those into containers(the
-[`spec.containers.volumeMounts`](http://kubernetes.io/kubernetes/third_party/swagger-ui/#!/v1/createPod)
+`spec.containers.volumeMounts`
 field).
 
 A process in a container sees a filesystem view composed from their Docker

docs/tutorials/stateless-application/run-stateless-ap-replication-controller.md

@@ -205,8 +205,8 @@ A successful get command returns all replication controllers on the cluster in
 the specified or default namespace. For example:
 
 ```shell
-CONTROLLER            CONTAINER(S)   IMAGE(S)  SELECTOR        REPLICAS
-frontend              php-redis      redis     name=frontend   2
+NAME       DESIRED   CURRENT   READY     AGE
+frontend   2         2         2         1h
 ```
 
 You can also use `get rc NAME` to return information about a specific