Merge branch 'master' into patch-1

docs/user-guide/environment-guide/containers/README.md

@@ -1,23 +0,0 @@
-## Building
-
-For each container, the build steps are the same. The examples below
-are for the `show` container. Replace `show` with `backend` for the
-backend container.
-
-## Google Container Registry ([GCR](https://cloud.google.com/tools/container-registry/))
-
-    docker build -t gcr.io/<project-name>/show .
-    gcloud docker push gcr.io/<project-name>/show
-
-## Docker Hub
-
-    docker build -t <username>/show .
-    docker push <username>/show
-
-## Change Pod Definitions
-
-Edit both `show-rc.yaml` and `backend-rc.yaml` and replace the
-specified `image:` with the one that you built.
-
-
-

docs/user-guide/pod-templates.md

@@ -1,8 +1,9 @@
 ---
 assignees:
 - erictune
-
+title: Pod Templates
 ---
+
 Pod templates are [pod](/docs/user-guide/pods/) specifications which are included in other objects, such as
 [Replication Controllers](/docs/user-guide/replication-controller/), [Jobs](/docs/user-guide/jobs/), and
 [DaemonSets](/docs/admin/daemons/).  Controllers use Pod Templates to make actual pods.

docs/user-guide/pods/init-container.md

@@ -1,7 +1,7 @@
 ---
 assignees:
 - erictune
-
+title: Init Containers
 ---
 
 * TOC

docs/user-guide/secrets/index.md

@@ -113,8 +113,8 @@ metadata:
   name: mysecret
 type: Opaque
 data:
-  password: MWYyZDFlMmU2N2Rm
   username: YWRtaW4=
+  password: MWYyZDFlMmU2N2Rm
 ```
 
 The data field is a map.  Its keys must match
@@ -142,8 +142,8 @@ Get back the secret created in the previous section:
 $ kubectl get secret mysecret -o yaml
 apiVersion: v1
 data:
-  password: MWYyZDFlMmU2N2Rm
   username: YWRtaW4=
+  password: MWYyZDFlMmU2N2Rm
 kind: Secret
 metadata:
   creationTimestamp: 2016-01-22T18:41:56Z