Merge branch 'master' into concepts-root

docs/deprecation-policy.md

@@ -83,11 +83,14 @@ approximately 3 months (4 per year).  The following table describes which API
 versions are supported in a series of subsequent releases.
 
 <table>
+  <thead>
     <tr>
       <th>Release</th>
       <th>API Versions</th>
       <th>Notes</th>
     </tr>
+  </thead>
+  <tbody>
     <tr>
       <td>X</td>
       <td>v1</td>
@@ -164,6 +167,7 @@ versions are supported in a series of subsequent releases.
         </ul>
       </td>
     </tr>
+  </tbody>
 </table>
 
 ### REST resources (aka API objects)

docs/user-guide/kubectl/kubectl_config.md

@@ -14,7 +14,7 @@ Modify kubeconfig files using subcommands like "kubectl config set current-conte
 The loading order follows these rules:
 
   1. If the --kubeconfig flag is set, then only that file is loaded.  The flag may only be set once and no merging takes place.
-  2. If $KUBECONFIG environment variable is set, then it is used a list of paths (normal path delimitting rules for your system).  These paths are merged.  When a value is modified, it is modified in the file that defines the stanza.  When a value is created, it is created in the first file that exists.  If no files in the chain exist, then it creates the last file in the list.
+  2. If $KUBECONFIG environment variable is set, then it is used as a list of paths (normal path delimitting rules for your system).  These paths are merged.  When a value is modified, it is modified in the file that defines the stanza.  When a value is created, it is created in the first file that exists.  If no files in the chain exist, then it creates the last file in the list.
   3. Otherwise, ${HOME}/.kube/config is used and no merging takes place.
 
 ```

docs/user-guide/volumes.md

@@ -531,6 +531,39 @@ before you can use it__
 
 See the [Quobyte example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/volumes/quobyte) for more details.
 
+## Using subPath
+
+Sometimes, it is useful to share one volume for multiple uses in a single pod. The `volumeMounts.subPath`
+property can be used to specify a sub-path inside the referenced volume instead of its root.
+
+Here is an example of a pod with a LAMP stack (Linux Apache Mysql PHP) using a single, shared volume.
+The HTML contents are mapped to its `html` folder, and the databases will be stored in its `mysql` folder:
+
+```yaml
+apiVersion: v1
+kind: Pod
+metadata:
+  name: my-lamp-site
+spec:
+    containers:
+    - name: mysql
+      image: mysql
+      volumeMounts:
+      - mountPath: /var/lib/mysql
+        name: site-data
+        subPath: mysql
+    - name: php
+      image: php
+      volumeMounts:
+      - mountPath: /var/www/html
+        name: site-data
+        subPath: html
+    volumes:
+    - name: site-data
+      persistentVolumeClaim:
+        claimName: my-lamp-site-data
+```
+
 ## Resources
 
 The storage media (Disk, SSD, etc.) of an `emptyDir` volume is determined by the