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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  getting-started-guides: add CoreOS Tectonic
  add DefaultTolerationSeconds admission controller
  Move Guide topic: Connect with Proxies. (#2663)
  Move Guide topic: Bootstrapping Pet Sets. (#2662)
  Move Guide topic: Using Port Forwarding. (#2661)
  fix typo (#2656)
  Move Guide topic: Using Environment Variables. (#2645)
  missing word
  Prototype for deprecating User Guide topic.
  Update static-pods.md
  Update static-pods.md

docs/admin/admission-controllers.md

@@ -252,6 +252,11 @@ This plugin ignores any `PersistentVolumeClaim` updates, it acts only on creatio
 See [persistent volume](/docs/user-guide/persistent-volumes) documentation about persistent volume claims and
 storage classes and how to mark a storage class as default.
 
+### DefaultTolerationSeconds
+
+This plug-in sets the default forgiveness toleration for pods, which have no forgiveness tolerations, to tolerate
+the taints `notready:NoExecute` and `unreachable:NoExecute` for 5 minutes.
+
 ## Is there a recommended set of plug-ins to use?
 
 Yes.

docs/admin/namespaces/index.md

@@ -44,9 +44,9 @@ You can list the current namespaces in a cluster using:
 
 ```shell
 $ kubectl get namespaces
-NAME          LABELS    STATUS
-default       <none>    Active
-kube-system   <none>    Active
+NAME          STATUS    AGE
+default       Active    11d
+kube-system   Active    11d
 ```
 
 Kubernetes starts with two initial namespaces:

docs/admin/static-pods.md

@@ -22,45 +22,46 @@ For example, this is how to start a simple web server as a static pod:
 
 1. Choose a node where we want to run the static pod. In this example, it's `my-node1`.
 
-```shell
-[joe@host ~] $ ssh my-node1
-```
+    ```
+    [joe@host ~] $ ssh my-node1
+    ```
 
 2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubelet.d/static-web.yaml`:
 
-```shell
-[root@my-node1 ~] $ mkdir /etc/kubelet.d/
-[root@my-node1 ~] $ cat <<EOF >/etc/kubelet.d/static-web.yaml
-apiVersion: v1
-kind: Pod
-metadata:
-  name: static-web
-  labels:
-    role: myrole
-spec:
-  containers:
-    - name: web
-      image: nginx
-      ports:
+    ```
+    [root@my-node1 ~] $ mkdir /etc/kubernetes.d/
+    [root@my-node1 ~] $ cat <<EOF >/etc/kubernetes.d/static-web.yaml
+    apiVersion: v1
+    kind: Pod
+    metadata:
+      name: static-web
+      labels:
+        role: myrole
+    spec:
+      containers:
         - name: web
-          containerPort: 80
-          protocol: TCP
-EOF
-```
+          image: nginx
+          ports:
+            - name: web
+              containerPort: 80
+              protocol: TCP
+    EOF
+    ```
 
-2. Configure your kubelet daemon on the node to use this directory by running it with `--pod-manifest-path=/etc/kubelet.d/` argument.  On Fedora edit `/etc/kubernetes/kubelet` to include this line:
+3. Configure your kubelet daemon on the node to use this directory by running it with `--pod-manifest-path=/etc/kubelet.d/` argument.
+    On Fedora edit `/etc/kubernetes/kubelet` to include this line:
 
-```conf
-KUBELET_ARGS="--cluster-dns=10.254.0.10 --cluster-domain=kube.local --pod-manifest-path=/etc/kubelet.d/"
-```
+    ```
+    KUBELET_ARGS="--cluster-dns=10.254.0.10 --cluster-domain=kube.local --pod-manifest-path=/etc/kubelet.d/"
+    ```
 
-Instructions for other distributions or Kubernetes installations may vary.
+    Instructions for other distributions or Kubernetes installations may vary.
 
-3. Restart kubelet. On Fedora, this is:
+4. Restart kubelet. On Fedora, this is:
 
-```shell
-[root@my-node1 ~] $ systemctl restart kubelet
-```
+    ```
+    [root@my-node1 ~] $ systemctl restart kubelet
+    ```
 
 ## Pods created via HTTP