Merge branch 'master' into release-1.8

docs/concepts/cluster-administration/logging.md

@@ -33,7 +33,7 @@ $ kubectl create -f https://k8s.io/docs/tasks/debug-application-cluster/counter-
 pod "counter" created
 ```
 
-To fetch the logs, use the `kubectl logs` command, as follows
+To fetch the logs, use the `kubectl logs` command, as follows:
 
 ```shell
 $ kubectl logs counter

docs/concepts/cluster-administration/networking.md

@@ -37,7 +37,7 @@ review the "normal" way that networking works with Docker.  By default, Docker
 uses host-private networking.  It creates a virtual bridge, called `docker0` by
 default, and allocates a subnet from one of the private address blocks defined
 in [RFC1918](https://tools.ietf.org/html/rfc1918) for that bridge.  For each
-container that Docker creates, it allocates a virtual ethernet device (called
+container that Docker creates, it allocates a virtual Ethernet device (called
 `veth`) which is attached to the bridge. The veth is mapped to appear as `eth0`
 in the container, using Linux namespaces.  The in-container `eth0` interface is
 given an IP address from the bridge's address range.

docs/concepts/policy/pod-security-policy.md

@@ -42,7 +42,7 @@ _Pod Security Policies_ are comprised of settings and strategies that
 control the security features a pod has access to. These settings fall
 into three categories:
 
-- *Controlled by a boolean*: Fields of this type default to the most
+- *Controlled by a Boolean*: Fields of this type default to the most
 restrictive value.
 - *Controlled by an allowable set*: Fields of this type are checked
 against the set to ensure their values are allowed.
@@ -193,7 +193,7 @@ podsecuritypolicy "permissive" deleted
 In order to use Pod Security Policies in your cluster you must ensure the
 following
 
-1.  You have enabled the api type `extensions/v1beta1/podsecuritypolicy` (only for versions prior 1.6)
+1.  You have enabled the API type `extensions/v1beta1/podsecuritypolicy` (only for versions prior 1.6)
 1.  You have enabled the admission controller `PodSecurityPolicy`
 1.  You have defined your policies
 

docs/concepts/policy/resource-quotas.md

@@ -30,7 +30,7 @@ Resource quotas work like this:
 
 Examples of policies that could be created using namespaces and quotas are:
 
-- In a cluster with a capacity of 32 GiB RAM, and 16 cores, let team A use 20 Gib and 10 cores,
+- In a cluster with a capacity of 32 GiB RAM, and 16 cores, let team A use 20 GiB and 10 cores,
   let B use 10GiB and 4 cores, and hold 2GiB and 2 cores in reserve for future allocation.
 - Limit the "testing" namespace to using 1 core and 1GiB RAM.  Let the "production" namespace
   use any amount.

docs/concepts/storage/volumes.md

@@ -581,18 +581,27 @@ __Important: You must create VMDK using one of the following method before using
 
 #### Creating a VMDK volume
 
-* Create using vmkfstools.
+Choose one of the following methods to create a VMDK.
 
-   First ssh into ESX and then use following command to create vmdk,
+{% capture vmkfstools %}
+First ssh into ESX, then use the following command to create a VMDK:
 
 ```shell
-    vmkfstools -c 2G /vmfs/volumes/DatastoreName/volumes/myDisk.vmdk
+vmkfstools -c 2G /vmfs/volumes/DatastoreName/volumes/myDisk.vmdk
 ```
+{% endcapture %}
+
+{% capture vdiskmanager %}
+Use the following command to create a VMDK:
 
-* Create using vmware-vdiskmanager.
 ```shell
-  vmware-vdiskmanager -c -t 0 -s 40GB -a lsilogic myDisk.vmdk
+vmware-vdiskmanager -c -t 0 -s 40GB -a lsilogic myDisk.vmdk
 ```
+{% endcapture %}
+
+{% assign tab_names = 'Create using vmkfstools,Create using vmware-vdiskmanager' | split: ',' | compact %}
+{% assign tab_contents = site.emptyArray | push: vmkfstools | push: vdiskmanager %}
+{% include tabs.md %}
 
 #### vSphere VMDK Example configuration