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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  add some links
  Fix the link
  Update staging container

docs/concepts/index.md

@@ -10,10 +10,10 @@ To work with Kubernetes, you use *Kubernetes API objects* to describe your clust
 
 Once you've set your desired state, the *Kubernetes Control Plane* works to make the cluster's current state match the desired state. To do so, Kubernetes performs a variety of tasks automatically--such as starting or restarting containers, scaling the number of replicas of a given application, and more. The Kubernetes Control Plane consists of a collection of processes running on your cluster: 
 
-* The **Kubernetes Master** is a collection of three processes that run on a single node in your cluster, which is designated as the master node. Those processes are: kube-apiserver, kube-controller-manager and kube-scheduler.
+* The **Kubernetes Master** is a collection of three processes that run on a single node in your cluster, which is designated as the master node. Those processes are: [kube-apiserver](/docs/admin/kube-apiserver/), [kube-controller-manager](/docs/admin/kube-controller-manager/) and [kube-scheduler](/docs/admin/kube-scheduler/).
 * Each individual non-master node in your cluster runs two processes:
-  * **kubelet**, which communicates with the Kubernetes Master.
-  * **kube-proxy**, a network proxy which reflects Kubernetes networking services on each node.
+  * **[kubelet](/docs/admin/kubelet/)**, which communicates with the Kubernetes Master.
+  * **[kube-proxy](/docs/admin/kube-proxy/)**, a network proxy which reflects Kubernetes networking services on each node.
 
 ## Kubernetes Objects
 

docs/concepts/overview/components.md

@@ -98,7 +98,7 @@ in their DNS searches.
 #### User interface
 
 The kube-ui provides a read-only overview of the cluster state.  Access
-[the UI using kubectl proxy](/docs/user-guide/connecting-to-applications-proxy/#connecting-to-the-kube-ui-service-from-your-local-workstation)
+[Using an HTTP Proxy to Access the Kubernetes API](/docs/tasks/access-kubernetes-api/http-proxy-access-api/)
 
 #### Container Resource Monitoring
 

docs/contribute/stage-documentation-changes.md

@@ -61,7 +61,7 @@ for this image.
 1. In the root of your cloned repository, enter this command to start a local
 web server:
 
-        docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0
+        docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.1
 
 1. View your staged content at
 [http://localhost:4000](http://localhost:4000){: target="_blank"}.