Revert "Update links to avoid redirects." (#5617)

* Revert "Fix the doc example" This reverts commit 2872def62b. * Revert "add the set of sessionAffinity timeoutseconds (#5474)" This reverts commit 657734de6f. * Revert "pod-security-policy.md: fix broken link to PSP proposal." This reverts commit 8db51e099f. * Revert "fix typo" This reverts commit 24e5383071. * Revert "Update images.md" This reverts commit f844a41502. * Revert "Update links to avoid redirects. (#5614)" This reverts commit 35c7393849.
2017-09-25 13:43:15 -07:00 · 2017-09-25 13:43:15 -07:00 · 7792c801e3
parent 2872def62b
commit 7792c801e3
103 changed files with 277 additions and 277 deletions
--- a/docs/admin/authorization/rbac.md
+++ b/docs/admin/authorization/rbac.md
@ -504,7 +504,7 @@ This is commonly used by add-on API servers for unified authentication and autho
 <tr>
 <td><b>system:kube-dns</b></td>
 <td><b>kube-dns</b> service account in the <b>kube-system</b> namespace</td>
-<td>Role for the <a href="/docs/concepts/services-networking/dns-pod-service/">kube-dns</a> component.</td>
+<td>Role for the <a href="/docs/admin/dns/">kube-dns</a> component.</td>
 </tr>
 <tr>
 <td><b>system:node-bootstrapper</b></td>
--- a/docs/admin/federation/index.md
+++ b/docs/admin/federation/index.md
@ -17,10 +17,10 @@ This guide explains how to set up cluster federation that lets us control multip
 ## Prerequisites

 This guide assumes that you have a running Kubernetes cluster.
-If you need to start a new cluster, see the [getting started guides](/docs/home/) for instructions on bringing a cluster up.
+If you need to start a new cluster, see the [getting started guides](/docs/getting-started-guides/) for instructions on bringing a cluster up.

 To use the commands in this guide, you must download a Kubernetes release from the 
-[getting started binary releases](/docs/home/binary_release/) and 
+[getting started binary releases](/docs/getting-started-guides/binary_release/) and 
 extract into a directory; all the commands in this guide are run from
 that directory.

--- a/docs/admin/high-availability/index.md
+++ b/docs/admin/high-availability/index.md
@ -6,7 +6,7 @@ title: Building High-Availability Clusters

 This document describes how to build a high-availability (HA) Kubernetes cluster.  This is a fairly advanced topic.
 Users who merely want to experiment with Kubernetes are encouraged to use configurations that are simpler to set up such
-as [Minikube](/docs/home/minikube/)
+as [Minikube](/docs/getting-started-guides/minikube/)
 or try [Google Container Engine](https://cloud.google.com/container-engine/) for hosted Kubernetes.

 Also, at this time high availability support for Kubernetes is not continuously tested in our end-to-end (e2e) testing.  We will
--- a/docs/api-reference/apps/v1beta1/definitions.html
+++ b/docs/api-reference/apps/v1beta1/definitions.html
@ -3620,7 +3620,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">nodeSelector</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#8217;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/concepts/configuration/assign-pod-node/">http://kubernetes.io/docs/concepts/configuration/assign-pod-node/</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#8217;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/user-guide/node-selection">http://kubernetes.io/docs/user-guide/node-selection</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">object</p></td>
 <td class="tableblock halign-left valign-top"></td>
--- a/docs/api-reference/batch/v1/definitions.html
+++ b/docs/api-reference/batch/v1/definitions.html
@ -3609,7 +3609,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">nodeSelector</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#8217;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/concepts/configuration/assign-pod-node/">http://kubernetes.io/docs/concepts/configuration/assign-pod-node/</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#8217;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/user-guide/node-selection">http://kubernetes.io/docs/user-guide/node-selection</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">object</p></td>
 <td class="tableblock halign-left valign-top"></td>
--- a/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/docs/api-reference/extensions/v1beta1/definitions.html
@ -3457,7 +3457,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">nodeSelector</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#8217;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/concepts/configuration/assign-pod-node/">http://kubernetes.io/docs/concepts/configuration/assign-pod-node/</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#8217;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/user-guide/node-selection">http://kubernetes.io/docs/user-guide/node-selection</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">object</p></td>
 <td class="tableblock halign-left valign-top"></td>
--- a/docs/api-reference/v1.5/index.html
+++ b/docs/api-reference/v1.5/index.html
@ -8010,7 +8010,7 @@ Appears In <a href="#pod-v1">Pod</a> <a href="#podtemplatespec-v1">PodTemplateSp
 </tr>
 <tr>
 <td>nodeSelector <br /> <em>object</em></td>
-<td>NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#39;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/concepts/configuration/assign-pod-node/">http://kubernetes.io/docs/concepts/configuration/assign-pod-node/</a></td>
+<td>NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#39;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/user-guide/node-selection">http://kubernetes.io/docs/user-guide/node-selection</a></td>
 </tr>
 <tr>
 <td>restartPolicy <br /> <em>string</em></td>
@ -18058,7 +18058,7 @@ Appears In <a href="#service-v1">Service</a> </aside>
 <tbody>
 <tr>
 <td>clusterIP <br /> <em>string</em></td>
-<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>deprecatedPublicIPs <br /> <em>string array</em></td>
@ -18078,23 +18078,23 @@ Appears In <a href="#service-v1">Service</a> </aside>
 </tr>
 <tr>
 <td>loadBalancerSourceRanges <br /> <em>string array</em></td>
-<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/-firewalls">http://kubernetes.io/docs/concepts/services-networking/service/-firewalls</a></td>
+<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/user-guide/services-firewalls">http://kubernetes.io/docs/user-guide/services-firewalls</a></td>
 </tr>
 <tr>
 <td>ports <br /> <em><a href="#serviceport-v1">ServicePort</a> array</em></td>
-<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>selector <br /> <em>object</em></td>
-<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 <tr>
 <td>sessionAffinity <br /> <em>string</em></td>
-<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>type <br /> <em>string</em></td>
-<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 </tbody>
 </table>
@ -51143,7 +51143,7 @@ Appears In  <a href="#servicespec-v1">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>nodePort <br /> <em>integer</em></td>
-<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport">http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport</a></td>
+<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/user-guide/services#type--nodeport">http://kubernetes.io/docs/user-guide/services#type--nodeport</a></td>
 </tr>
 <tr>
 <td>port <br /> <em>integer</em></td>
@ -51155,7 +51155,7 @@ Appears In  <a href="#servicespec-v1">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>targetPort <br /> <em><a href="#intorstring-intstr">IntOrString</a></em></td>
-<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service">http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service</a></td>
+<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/user-guide/services#defining-a-service">http://kubernetes.io/docs/user-guide/services#defining-a-service</a></td>
 </tr>
 </tbody>
 </table>
--- a/docs/api-reference/v1.6/index.html
+++ b/docs/api-reference/v1.6/index.html
@ -17950,7 +17950,7 @@ Appears In <a href="#service-v1-core">Service</a> </aside>
 <tbody>
 <tr>
 <td>clusterIP <br /> <em>string</em></td>
-<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>deprecatedPublicIPs <br /> <em>string array</em></td>
@ -17970,23 +17970,23 @@ Appears In <a href="#service-v1-core">Service</a> </aside>
 </tr>
 <tr>
 <td>loadBalancerSourceRanges <br /> <em>string array</em></td>
-<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/-firewalls">http://kubernetes.io/docs/concepts/services-networking/service/-firewalls</a></td>
+<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/user-guide/services-firewalls">http://kubernetes.io/docs/user-guide/services-firewalls</a></td>
 </tr>
 <tr>
 <td>ports <br /> <em><a href="#serviceport-v1-core">ServicePort</a> array</em></td>
-<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>selector <br /> <em>object</em></td>
-<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 <tr>
 <td>sessionAffinity <br /> <em>string</em></td>
-<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>type <br /> <em>string</em></td>
-<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 </tbody>
 </table>
@ -54388,7 +54388,7 @@ Appears In  <a href="#servicespec-v1-core">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>nodePort <br /> <em>integer</em></td>
-<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport">http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport</a></td>
+<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/user-guide/services#type--nodeport">http://kubernetes.io/docs/user-guide/services#type--nodeport</a></td>
 </tr>
 <tr>
 <td>port <br /> <em>integer</em></td>
@ -54400,7 +54400,7 @@ Appears In  <a href="#servicespec-v1-core">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>targetPort</td>
-<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service">http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service</a></td>
+<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/user-guide/services#defining-a-service">http://kubernetes.io/docs/user-guide/services#defining-a-service</a></td>
 </tr>
 </tbody>
 </table>
--- a/docs/api-reference/v1.7/index.html
+++ b/docs/api-reference/v1.7/index.html
@ -191,7 +191,7 @@ Appears In:
 </tr>
 <tr>
 <td>securityContext <br /> <em><a href="#securitycontext-v1-core">SecurityContext</a></em></td>
-<td>Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/tasks/configure-pod-container/security-context/">https://kubernetes.io/docs/tasks/configure-pod-container/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md">https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md</a></td>
+<td>Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/concepts/policy/security-context/">https://kubernetes.io/docs/concepts/policy/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md">https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md</a></td>
 </tr>
 <tr>
 <td>stdin <br /> <em>boolean</em></td>
--- a/docs/concepts/architecture/nodes.md
+++ b/docs/concepts/architecture/nodes.md
@ -81,7 +81,7 @@ The information is gathered by Kubelet from the node.

 ## Management

-Unlike [pods](/docs/user-guide/pods) and [services](/docs/concepts/services-networking/service/),
+Unlike [pods](/docs/user-guide/pods) and [services](/docs/user-guide/services),
 a node is not inherently created by Kubernetes: it is created externally by cloud
 providers like Google Compute Engine, or exists in your pool of physical or virtual
 machines. What this means is that when Kubernetes creates a node, it is really
--- a/docs/concepts/cluster-administration/cluster-administration-overview.md
+++ b/docs/concepts/cluster-administration/cluster-administration-overview.md
@ -21,7 +21,7 @@ Before choosing a guide, here are some considerations:
 - **If you are designing for high-availability**, learn about configuring [clusters in multiple zones](/docs/admin/multi-cluster/).
 - Will you be using **a hosted Kubernetes cluster**, such as [Google Container Engine (GKE)](https://cloud.google.com/container-engine/), or **hosting your own cluster**?
 - Will your cluster be **on-premises**, or **in the cloud (IaaS)**? Kubernetes does not directly support hybrid clusters. Instead, you can set up multiple clusters.
- - **If you are configuring Kubernetes on-premises**, consider which [networking model](/docs/concepts/cluster-administration/networking/) fits best. One option for custom networking is [*OpenVSwitch GRE/VxLAN networking*](/docs/admin/ovs-networking/), which uses OpenVSwitch to set up networking between pods across Kubernetes nodes.
+ - **If you are configuring Kubernetes on-premises**, consider which [networking model](/docs/admin/networking/) fits best. One option for custom networking is [*OpenVSwitch GRE/VxLAN networking*](/docs/admin/ovs-networking/), which uses OpenVSwitch to set up networking between pods across Kubernetes nodes.
 - Will you be running Kubernetes on **"bare metal" hardware** or on **virtual machines (VMs)**?
 - Do you **just want to run a cluster**, or do you expect to do **active development of Kubernetes project code**? If the
   latter, choose a actively-developed distro. Some distros only use binary releases, but
--- a/docs/concepts/cluster-administration/kubelet-garbage-collection.md
+++ b/docs/concepts/cluster-administration/kubelet-garbage-collection.md
@ -72,4 +72,4 @@ Including:
 | `--low-diskspace-threshold-mb` | `--eviction-hard` or `eviction-soft` | eviction generalizes disk thresholds to other resources |
 | `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources |

-See [Configuring Out Of Resource Handling](/docs/tasks/administer-cluster/out-of-resource/) for more details.
+See [Configuring Out Of Resource Handling](/docs/concepts/cluster-administration/out-of-resource/) for more details.
--- a/docs/concepts/cluster-administration/manage-deployment.md
+++ b/docs/concepts/cluster-administration/manage-deployment.md
@ -256,7 +256,7 @@ my-nginx-2035384211-u3t6x   1/1       Running   0          23m       fe

 This outputs all "app=nginx" pods, with an additional label column of pods' tier (specified with `-L` or `--label-columns`).

-For more information, please see [labels](/docs/concepts/overview/working-with-objects/labels/) and [kubectl label](/docs/user-guide/kubectl/{{page.version}}/#label) document.
+For more information, please see [labels](/docs/user-guide/labels/) and [kubectl label](/docs/user-guide/kubectl/{{page.version}}/#label) document.

 ## Updating annotations

--- a/docs/concepts/configuration/assign-pod-node.md
+++ b/docs/concepts/configuration/assign-pod-node.md
@ -16,7 +16,7 @@ that a pod ends up on a machine with an SSD attached to it, or to co-locate pods
 services that communicate a lot into the same availability zone.

 You can find all the files for these examples [in our docs
-repo here](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/concepts/configuration/assign-pod-node/).
+repo here](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/node-selection).

 * TOC
 {:toc}
--- a/docs/concepts/configuration/manage-compute-resources-container.md
+++ b/docs/concepts/configuration/manage-compute-resources-container.md
@ -27,7 +27,7 @@ CPU and memory are collectively referred to as *compute resources*, or just
 resources are measurable quantities that can be requested, allocated, and
 consumed. They are distinct from
 [API resources](/docs/concepts/overview/kubernetes-api/). API resources, such as Pods and
-[Services](/docs/concepts/services-networking/service/) are objects that can be read and modified
+[Services](/docs/user-guide/services) are objects that can be read and modified
 through the Kubernetes API server.

 ## Resource requests and limits of Pod and Container
--- a/docs/concepts/configuration/overview.md
+++ b/docs/concepts/configuration/overview.md
@ -58,7 +58,7 @@ This is a living document. If you think of something that is not on this list bu

 ## Using Labels

- Define and use [labels](/docs/concepts/overview/working-with-objects/labels/) that identify __semantic attributes__ of your application or deployment. For example, instead of attaching a label to a set of pods to explicitly represent some service (For example, `service: myservice`), or explicitly representing the replication controller managing the pods  (for example, `controller: mycontroller`), attach labels that identify semantic attributes, such as `{ app: myapp, tier: frontend, phase: test, deployment: v3 }`. This will let you select the object groups appropriate to the context— for example, a service for all "tier: frontend" pods, or all "test" phase components of app "myapp". See the [guestbook](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/guestbook/) app for an example of this approach.
+- Define and use [labels](/docs/user-guide/labels/) that identify __semantic attributes__ of your application or deployment. For example, instead of attaching a label to a set of pods to explicitly represent some service (For example, `service: myservice`), or explicitly representing the replication controller managing the pods  (for example, `controller: mycontroller`), attach labels that identify semantic attributes, such as `{ app: myapp, tier: frontend, phase: test, deployment: v3 }`. This will let you select the object groups appropriate to the context— for example, a service for all "tier: frontend" pods, or all "test" phase components of app "myapp". See the [guestbook](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/guestbook/) app for an example of this approach.

  A service can be made to span multiple deployments, such as is done across [rolling updates](/docs/tasks/run-application/rolling-update-replication-controller/), by simply omitting release-specific labels from its selector, rather than updating a service's selector to match the replication controller's selector fully.

@ -84,7 +84,7 @@ This is a living document. If you think of something that is not on this list bu

 - Use `kubectl delete` rather than `stop`. `Delete` has a superset of the functionality of `stop`, and `stop` is deprecated.

- Use kubectl bulk operations (via files and/or labels) for get and delete. See [label selectors](/docs/concepts/overview/working-with-objects/labels/#label-selectors) and [using labels effectively](/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively).
+- Use kubectl bulk operations (via files and/or labels) for get and delete. See [label selectors](/docs/user-guide/labels/#label-selectors) and [using labels effectively](/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively).

 - Use `kubectl run` and `expose` to quickly create and expose single container Deployments. See the [quick start guide](/docs/user-guide/quick-start/) for an example.

--- a/docs/concepts/containers/container-environment-variables.md
+++ b/docs/concepts/containers/container-environment-variables.md
@ -31,7 +31,7 @@ It is available through the `hostname` command or the
 function call in libc.

 The Pod name and namespace are available as environment variables through the
-[downward API](/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/).
+[downward API](/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information/).

 User defined environment variables from the Pod definition are also available to the Container,
 as are any environment variables specified statically in the Docker image.
--- a/docs/concepts/overview/what-is-kubernetes.md
+++ b/docs/concepts/overview/what-is-kubernetes.md
@ -121,7 +121,7 @@ The name **Kubernetes** originates from Greek, meaning *helmsman* or *pilot*, an
 {% endcapture %}

 {% capture whatsnext %}
-*   Ready to [Get Started](/docs/home/)?
+*   Ready to [Get Started](/docs/getting-started-guides/)?
 *   For more details, see the [Kubernetes Documentation](/docs/home/).
 {% endcapture %}
 {% include templates/concept.md %}
--- a/docs/concepts/overview/working-with-objects/annotations.md
+++ b/docs/concepts/overview/working-with-objects/annotations.md
@ -55,7 +55,7 @@ and the like.
 {% endcapture %}

 {% capture whatsnext %}
-Learn more about [Labels and Selectors](/docs/concepts/overview/working-with-objects/labels/).
+Learn more about [Labels and Selectors](/docs/user-guide/labels/).
 {% endcapture %}

 {% include templates/concept.md %}
--- a/docs/concepts/overview/working-with-objects/labels.md
+++ b/docs/concepts/overview/working-with-objects/labels.md
@ -130,7 +130,7 @@ $ kubectl get pods -l 'environment,environment notin (frontend)'

 ### Set references in API objects

-Some Kubernetes objects, such as [`services`](/docs/concepts/services-networking/service/) and [`replicationcontrollers`](/docs/user-guide/replication-controller), also use label selectors to specify sets of other resources, such as [pods](/docs/user-guide/pods).
+Some Kubernetes objects, such as [`services`](/docs/user-guide/services) and [`replicationcontrollers`](/docs/user-guide/replication-controller), also use label selectors to specify sets of other resources, such as [pods](/docs/user-guide/pods).

 #### Service and ReplicationController

@ -170,4 +170,4 @@ selector:
 #### Selecting sets of nodes

 One use case for selecting over labels is to constrain the set of nodes onto which a pod can schedule.
-See the documentation on [node selection](/docs/concepts/configuration/assign-pod-node/) for more information.
+See the documentation on [node selection](/docs/user-guide/node-selection) for more information.
--- a/docs/concepts/overview/working-with-objects/namespaces.md
+++ b/docs/concepts/overview/working-with-objects/namespaces.md
@ -72,7 +72,7 @@ $ kubectl config view | grep namespace:

 ## Namespaces and DNS

-When you create a [Service](/docs/concepts/services-networking/service/), it creates a corresponding [DNS entry](/docs/admin/dns).
+When you create a [Service](/docs/user-guide/services), it creates a corresponding [DNS entry](/docs/admin/dns).
 This entry is of the form `<service-name>.<namespace-name>.svc.cluster.local`, which means
 that if a container just uses `<service-name>`, it will resolve to the service which
 is local to a namespace.  This is useful for using the same configuration across
--- a/docs/concepts/services-networking/network-policies.md
+++ b/docs/concepts/services-networking/network-policies.md
@ -77,7 +77,7 @@ So, the example NetworkPolicy:
 2. allows connections to TCP port 6379 of "role=db" pods in the "default" namespace from any pod in the "default" namespace with the label "role=frontend"
 3. allows connections to TCP port 6379 of "role=db" pods in the "default" namespace from any pod in a namespace with the label "project=myproject"

-See the [NetworkPolicy getting started guide](/docs/home/network-policy/walkthrough) for further examples.
+See the [NetworkPolicy getting started guide](/docs/getting-started-guides/network-policy/walkthrough) for further examples.

 ## Default policies

--- a/docs/concepts/storage/persistent-volumes.md
+++ b/docs/concepts/storage/persistent-volumes.md
@ -315,7 +315,7 @@ Claims, like pods, can request specific quantities of a resource.  In this case,

 ### Selector

-Claims can specify a [label selector](/docs/concepts/overview/working-with-objects/labels/#label-selectors) to further filter the set of volumes. Only the volumes whose labels match the selector can be bound to the claim. The selector can consist of two fields:
+Claims can specify a [label selector](/docs/user-guide/labels/#label-selectors) to further filter the set of volumes. Only the volumes whose labels match the selector can be bound to the claim. The selector can consist of two fields:

 * matchLabels - the volume must have a label with this value
 * matchExpressions - a list of requirements made by specifying key, list of values, and operator that relates the key and values. Valid operators include In, NotIn, Exists, and DoesNotExist.
--- a/docs/concepts/storage/volumes.md
+++ b/docs/concepts/storage/volumes.md
@ -454,7 +454,7 @@ details.
 A `downwardAPI` volume is used to make downward API data available to applications.
 It mounts a directory and writes the requested data in plain text files.

-See the [`downwardAPI` volume example](/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/)  for more details.
+See the [`downwardAPI` volume example](/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information/)  for more details.

 ### projected

@ -572,7 +572,7 @@ More details can be found [here](https://github.com/kubernetes/examples/tree/{{p

 ### vsphereVolume

-**Prerequisite:** Kubernetes with vSphere Cloud Provider configured. For cloudprovider configuration please refer [vSphere getting started guide](/docs/home/vsphere/).
+**Prerequisite:** Kubernetes with vSphere Cloud Provider configured. For cloudprovider configuration please refer [vSphere getting started guide](/docs/getting-started-guides/vsphere/).
 {: .note}

 A `vsphereVolume` is used to mount a vSphere VMDK Volume into your Pod.  The contents
--- a/docs/concepts/workloads/controllers/petset.md
+++ b/docs/concepts/workloads/controllers/petset.md
@ -227,7 +227,7 @@ web-1

 A pet can piece together its own identity:

-1. Use the [downward api](/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/) to find its pod name
+1. Use the [downward api](/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information/) to find its pod name
 2. Run `hostname` to find its DNS name
 3. Run `mount` or `df` to find its volumes (usually this is unnecessary)

@ -434,7 +434,7 @@ Deploying one RC of size 1/Service per pod is a popular alternative, as is simpl

 ## Next steps

-* Learn about [StatefulSet](/docs/concepts/workloads/controllers/statefulset/),
+* Learn about [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/),
  the replacement for PetSet introduced in Kubernetes version 1.5.
 * [Migrate your existing PetSets to StatefulSets](/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/)
  when upgrading to Kubernetes version 1.5 or higher.
--- a/docs/concepts/workloads/controllers/replicaset.md
+++ b/docs/concepts/workloads/controllers/replicaset.md
@ -12,7 +12,7 @@ ReplicaSet is the next-generation Replication Controller. The only difference
 between a _ReplicaSet_ and a
 [_Replication Controller_](/docs/concepts/workloads/controllers/replicationcontroller/) right now is
 the selector support. ReplicaSet supports the new set-based selector requirements
-as described in the [labels user guide](/docs/concepts/overview/working-with-objects/labels/#label-selectors)
+as described in the [labels user guide](/docs/user-guide/labels/#label-selectors)
 whereas a Replication Controller only supports equality-based selector requirements.

 {% endcapture %}
--- a/docs/concepts/workloads/controllers/replicationcontroller.md
+++ b/docs/concepts/workloads/controllers/replicationcontroller.md
@ -129,7 +129,7 @@ different, and the `.metadata.labels` do not affect the behavior of the Replicat

 ### Pod Selector

-The `.spec.selector` field is a [label selector](/docs/concepts/overview/working-with-objects/labels/#label-selectors). A ReplicationController
+The `.spec.selector` field is a [label selector](/docs/user-guide/labels/#label-selectors). A ReplicationController
 manages all the pods with labels that match the selector. It does not distinguish
 between pods that it created or deleted and pods that another person or process created or
 deleted. This allows the ReplicationController to be replaced without affecting the running pods.
@ -243,7 +243,7 @@ object](/docs/api-reference/{{page.version}}/#replicationcontroller-v1-core).

 ### ReplicaSet

-[`ReplicaSet`](/docs/concepts/workloads/controllers/replicaset/) is the next-generation ReplicationController that supports the new [set-based label selector](/docs/concepts/overview/working-with-objects/labels/#set-based-requirement).
+[`ReplicaSet`](/docs/concepts/workloads/controllers/replicaset/) is the next-generation ReplicationController that supports the new [set-based label selector](/docs/user-guide/labels/#set-based-requirement).
 It’s mainly used by [`Deployment`](/docs/concepts/workloads/controllers/deployment/) as a mechanism to orchestrate pod creation, deletion and updates.
 Note that we recommend using Deployments instead of directly using Replica Sets, unless you require custom update orchestration or don’t require updates at all.

--- a/docs/concepts/workloads/pods/disruptions.md
+++ b/docs/concepts/workloads/pods/disruptions.md
@ -72,7 +72,7 @@ Here are some ways to mitigate involuntary disruptions:
 and [stateful](/docs/tasks/run-application/run-replicated-stateful-application/) applications.)
 - For even higher availability when running replicated applications,
 spread applications across racks (using
-[anti-affinity](/docs/concepts/configuration/assign-pod-node//#inter-pod-affinity-and-anti-affinity-beta-feature))
+[anti-affinity](/docs/user-guide/node-selection/#inter-pod-affinity-and-anti-affinity-beta-feature))
 or across zones (if using a
 [multi-zone cluster](/docs/admin/multiple-zones).)

--- a/docs/concepts/workloads/pods/init-containers.md
+++ b/docs/concepts/workloads/pods/init-containers.md
@ -87,7 +87,7 @@ Here are some ideas for how to use Init Containers:
  place the POD_IP value in a configuration and generate the main app
  configuration file using Jinja.

-More detailed usage examples can be found in the [StatefulSets documentation](/docs/concepts/workloads/controllers/statefulset/)
+More detailed usage examples can be found in the [StatefulSets documentation](/docs/concepts/abstractions/controllers/statefulsets/)
 and the [Production Pods guide](/docs/tasks/#handling-initialization).

 ### Init Containers in use
--- a/docs/concepts/workloads/pods/pod-overview.md
+++ b/docs/concepts/workloads/pods/pod-overview.md
@ -64,7 +64,7 @@ A Controller can create and manage multiple Pods for you, handling replication a
 Some examples of Controllers that contain one or more pods include:

 * [Deployment](/docs/concepts/workloads/controllers/deployment/)
-* [StatefulSet](/docs/concepts/workloads/controllers/statefulset/)
+* [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/)
 * [DaemonSet](/docs/concepts/workloads/controllers/daemonset/)

 In general, Controllers use a Pod Template that you provide to create the Pods for which it is responsible.
--- a/docs/concepts/workloads/pods/pod.md
+++ b/docs/concepts/workloads/pods/pod.md
@ -150,7 +150,7 @@ Pod is exposed as a primitive in order to facilitate:
 * clean composition of Kubelet-level functionality with cluster-level functionality &mdash; Kubelet is effectively the "pod controller"
 * high-availability applications, which will expect pods to be replaced in advance of their termination and certainly in advance of deletion, such as in the case of planned evictions, image prefetching, or live pod migration [#3949](http://issue.k8s.io/3949)

-There is new first-class support for stateful pods with the [StatefulSet](/docs/concepts/workloads/controllers/statefulset/) controller (currently in beta). The feature was alpha in 1.4 and was called [PetSet](/docs/concepts/workloads/controllers/petset/). For prior versions of Kubernetes, best practice for having stateful pods is to create a replication controller with `replicas` equal to `1` and a corresponding service, see [this MySQL deployment example](/docs/tutorials/stateful-application/run-stateful-application/).
+There is new first-class support for stateful pods with the [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/) controller (currently in beta). The feature was alpha in 1.4 and was called [PetSet](/docs/concepts/workloads/controllers/petset/). For prior versions of Kubernetes, best practice for having stateful pods is to create a replication controller with `replicas` equal to `1` and a corresponding service, see [this MySQL deployment example](/docs/tutorials/stateful-application/run-stateful-application/).

 ## Termination of Pods

--- a/docs/getting-started-guides/aws.md
+++ b/docs/getting-started-guides/aws.md
@ -165,9 +165,9 @@ cluster/kube-down.sh
 IaaS Provider        | Config. Mgmt | OS            | Networking  | Docs                                          | Conforms | Support Level
 -------------------- | ------------ | ------------- | ----------  | --------------------------------------------- | ---------| ----------------------------
 AWS                  | kops         | Debian        | k8s (VPC)   | [docs](https://github.com/kubernetes/kops)    |          | Community ([@justinsb](https://github.com/justinsb))
-AWS                  | CoreOS       | CoreOS        | flannel     | [docs](/docs/home/aws)      |          | Community
+AWS                  | CoreOS       | CoreOS        | flannel     | [docs](/docs/getting-started-guides/aws)      |          | Community

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

 ## Further reading

--- a/docs/getting-started-guides/binary_release.md
+++ b/docs/getting-started-guides/binary_release.md
@ -57,4 +57,4 @@ Possible values for `YOUR_PROVIDER` include:
 * `vsphere` - VMWare VSphere
 * `rackspace` - Rackspace

-For the complete, up-to-date list of providers supported by this script, see the [`/cluster`](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) folder in the main Kubernetes repo, where each folder represents a possible value for `YOUR_PROVIDER`. If you don't see your desired provider, try looking at our [getting started guides](/docs/home); there's a good chance we have docs for them.
+For the complete, up-to-date list of providers supported by this script, see the [`/cluster`](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) folder in the main Kubernetes repo, where each folder represents a possible value for `YOUR_PROVIDER`. If you don't see your desired provider, try looking at our [getting started guides](/docs/getting-started-guides); there's a good chance we have docs for them.
--- a/docs/getting-started-guides/centos/centos_manual_config.md
+++ b/docs/getting-started-guides/centos/centos_manual_config.md
@ -9,7 +9,7 @@ title: CentOS

 ## Warning

-This guide [has been deprecated](https://github.com/kubernetes/kubernetes.github.io/issues/1613). It was originally written for Kubernetes 1.1.0. Please check [the latest guide](/docs/home/kubeadm/).
+This guide [has been deprecated](https://github.com/kubernetes/kubernetes.github.io/issues/1613). It was originally written for Kubernetes 1.1.0. Please check [the latest guide](/docs/getting-started-guides/kubeadm/).

 ## Prerequisites

@ -233,6 +233,6 @@ centos-minion-3        Ready      3d      v1.6.0+fff5156

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Bare-metal           | custom       | CentOS | flannel     | [docs](/docs/home/centos/centos_manual_config)            |          | Community ([@coolsvap](https://github.com/coolsvap))
+Bare-metal           | custom       | CentOS | flannel     | [docs](/docs/getting-started-guides/centos/centos_manual_config)            |          | Community ([@coolsvap](https://github.com/coolsvap))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/getting-started-guides/cloudstack.md
+++ b/docs/getting-started-guides/cloudstack.md
@ -92,6 +92,6 @@ SSH to it using the key that was created and using the _core_ user and you can l

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-CloudStack           | Ansible      | CoreOS | flannel     | [docs](/docs/home/cloudstack)                             |          | Community ([@Guiques](https://github.com/ltupin/))
+CloudStack           | Ansible      | CoreOS | flannel     | [docs](/docs/getting-started-guides/cloudstack)                             |          | Community ([@Guiques](https://github.com/ltupin/))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/getting-started-guides/coreos/bare_metal_offline.md
+++ b/docs/getting-started-guides/coreos/bare_metal_offline.md
@ -213,7 +213,7 @@ Now for the good stuff!

 The following config files are tailored for the OFFLINE version of a Kubernetes deployment.

-These are based on the work found here: [master.yml](/docs/home/coreos/cloud-configs/master.yaml), [node.yml](/docs/home/coreos/cloud-configs/node.yaml)
+These are based on the work found here: [master.yml](/docs/getting-started-guides/coreos/cloud-configs/master.yaml), [node.yml](/docs/getting-started-guides/coreos/cloud-configs/node.yaml)

 To make the setup work, you need to replace a few placeholders:

@ -683,6 +683,6 @@ for i in `kubectl get pods | awk '{print $1}'`; do kubectl delete pod $i; done

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/home/coreos/bare_metal_offline/)              |          | Community ([@jeffbean](https://github.com/jeffbean))
+Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline/)              |          | Community ([@jeffbean](https://github.com/jeffbean))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions/) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions/) chart.
--- a/docs/getting-started-guides/coreos/index.md
+++ b/docs/getting-started-guides/coreos/index.md
@ -86,7 +86,7 @@ Configure a standalone Kubernetes or a Kubernetes cluster with [Foreman](https:/

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-GCE                  | CoreOS       | CoreOS | flannel     | [docs](/docs/home/coreos)                                 |          | Community ([@pires](https://github.com/pires))
-Vagrant              | CoreOS       | CoreOS | flannel     | [docs](/docs/home/coreos)                                 |          | Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles))
+GCE                  | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos)                                 |          | Community ([@pires](https://github.com/pires))
+Vagrant              | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos)                                 |          | Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/getting-started-guides/dcos.md
+++ b/docs/getting-started-guides/dcos.md
@ -138,6 +138,6 @@ $ dcos package uninstall kubernetes

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-DCOS                 | Marathon   | CoreOS/Alpine | custom | [docs](/docs/home/dcos/)                                   |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
+DCOS                 | Marathon   | CoreOS/Alpine | custom | [docs](/docs/getting-started-guides/dcos/)                                   |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/getting-started-guides/fedora/fedora_ansible_config.md
+++ b/docs/getting-started-guides/fedora/fedora_ansible_config.md
@ -235,6 +235,6 @@ That's it!

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Bare-metal           | Ansible      | Fedora | flannel     | [docs](/docs/home/fedora/fedora_ansible_config)           |          | Project
+Bare-metal           | Ansible      | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/fedora_ansible_config)           |          | Project

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/getting-started-guides/fedora/fedora_manual_config.md
+++ b/docs/getting-started-guides/fedora/fedora_manual_config.md
@ -193,7 +193,7 @@ kubectl delete -f ./node.json

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Bare-metal           | custom       | Fedora | _none_      | [docs](/docs/home/fedora/fedora_manual_config)            |          | Project
+Bare-metal           | custom       | Fedora | _none_      | [docs](/docs/getting-started-guides/fedora/fedora_manual_config)            |          | Project

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

--- a/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
+++ b/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
@ -9,7 +9,7 @@ title: Fedora (Multi Node)
 * TOC
 {:toc}

-This document describes how to deploy Kubernetes on multiple hosts to set up a multi-node cluster and networking with flannel. Follow fedora [getting started guide](/docs/home/fedora/fedora_manual_config/) to setup 1 master (fed-master) and 2 or more nodes. Make sure that all nodes have different names (fed-node1, fed-node2 and so on) and labels (fed-node1-label, fed-node2-label, and so on) to avoid any conflict. Also make sure that the Kubernetes master host is running etcd, kube-controller-manager, kube-scheduler, and kube-apiserver services, and the nodes are running docker, kube-proxy and kubelet services. Now install flannel on Kubernetes nodes. Flannel on each node configures an overlay network that docker uses. Flannel runs on each node to setup a unique class-C container network.
+This document describes how to deploy Kubernetes on multiple hosts to set up a multi-node cluster and networking with flannel. Follow fedora [getting started guide](/docs/getting-started-guides/fedora/fedora_manual_config/) to setup 1 master (fed-master) and 2 or more nodes. Make sure that all nodes have different names (fed-node1, fed-node2 and so on) and labels (fed-node1-label, fed-node2-label, and so on) to avoid any conflict. Also make sure that the Kubernetes master host is running etcd, kube-controller-manager, kube-scheduler, and kube-apiserver services, and the nodes are running docker, kube-proxy and kubelet services. Now install flannel on Kubernetes nodes. Flannel on each node configures an overlay network that docker uses. Flannel runs on each node to setup a unique class-C container network.

 ## Prerequisites

@ -188,11 +188,11 @@ Now Kubernetes multi-node cluster is set up with overlay networking set up by fl

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Bare-metal           | custom       | Fedora | flannel     | [docs](/docs/home/fedora/flannel_multi_node_cluster)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
-libvirt              | custom       | Fedora | flannel     | [docs](/docs/home/fedora/flannel_multi_node_cluster)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
-KVM                  | custom       | Fedora | flannel     | [docs](/docs/home/fedora/flannel_multi_node_cluster)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
+Bare-metal           | custom       | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
+libvirt              | custom       | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
+KVM                  | custom       | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))



-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

--- a/docs/getting-started-guides/gce.md
+++ b/docs/getting-started-guides/gce.md
@ -59,7 +59,7 @@ cluster/kube-up.sh

 If you want more than one cluster running in your project, want to use a different name, or want a different number of worker nodes, see the `<kubernetes>/cluster/gce/config-default.sh` file for more fine-grained configuration before you start up your cluster.

-If you run into trouble, please see the section on [troubleshooting](/docs/home/gce//#troubleshooting), post to the
+If you run into trouble, please see the section on [troubleshooting](/docs/getting-started-guides/gce/#troubleshooting), post to the
 [kubernetes-users group](https://groups.google.com/forum/#!forum/kubernetes-users), or come ask questions on [Slack](/docs/troubleshooting/#slack).

 The next few steps will show you:
@ -96,7 +96,7 @@ Once `kubectl` is in your path, you can use it to look at your cluster. E.g., ru
 $ kubectl get --all-namespaces services
 ```

-should show a set of [services](/docs/concepts/services-networking/service/) that look something like this:
+should show a set of [services](/docs/user-guide/services) that look something like this:

 ```shell
 NAMESPACE     NAME                  CLUSTER_IP       EXTERNAL_IP       PORT(S)        AGE
@ -202,9 +202,9 @@ field values:

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-GCE                  | Saltstack    | Debian | GCE         | [docs](/docs/home/gce/)                                    |   | Project
+GCE                  | Saltstack    | Debian | GCE         | [docs](/docs/getting-started-guides/gce)                                    |   | Project

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

 ## Further reading

--- a/docs/getting-started-guides/libvirt-coreos.md
+++ b/docs/getting-started-guides/libvirt-coreos.md
@ -332,8 +332,8 @@ Ensure libvirtd has been restarted since ebtables was installed.

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-libvirt/KVM          | CoreOS       | CoreOS | libvirt/KVM | [docs](/docs/home/libvirt-coreos/)                         |          | Community ([@lhuard1A](https://github.com/lhuard1A))
+libvirt/KVM          | CoreOS       | CoreOS | libvirt/KVM | [docs](/docs/getting-started-guides/libvirt-coreos)                         |          | Community ([@lhuard1A](https://github.com/lhuard1A))


-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

--- a/docs/getting-started-guides/mesos-docker.md
+++ b/docs/getting-started-guides/mesos-docker.md
@ -314,7 +314,7 @@ Breakdown:

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Mesos/Docker         | custom       | Ubuntu | Docker      | [docs](/docs/home/mesos-docker)                           |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
+Mesos/Docker         | custom       | Ubuntu | Docker      | [docs](/docs/getting-started-guides/mesos-docker)                           |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

--- a/docs/getting-started-guides/mesos/index.md
+++ b/docs/getting-started-guides/mesos/index.md
@ -309,10 +309,10 @@ Address 1: 10.10.10.1

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Mesos/GCE            |              |        |             | [docs](/docs/home/mesos/)                                  |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
+Mesos/GCE            |              |        |             | [docs](/docs/getting-started-guides/mesos/)                                  |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))


-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions/) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions/) chart.

 ## What next?

--- a/docs/getting-started-guides/openstack-heat.md
+++ b/docs/getting-started-guides/openstack-heat.md
@ -255,6 +255,6 @@ If you have changed the default `$STACK_NAME`, you must specify the name. Note t

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-OpenStack Heat       | Saltstack    | CentOS | Neutron + flannel hostgw | [docs](/docs/home/openstack-heat)            |          | Community ([@FujitsuEnablingSoftwareTechnologyGmbH](https://github.com/FujitsuEnablingSoftwareTechnologyGmbH))
+OpenStack Heat       | Saltstack    | CentOS | Neutron + flannel hostgw | [docs](/docs/getting-started-guides/openstack-heat)            |          | Community ([@FujitsuEnablingSoftwareTechnologyGmbH](https://github.com/FujitsuEnablingSoftwareTechnologyGmbH))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/getting-started-guides/ovirt.md
+++ b/docs/getting-started-guides/ovirt.md
@ -58,6 +58,6 @@ This short screencast demonstrates how the oVirt Cloud Provider can be used to d

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-oVirt                |              |        |             | [docs](/docs/home/ovirt)                                  |          | Community ([@simon3z](https://github.com/simon3z))
+oVirt                |              |        |             | [docs](/docs/getting-started-guides/ovirt)                                  |          | Community ([@simon3z](https://github.com/simon3z))

-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/getting-started-guides/photon-controller.md
+++ b/docs/getting-started-guides/photon-controller.md
@ -35,7 +35,7 @@ Mac, you can install this with [brew](http://brew.sh/):
 5. You should have an ssh public key installed. This will be used to
 give you access to the VM's user account, `kube`.

-6. Get or build a [binary release](/docs/home/binary_release/)
+6. Get or build a [binary release](/docs/getting-started-guides/binary_release/)

 ### Download VM Image

@ -235,4 +235,4 @@ networks such as Weave or Calico.

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Vmware Photon        | Saltstack    | Debian | OVS         | [docs](/docs/home/photon-controller)                      |          | Community ([@alainroy](https://github.com/alainroy))
+Vmware Photon        | Saltstack    | Debian | OVS         | [docs](/docs/getting-started-guides/photon-controller)                      |          | Community ([@alainroy](https://github.com/alainroy))
--- a/docs/getting-started-guides/rkt/index.md
+++ b/docs/getting-started-guides/rkt/index.md
@ -19,7 +19,7 @@ This document describes how to run Kubernetes using [rkt](https://github.com/cor

 * The [rkt API service](https://coreos.com/rkt/docs/latest/subcommands/api-service.html) must be running on the node.

-* You will need [kubelet](/docs/home/scratch/#kubelet) installed on the node, and it's recommended that you run [kube-proxy](/docs/home/scratch/#kube-proxy) on all nodes. This document describes how to set the parameters for kubelet so that it uses rkt as the runtime. 
+* You will need [kubelet](/docs/getting-started-guides/scratch/#kubelet) installed on the node, and it's recommended that you run [kube-proxy](/docs/getting-started-guides/scratch/#kube-proxy) on all nodes. This document describes how to set the parameters for kubelet so that it uses rkt as the runtime. 

 ## Pod networking in rktnetes

@ -201,7 +201,7 @@ Use rkt's [*contained network*](#rkt-contained-network) with the KVM stage1, bec

 ## Known issues and differences between rkt and Docker

-rkt and the default node container engine have very different designs, as do rkt's native ACI and the Docker container image format. Users may experience different behaviors when switching from one container engine to the other. More information can be found [in the Kubernetes rkt notes](/docs/home/rkt/notes/).
+rkt and the default node container engine have very different designs, as do rkt's native ACI and the Docker container image format. Users may experience different behaviors when switching from one container engine to the other. More information can be found [in the Kubernetes rkt notes](/docs/getting-started-guides/rkt/notes/).

 ## Troubleshooting

--- a/docs/getting-started-guides/scratch.md
+++ b/docs/getting-started-guides/scratch.md
@ -8,7 +8,7 @@ title: Creating a Custom Cluster from Scratch

 This guide is for people who want to craft a custom Kubernetes cluster.  If you
 can find an existing Getting Started Guide that meets your needs on [this
-list](/docs/home/), then we recommend using it, as you will be able to benefit
+list](/docs/getting-started-guides/), then we recommend using it, as you will be able to benefit
 from the experience of others.  However, if you have specific IaaS, networking,
 configuration management, or operating system requirements not met by any of
 those guides, then this guide will provide an outline of the steps you need to
@ -58,7 +58,7 @@ on how flags are set on various components.
 ### Network

 #### Network Connectivity
-Kubernetes has a distinctive [networking model](/docs/concepts/cluster-administration/networking/).
+Kubernetes has a distinctive [networking model](/docs/admin/networking/).

 Kubernetes allocates an IP address to each pod.  When creating a cluster, you
 need to allocate a block of IPs for Kubernetes to use as Pod IPs.  The simplest
@ -91,7 +91,7 @@ to implement one of the above options:
  - You can also write your own.
 - **Compile support directly into Kubernetes**
  - This can be done by implementing the "Routes" interface of a Cloud Provider module.
-  - The Google Compute Engine ([GCE](/docs/home/gce/)/) and [AWS](/docs/home/aws/) guides use this approach.
+  - The Google Compute Engine ([GCE](/docs/getting-started-guides/gce)/) and [AWS](/docs/getting-started-guides/aws/) guides use this approach.
 - **Configure the network external to Kubernetes**
  - This can be done by manually running commands, or through a set of externally maintained scripts.
  - You have to implement this yourself, but it can give you an extra degree of flexibility.
@ -430,7 +430,7 @@ Each node needs to be allocated its own CIDR range for pod networking.
 Call this `NODE_X_POD_CIDR`.

 A bridge called `cbr0` needs to be created on each node.  The bridge is explained
-further in the [networking documentation](/docs/concepts/cluster-administration/networking/).  The bridge itself
+further in the [networking documentation](/docs/admin/networking/).  The bridge itself
 needs an address from `$NODE_X_POD_CIDR` - by convention the first IP.  Call
 this `NODE_X_BRIDGE_ADDR`.  For example, if `NODE_X_POD_CIDR` is `10.0.0.0/16`,
 then `NODE_X_BRIDGE_ADDR` is `10.0.0.1/16`.  NOTE: this retains the `/16` suffix
@ -878,7 +878,7 @@ Cluster validation succeeded

 ### Inspect pods and services

-Try to run through the "Inspect your cluster" section in one of the other Getting Started Guides, such as [GCE](/docs/home/gce//#inspect-your-cluster).
+Try to run through the "Inspect your cluster" section in one of the other Getting Started Guides, such as [GCE](/docs/getting-started-guides/gce/#inspect-your-cluster).
 You should see some services.  You should also see "mirror pods" for the apiserver, scheduler and controller-manager, plus any add-ons you started.

 ### Try Examples
@ -896,7 +896,7 @@ pinging or SSH-ing from one node to another.

 ### Getting Help

-If you run into trouble, please see the section on [troubleshooting](/docs/home/gce/#troubleshooting), post to the
+If you run into trouble, please see the section on [troubleshooting](/docs/getting-started-guides/gce#troubleshooting), post to the
 [kubernetes-users group](https://groups.google.com/forum/#!forum/kubernetes-users), or come ask questions on [Slack](/docs/troubleshooting#slack).

 ## Support Level
@ -904,7 +904,7 @@ If you run into trouble, please see the section on [troubleshooting](/docs/home/

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-any                  | any          | any    | any         | [docs](/docs/home/scratch/)                                |          | Community ([@erictune](https://github.com/erictune))
+any                  | any          | any    | any         | [docs](/docs/getting-started-guides/scratch/)                                |          | Community ([@erictune](https://github.com/erictune))


-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions/) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions/) chart.
--- a/docs/getting-started-guides/stackpoint.md
+++ b/docs/getting-started-guides/stackpoint.md
@ -38,7 +38,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on AWS, [consult the  Kubernetes documentation](/docs/home/aws/).
+For information on using and managing a Kubernetes cluster on AWS, [consult the  Kubernetes documentation](/docs/getting-started-guides/aws/).



@ -70,7 +70,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on GCE, [consult the  Kubernetes documentation](/docs/home/gce//).
+For information on using and managing a Kubernetes cluster on GCE, [consult the  Kubernetes documentation](/docs/getting-started-guides/gce/).



@ -168,7 +168,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on Azure, [consult the  Kubernetes documentation](/docs/home/azure/).
+For information on using and managing a Kubernetes cluster on Azure, [consult the  Kubernetes documentation](/docs/getting-started-guides/azure/).



--- a/docs/getting-started-guides/ubuntu/index.md
+++ b/docs/getting-started-guides/ubuntu/index.md
@ -36,24 +36,24 @@ conjure-up kubernetes

 These are more in-depth guides for users choosing to run Kubernetes in production:

-  - [Installation](/docs/home/ubuntu/installation/)
-  - [Validation](/docs/home/ubuntu/validation/)
-  - [Backups](/docs/home/ubuntu/backups/)
-  - [Upgrades](/docs/home/ubuntu/upgrades/)
-  - [Scaling](/docs/home/ubuntu/scaling/)
-  - [Logging](/docs/home/ubuntu/logging/)
-  - [Monitoring](/docs/home/ubuntu/monitoring/)
-  - [Networking](/docs/home/ubuntu/networking/)
-  - [Security](/docs/home/ubuntu/security/)
-  - [Storage](/docs/home/ubuntu/storage/)
-  - [Troubleshooting](/docs/home/ubuntu/troubleshooting/)
-  - [Decommissioning](/docs/home/ubuntu/decommissioning/)
-  - [Operational Considerations](/docs/home/ubuntu/operational-considerations/)
-  - [Glossary](/docs/home/ubuntu/glossary/)
+  - [Installation](/docs/getting-started-guides/ubuntu/installation/)
+  - [Validation](/docs/getting-started-guides/ubuntu/validation/)
+  - [Backups](/docs/getting-started-guides/ubuntu/backups/)
+  - [Upgrades](/docs/getting-started-guides/ubuntu/upgrades/)
+  - [Scaling](/docs/getting-started-guides/ubuntu/scaling/)
+  - [Logging](/docs/getting-started-guides/ubuntu/logging/)
+  - [Monitoring](/docs/getting-started-guides/ubuntu/monitoring/)
+  - [Networking](/docs/getting-started-guides/ubuntu/networking/)
+  - [Security](/docs/getting-started-guides/ubuntu/security/)
+  - [Storage](/docs/getting-started-guides/ubuntu/storage/)
+  - [Troubleshooting](/docs/getting-started-guides/ubuntu/troubleshooting/)
+  - [Decommissioning](/docs/getting-started-guides/ubuntu/decommissioning/)
+  - [Operational Considerations](/docs/getting-started-guides/ubuntu/operational-considerations/)
+  - [Glossary](/docs/getting-started-guides/ubuntu/glossary/)

 ## Developer Guides

-  - [Localhost using LXD](/docs/home/ubuntu/local/)
+  - [Localhost using LXD](/docs/getting-started-guides/ubuntu/local/)

 ## Where to find us

--- a/docs/getting-started-guides/ubuntu/installation.md
+++ b/docs/getting-started-guides/ubuntu/installation.md
@ -251,16 +251,16 @@ Feature requests, bug reports, pull requests or any feedback would be much appre

 IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Amazon Web Services (AWS)   | Juju         | Ubuntu | flannel, calico*     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
-OpenStack                   | Juju         | Ubuntu | flannel, calico     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
-Microsoft Azure             | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
-Google Compute Engine (GCE) | Juju         | Ubuntu | flannel, calico     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
-Joyent                      | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
-Rackspace                   | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
-VMWare vSphere              | Juju         | Ubuntu | flannel, calico     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
-Bare Metal (MAAS)           | Juju         | Ubuntu | flannel, calico     | [docs](/docs/home/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+Amazon Web Services (AWS)   | Juju         | Ubuntu | flannel, calico*     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+OpenStack                   | Juju         | Ubuntu | flannel, calico     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+Microsoft Azure             | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+Google Compute Engine (GCE) | Juju         | Ubuntu | flannel, calico     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+Joyent                      | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+Rackspace                   | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+VMWare vSphere              | Juju         | Ubuntu | flannel, calico     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
+Bare Metal (MAAS)           | Juju         | Ubuntu | flannel, calico     | [docs](/docs/getting-started-guides/ubuntu/)                                   |          | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )


-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

 {% include templates/task.md %}
--- a/docs/getting-started-guides/ubuntu/operational-considerations.md
+++ b/docs/getting-started-guides/ubuntu/operational-considerations.md
@ -29,7 +29,7 @@ juju bootstrap --contraints "mem=8GB cpu-cores=4 root-disk=128G"

 Juju will select the cheapest instance type matching your constraints on your target cloud. You can also use the ```instance-type``` constraint in conjunction with ```root-disk``` for strict control. For more information about the constraints available, refer to the [official documentation](https://jujucharms.com/docs/stable/reference-constraints)

-Additional information about logging can be found in the [logging section](/docs/home/ubuntu/logging)
+Additional information about logging can be found in the [logging section](/docs/getting-started-guides/ubuntu/logging)

 ### SSHing into the Controller Node

--- a/docs/getting-started-guides/ubuntu/upgrades.md
+++ b/docs/getting-started-guides/ubuntu/upgrades.md
@ -11,7 +11,7 @@ This page assumes you have a working deployed cluster.

 ## Assumptions

-You should always back up all your data before attempting an upgrade. Don't forget to include the workload inside your cluster! Refer to the [backup documentation](/docs/home/ubuntu/backups).
+You should always back up all your data before attempting an upgrade. Don't forget to include the workload inside your cluster! Refer to the [backup documentation](/docs/getting-started-guides/ubuntu/backups).
 {% endcapture %}

 {% capture steps %}
@ -23,7 +23,7 @@ You can use `juju status` to see if an upgrade is available. There will either b

 # Upgrade etcd

-Backing up etcd requires an export and snapshot, refer to the [backup documentation](/docs/home/ubuntu/backups) to create a snapshot. After the snapshot upgrade the etcd service with:  
+Backing up etcd requires an export and snapshot, refer to the [backup documentation](/docs/getting-started-guides/ubuntu/backups) to create a snapshot. After the snapshot upgrade the etcd service with:  

    juju upgrade-charm etcd

@ -96,7 +96,7 @@ Where `x` is the minor version of Kubernetes. For example, `1.6/stable`. See abo

 `kubectl version` should return the newer version. 

-It is recommended to rerun a [cluster validation](/docs/home/ubuntu/validation) to ensure that the cluster upgrade has successfully completed.
+It is recommended to rerun a [cluster validation](/docs/getting-started-guides/ubuntu/validation) to ensure that the cluster upgrade has successfully completed.

 # Upgrade Flannel

--- a/docs/getting-started-guides/vsphere.md
+++ b/docs/getting-started-guides/vsphere.md
@ -201,9 +201,9 @@ For quick support please join VMware Code Slack ([kubernetes](https://vmwarecode

 IaaS Provider        | Config. Mgmt | OS     | Networking | Docs                                          | Conforms  | Support Level
 -------------------- | ------------ | ------ | ---------- | --------------------------------------------- | --------- | ----------------------------
-Vmware vSphere       | Kube-anywhere    | Photon OS | Flannel         | [docs](/docs/home/vsphere/)                                |                | Community  ([@abrarshivani](https://github.com/abrarshivani)), ([@kerneltime](https://github.com/kerneltime)), ([@BaluDontu](https://github.com/BaluDontu)), ([@luomiao](https://github.com/luomiao)), ([@divyenpatel](https://github.com/divyenpatel))
+Vmware vSphere       | Kube-anywhere    | Photon OS | Flannel         | [docs](/docs/getting-started-guides/vsphere/)                                |                | Community  ([@abrarshivani](https://github.com/abrarshivani)), ([@kerneltime](https://github.com/kerneltime)), ([@BaluDontu](https://github.com/BaluDontu)), ([@luomiao](https://github.com/luomiao)), ([@divyenpatel](https://github.com/divyenpatel))

 If you identify any issues/problems using the vSphere cloud provider, you can create an issue in our repo - [VMware Kubernetes](https://github.com/vmware/kubernetes).


-For support level information on all solutions, see the [Table of solutions](/docs/home/#table-of-solutions) chart.
+For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
--- a/docs/home/index.md
+++ b/docs/home/index.md
@ -13,7 +13,7 @@ The [Kubernetes Basics interactive tutorial](/docs/tutorials/kubernetes-basics/)

 ## Installing/Setting Up Kubernetes

-[Picking the Right Solution](/docs/home/) can help you get a Kubernetes cluster up and running, either for local development, or on your cloud provider of choice.
+[Picking the Right Solution](/docs/getting-started-guides/) can help you get a Kubernetes cluster up and running, either for local development, or on your cloud provider of choice.

 ## Concepts, Tasks, and Tutorials

--- a/docs/reference/federation/extensions/v1beta1/definitions.html
+++ b/docs/reference/federation/extensions/v1beta1/definitions.html
@ -5778,7 +5778,7 @@ Both these may change in the future. Incoming requests are matched against the h
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">securityContext</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/tasks/configure-pod-container/security-context/">https://kubernetes.io/docs/tasks/configure-pod-container/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md">https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/concepts/policy/security-context/">https://kubernetes.io/docs/concepts/policy/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md">https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_securitycontext">v1.SecurityContext</a></p></td>
 <td class="tableblock halign-left valign-top"></td>
--- a/docs/resources-reference/v1.5/index.html
+++ b/docs/resources-reference/v1.5/index.html
@ -1062,7 +1062,7 @@ Appears In <a href="#pod-v1">Pod</a> <a href="#podtemplatespec-v1">PodTemplateSp
 </tr>
 <tr>
 <td>nodeSelector <br /> <em>object</em></td>
-<td>NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#39;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/concepts/configuration/assign-pod-node/">http://kubernetes.io/docs/concepts/configuration/assign-pod-node/</a></td>
+<td>NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node&#39;s labels for the pod to be scheduled on that node. More info: <a href="http://kubernetes.io/docs/user-guide/node-selection">http://kubernetes.io/docs/user-guide/node-selection</a></td>
 </tr>
 <tr>
 <td>restartPolicy <br /> <em>string</em></td>
@ -1967,7 +1967,7 @@ Appears In <a href="#service-v1">Service</a> </aside>
 <tbody>
 <tr>
 <td>clusterIP <br /> <em>string</em></td>
-<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>deprecatedPublicIPs <br /> <em>string array</em></td>
@ -1987,23 +1987,23 @@ Appears In <a href="#service-v1">Service</a> </aside>
 </tr>
 <tr>
 <td>loadBalancerSourceRanges <br /> <em>string array</em></td>
-<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/-firewalls">http://kubernetes.io/docs/concepts/services-networking/service/-firewalls</a></td>
+<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/user-guide/services-firewalls">http://kubernetes.io/docs/user-guide/services-firewalls</a></td>
 </tr>
 <tr>
 <td>ports <br /> <em><a href="#serviceport-v1">ServicePort</a> array</em></td>
-<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>selector <br /> <em>object</em></td>
-<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 <tr>
 <td>sessionAffinity <br /> <em>string</em></td>
-<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>type <br /> <em>string</em></td>
-<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 </tbody>
 </table>
@ -9654,7 +9654,7 @@ Appears In  <a href="#servicespec-v1">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>nodePort <br /> <em>integer</em></td>
-<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport">http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport</a></td>
+<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/user-guide/services#type--nodeport">http://kubernetes.io/docs/user-guide/services#type--nodeport</a></td>
 </tr>
 <tr>
 <td>port <br /> <em>integer</em></td>
@ -9666,7 +9666,7 @@ Appears In  <a href="#servicespec-v1">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>targetPort <br /> <em><a href="#intorstring-intstr">IntOrString</a></em></td>
-<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service">http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service</a></td>
+<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/user-guide/services#defining-a-service">http://kubernetes.io/docs/user-guide/services#defining-a-service</a></td>
 </tr>
 </tbody>
 </table>
--- a/docs/resources-reference/v1.6/index.html
+++ b/docs/resources-reference/v1.6/index.html
@ -2056,7 +2056,7 @@ Appears In <a href="#service-v1-core">Service</a> </aside>
 <tbody>
 <tr>
 <td>clusterIP <br /> <em>string</em></td>
-<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>clusterIP is the IP address of the service and is usually assigned randomly by the master. If an address is specified manually and is not in use by others, it will be allocated to the service; otherwise, creation of the service will fail. This field can not be changed through updates. Valid values are &quot;None&quot;, empty string (&quot;&quot;), or a valid IP address. &quot;None&quot; can be specified for headless services when proxying is not required. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>deprecatedPublicIPs <br /> <em>string array</em></td>
@ -2076,23 +2076,23 @@ Appears In <a href="#service-v1-core">Service</a> </aside>
 </tr>
 <tr>
 <td>loadBalancerSourceRanges <br /> <em>string array</em></td>
-<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/-firewalls">http://kubernetes.io/docs/concepts/services-networking/service/-firewalls</a></td>
+<td>If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.&quot; More info: <a href="http://kubernetes.io/docs/user-guide/services-firewalls">http://kubernetes.io/docs/user-guide/services-firewalls</a></td>
 </tr>
 <tr>
 <td>ports <br /> <em><a href="#serviceport-v1-core">ServicePort</a> array</em></td>
-<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>The list of ports that are exposed by this service. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>selector <br /> <em>object</em></td>
-<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>Route service traffic to pods with label keys and values matching this selector. If empty or not present, the service is assumed to have an external process managing its endpoints, which Kubernetes will not modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if type is ExternalName. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 <tr>
 <td>sessionAffinity <br /> <em>string</em></td>
-<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies">http://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies</a></td>
+<td>Supports &quot;ClientIP&quot; and &quot;None&quot;. Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: <a href="http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies">http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies</a></td>
 </tr>
 <tr>
 <td>type <br /> <em>string</em></td>
-<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#overview">http://kubernetes.io/docs/concepts/services-networking/service/#overview</a></td>
+<td>type determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. &quot;ExternalName&quot; maps to the specified externalName. &quot;ClusterIP&quot; allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is &quot;None&quot;, no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. &quot;NodePort&quot; builds on ClusterIP and allocates a port on every node which routes to the clusterIP. &quot;LoadBalancer&quot; builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: <a href="http://kubernetes.io/docs/user-guide/services#overview">http://kubernetes.io/docs/user-guide/services#overview</a></td>
 </tr>
 </tbody>
 </table>
@ -11254,7 +11254,7 @@ Appears In  <a href="#servicespec-v1-core">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>nodePort <br /> <em>integer</em></td>
-<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport">http://kubernetes.io/docs/concepts/services-networking/service/#type--nodeport</a></td>
+<td>The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: <a href="http://kubernetes.io/docs/user-guide/services#type--nodeport">http://kubernetes.io/docs/user-guide/services#type--nodeport</a></td>
 </tr>
 <tr>
 <td>port <br /> <em>integer</em></td>
@ -11266,7 +11266,7 @@ Appears In  <a href="#servicespec-v1-core">ServiceSpec</a> </aside>
 </tr>
 <tr>
 <td>targetPort</td>
-<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service">http://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service</a></td>
+<td>Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod&#39;s container ports. If this is not specified, the value of the &#39;port&#39; field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the &#39;port&#39; field. More info: <a href="http://kubernetes.io/docs/user-guide/services#defining-a-service">http://kubernetes.io/docs/user-guide/services#defining-a-service</a></td>
 </tr>
 </tbody>
 </table>
--- a/docs/resources-reference/v1.7/index.html
+++ b/docs/resources-reference/v1.7/index.html
@ -124,7 +124,7 @@ Appears In:
 </tr>
 <tr>
 <td>securityContext <br /> <em><a href="#securitycontext-v1-core">SecurityContext</a></em></td>
-<td>Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/tasks/configure-pod-container/security-context/">https://kubernetes.io/docs/tasks/configure-pod-container/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md">https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md</a></td>
+<td>Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/concepts/policy/security-context/">https://kubernetes.io/docs/concepts/policy/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md">https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md</a></td>
 </tr>
 <tr>
 <td>stdin <br /> <em>boolean</em></td>
--- a/docs/setup/independent/install-kubeadm.md
+++ b/docs/setup/independent/install-kubeadm.md
@ -127,7 +127,7 @@ example. You have to do this until SELinux support is improved in the kubelet.

 {% capture whatsnext %}

-* [Using kubeadm to Create a Cluster](/docs/home/kubeadm/)
+* [Using kubeadm to Create a Cluster](/docs/getting-started-guides/kubeadm/)

 {% endcapture %}

--- a/docs/setup/pick-right-solution.md
+++ b/docs/setup/pick-right-solution.md
@ -17,7 +17,7 @@ When you are ready to scale up to more machines and higher availability, a [host
 [Turnkey cloud solutions](#turnkey-cloud-solutions) require only a few commands to create
 and cover a wide range of cloud providers.

-If you already have a way to configure hosting resources, use [kubeadm](/docs/home/kubeadm/) to easily bring up a cluster with a single command per machine.
+If you already have a way to configure hosting resources, use [kubeadm](/docs/getting-started-guides/kubeadm/) to easily bring up a cluster with a single command per machine.

 [Custom solutions](#custom-solutions) vary from step-by-step instructions to general advice for setting up
 a Kubernetes cluster from scratch.
@ -27,9 +27,9 @@ a Kubernetes cluster from scratch.

 # Local-machine Solutions

-* [Minikube](/docs/home/minikube/) is the recommended method for creating a local, single-node Kubernetes cluster for development and testing. Setup is completely automated and doesn't require a cloud provider account.
+* [Minikube](/docs/getting-started-guides/minikube/) is the recommended method for creating a local, single-node Kubernetes cluster for development and testing. Setup is completely automated and doesn't require a cloud provider account.

-* [Ubuntu on LXD](/docs/home/ubuntu/local/) supports a nine-instance deployment on localhost.
+* [Ubuntu on LXD](/docs/getting-started-guides/ubuntu/local/) supports a nine-instance deployment on localhost.

 * [IBM Cloud private-ce (Community Edition)](https://www.ibm.com/support/knowledgecenter/en/SSBS6K/product_welcome_cloud_private.html) can use VirtualBox on your machine to deploy Kubernetes to one or more VMs for dev and test scenarios. Scales to full multi-node cluster. Free version of the enterprise solution.

@ -62,13 +62,13 @@ a Kubernetes cluster from scratch.
 These solutions allow you to create Kubernetes clusters on a range of Cloud IaaS providers with only a
 few commands. These solutions are actively developed and have active community support.

-* [Google Compute Engine (GCE)](/docs/home/gce//)
-* [AWS](/docs/home/aws/)
-* [Azure](/docs/home/azure/)
+* [Google Compute Engine (GCE)](/docs/getting-started-guides/gce/)
+* [AWS](/docs/getting-started-guides/aws/)
+* [Azure](/docs/getting-started-guides/azure/)
 * [Tectonic by CoreOS](https://coreos.com/tectonic)
-* [CenturyLink Cloud](/docs/home/clc/)
+* [CenturyLink Cloud](/docs/getting-started-guides/clc/)
 * [IBM Bluemix](https://github.com/patrocinio/kubernetes-softlayer)
-* [Stackpoint.io](/docs/home/stackpoint/)
+* [Stackpoint.io](/docs/getting-started-guides/stackpoint/)
 * [KUBE2GO.io](https://kube2go.io/)
 * [Madcore.Ai](https://madcore.ai/)

@ -80,7 +80,7 @@ base operating systems.
 If you can find a guide below that matches your needs, use it. It may be a little out of date, but
 it will be easier than starting from scratch. If you do want to start from scratch, either because you
 have special requirements, or just because you want to understand what is underneath a Kubernetes
-cluster, try the [Getting Started from Scratch](/docs/home/scratch/) guide.
+cluster, try the [Getting Started from Scratch](/docs/getting-started-guides/scratch/) guide.

 If you are interested in supporting Kubernetes on a new platform, see
 [Writing a Getting Started Guide](https://git.k8s.io/community/contributors/devel/writing-a-getting-started-guide.md).
@ -88,47 +88,47 @@ If you are interested in supporting Kubernetes on a new platform, see
 ## Universal

 If you already have a way to configure hosting resources, use
-[kubeadm](/docs/home/kubeadm/) to easily bring up a cluster
+[kubeadm](/docs/getting-started-guides/kubeadm/) to easily bring up a cluster
 with a single command per machine.

 ## Cloud

 These solutions are combinations of cloud providers and operating systems not covered by the above solutions.

-* [CoreOS on AWS or GCE](/docs/home/coreos/)
-* [Kubernetes on Ubuntu](/docs/home/ubuntu/)
-* [Kubespray](/docs/home/kubespray/)
+* [CoreOS on AWS or GCE](/docs/getting-started-guides/coreos/)
+* [Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/)
+* [Kubespray](/docs/getting-started-guides/kubespray/)

 ## On-Premises VMs

-* [Vagrant](/docs/home/coreos/) (uses CoreOS and flannel)
-* [CloudStack](/docs/home/cloudstack/) (uses Ansible, CoreOS and flannel)
-* [Vmware vSphere](/docs/home/vsphere/)  (uses Debian)
-* [Vmware Photon Controller](/docs/home/photon-controller/)  (uses Debian)
-* [Vmware vSphere, OpenStack, or Bare Metal](/docs/home/ubuntu/) (uses Juju, Ubuntu and flannel)
-* [Vmware](/docs/home/coreos/)  (uses CoreOS and flannel)
-* [CoreOS on libvirt](/docs/home/libvirt-coreos//)  (uses CoreOS)
-* [oVirt](/docs/home/ovirt/)
-* [OpenStack Heat](/docs/home/openstack-heat/) (uses CentOS and flannel)
-* [Fedora (Multi Node)](/docs/home/fedora/flannel_multi_node_cluster/) (uses Fedora and flannel)
+* [Vagrant](/docs/getting-started-guides/coreos/) (uses CoreOS and flannel)
+* [CloudStack](/docs/getting-started-guides/cloudstack/) (uses Ansible, CoreOS and flannel)
+* [Vmware vSphere](/docs/getting-started-guides/vsphere/)  (uses Debian)
+* [Vmware Photon Controller](/docs/getting-started-guides/photon-controller/)  (uses Debian)
+* [Vmware vSphere, OpenStack, or Bare Metal](/docs/getting-started-guides/ubuntu/) (uses Juju, Ubuntu and flannel)
+* [Vmware](/docs/getting-started-guides/coreos/)  (uses CoreOS and flannel)
+* [CoreOS on libvirt](/docs/getting-started-guides/libvirt-coreos/)  (uses CoreOS)
+* [oVirt](/docs/getting-started-guides/ovirt/)
+* [OpenStack Heat](/docs/getting-started-guides/openstack-heat/) (uses CentOS and flannel)
+* [Fedora (Multi Node)](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/) (uses Fedora and flannel)

 ## Bare Metal

-* [Offline](/docs/home/coreos/bare_metal_offline/) (no internet required.  Uses CoreOS and Flannel)
-* [Fedora via Ansible](/docs/home/fedora/fedora_ansible_config/)
-* [Fedora (Single Node)](/docs/home/fedora/fedora_manual_config/)
-* [Fedora (Multi Node)](/docs/home/fedora/flannel_multi_node_cluster/)
-* [CentOS](/docs/home/centos/centos_manual_config/)
-* [Kubernetes on Ubuntu](/docs/home/ubuntu/)
-* [CoreOS on AWS or GCE](/docs/home/coreos/)
+* [Offline](/docs/getting-started-guides/coreos/bare_metal_offline/) (no internet required.  Uses CoreOS and Flannel)
+* [Fedora via Ansible](/docs/getting-started-guides/fedora/fedora_ansible_config/)
+* [Fedora (Single Node)](/docs/getting-started-guides/fedora/fedora_manual_config/)
+* [Fedora (Multi Node)](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/)
+* [CentOS](/docs/getting-started-guides/centos/centos_manual_config/)
+* [Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/)
+* [CoreOS on AWS or GCE](/docs/getting-started-guides/coreos/)

 ## Integrations

 These solutions provide integration with third-party schedulers, resource managers, and/or lower level platforms.

-* [Kubernetes on Mesos](/docs/home/mesos/)
+* [Kubernetes on Mesos](/docs/getting-started-guides/mesos/)
  * Instructions specify GCE, but are generic enough to be adapted to most existing Mesos clusters
-* [DCOS](/docs/home/dcos/)
+* [DCOS](/docs/getting-started-guides/dcos/)
  * Community Edition DCOS uses AWS
  * Enterprise Edition DCOS supports cloud hosting, on-premises VMs, and bare metal

@ -146,37 +146,37 @@ KUBE2GO.io          |              | multi-support | multi-support | [docs](http
 Madcore.Ai           | Jenkins DSL  | Ubuntu | flannel     | [docs](https://madcore.ai)                        | Community ([@madcore-ai](https://github.com/madcore-ai))
 Platform9        |              | multi-support | multi-support | [docs](https://platform9.com/managed-kubernetes/) | Commercial
 Giant Swarm        |              | CoreOS | flannel and/or Calico | [docs](https://docs.giantswarm.io/) | Commercial
-GCE                  | Saltstack    | Debian | GCE         | [docs](/docs/home/gce//)                                    | Project
+GCE                  | Saltstack    | Debian | GCE         | [docs](/docs/getting-started-guides/gce/)                                    | Project
 Azure Container Service |              | Ubuntu | Azure       | [docs](https://azure.microsoft.com/en-us/services/container-service/)                    |  Commercial
-Azure (IaaS)    |              | Ubuntu | Azure       | [docs](/docs/home/azure/)                    |  [Community (Microsoft)](https://github.com/Azure/acs-engine)
-Bare-metal           | Ansible      | Fedora | flannel     | [docs](/docs/home/fedora/fedora_ansible_config/)           |  Project
-Bare-metal           | custom       | Fedora | _none_      | [docs](/docs/home/fedora/fedora_manual_config/)            |  Project
-Bare-metal           | custom       | Fedora | flannel     | [docs](/docs/home/fedora/flannel_multi_node_cluster/)      |  Community ([@aveshagarwal](https://github.com/aveshagarwal))
-libvirt              | custom       | Fedora | flannel     | [docs](/docs/home/fedora/flannel_multi_node_cluster/)      |  Community ([@aveshagarwal](https://github.com/aveshagarwal))
-KVM                  | custom       | Fedora | flannel     | [docs](/docs/home/fedora/flannel_multi_node_cluster/)      |  Community ([@aveshagarwal](https://github.com/aveshagarwal))
-Mesos/Docker         | custom       | Ubuntu | Docker      | [docs](/docs/home/mesos-docker/)                           |  Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
-Mesos/GCE            |              |        |             | [docs](/docs/home/mesos/)                                  |  Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
-DCOS                 | Marathon   | CoreOS/Alpine | custom | [docs](/docs/home/dcos/)                                   |  Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
-AWS                  | CoreOS       | CoreOS | flannel     | [docs](/docs/home/aws/)                                 |  Community
-GCE                  | CoreOS       | CoreOS | flannel     | [docs](/docs/home/coreos/)                                 |  Community ([@pires](https://github.com/pires))
-Vagrant              | CoreOS       | CoreOS | flannel     | [docs](/docs/home/coreos/)                                 |  Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles))
-Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/home/coreos/bare_metal_offline/)              |  Community ([@jeffbean](https://github.com/jeffbean))
-CloudStack           | Ansible      | CoreOS | flannel     | [docs](/docs/home/cloudstack/)                             |  Community ([@sebgoa](https://github.com/sebgoa))
-Vmware vSphere       | Saltstack    | Debian | OVS         | [docs](/docs/home/vsphere/)                                |  Community ([@imkin](https://github.com/imkin))
-Vmware Photon        | Saltstack    | Debian | OVS         | [docs](/docs/home/photon-controller/)                      |  Community ([@alainroy](https://github.com/alainroy))
-Bare-metal           | custom       | CentOS | flannel      | [docs](/docs/home/centos/centos_manual_config/)            |  Community ([@coolsvap](https://github.com/coolsvap))
-AWS                  | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
-GCE                  | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
-Bare Metal           | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
-Rackspace            | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
-Vmware vSphere       | Juju         | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
-AWS                  | Saltstack    | Debian | AWS         | [docs](/docs/home/aws/)                                    |  Community ([@justinsb](https://github.com/justinsb))
+Azure (IaaS)    |              | Ubuntu | Azure       | [docs](/docs/getting-started-guides/azure/)                    |  [Community (Microsoft)](https://github.com/Azure/acs-engine)
+Bare-metal           | Ansible      | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/fedora_ansible_config/)           |  Project
+Bare-metal           | custom       | Fedora | _none_      | [docs](/docs/getting-started-guides/fedora/fedora_manual_config/)            |  Project
+Bare-metal           | custom       | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/)      |  Community ([@aveshagarwal](https://github.com/aveshagarwal))
+libvirt              | custom       | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/)      |  Community ([@aveshagarwal](https://github.com/aveshagarwal))
+KVM                  | custom       | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/)      |  Community ([@aveshagarwal](https://github.com/aveshagarwal))
+Mesos/Docker         | custom       | Ubuntu | Docker      | [docs](/docs/getting-started-guides/mesos-docker/)                           |  Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
+Mesos/GCE            |              |        |             | [docs](/docs/getting-started-guides/mesos/)                                  |  Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
+DCOS                 | Marathon   | CoreOS/Alpine | custom | [docs](/docs/getting-started-guides/dcos/)                                   |  Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
+AWS                  | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/aws/)                                 |  Community
+GCE                  | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/)                                 |  Community ([@pires](https://github.com/pires))
+Vagrant              | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/)                                 |  Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles))
+Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline/)              |  Community ([@jeffbean](https://github.com/jeffbean))
+CloudStack           | Ansible      | CoreOS | flannel     | [docs](/docs/getting-started-guides/cloudstack/)                             |  Community ([@sebgoa](https://github.com/sebgoa))
+Vmware vSphere       | Saltstack    | Debian | OVS         | [docs](/docs/getting-started-guides/vsphere/)                                |  Community ([@imkin](https://github.com/imkin))
+Vmware Photon        | Saltstack    | Debian | OVS         | [docs](/docs/getting-started-guides/photon-controller/)                      |  Community ([@alainroy](https://github.com/alainroy))
+Bare-metal           | custom       | CentOS | flannel      | [docs](/docs/getting-started-guides/centos/centos_manual_config/)            |  Community ([@coolsvap](https://github.com/coolsvap))
+AWS                  | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
+GCE                  | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
+Bare Metal           | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
+Rackspace            | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
+Vmware vSphere       | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                |  [Commercial](http://www.ubuntu.com/cloud/kubernetes) and [Community](https://github.com/juju-solutions/bundle-canonical-kubernetes)  ( [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) )
+AWS                  | Saltstack    | Debian | AWS         | [docs](/docs/getting-started-guides/aws/)                                    |  Community ([@justinsb](https://github.com/justinsb))
 AWS                  | kops         | Debian | AWS         | [docs](https://github.com/kubernetes/kops/)                                  |  Community ([@justinsb](https://github.com/justinsb))
-Bare-metal           | custom       | Ubuntu | flannel     | [docs](/docs/home/ubuntu/)                                 |  Community ([@resouer](https://github.com/resouer), [@WIZARD-CXY](https://github.com/WIZARD-CXY))
-libvirt/KVM          | CoreOS       | CoreOS | libvirt/KVM | [docs](/docs/home/libvirt-coreos//)                         |  Community ([@lhuard1A](https://github.com/lhuard1A))
-oVirt                |              |        |             | [docs](/docs/home/ovirt/)                                  |  Community ([@simon3z](https://github.com/simon3z))
-OpenStack Heat       | Saltstack    | CentOS | Neutron + flannel hostgw | [docs](/docs/home/openstack-heat/)            |  Community ([@FujitsuEnablingSoftwareTechnologyGmbH](https://github.com/FujitsuEnablingSoftwareTechnologyGmbH))
-any                  | any          | any    | any         | [docs](/docs/home/scratch/)                                |  Community ([@erictune](https://github.com/erictune))
+Bare-metal           | custom       | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu/)                                 |  Community ([@resouer](https://github.com/resouer), [@WIZARD-CXY](https://github.com/WIZARD-CXY))
+libvirt/KVM          | CoreOS       | CoreOS | libvirt/KVM | [docs](/docs/getting-started-guides/libvirt-coreos/)                         |  Community ([@lhuard1A](https://github.com/lhuard1A))
+oVirt                |              |        |             | [docs](/docs/getting-started-guides/ovirt/)                                  |  Community ([@simon3z](https://github.com/simon3z))
+OpenStack Heat       | Saltstack    | CentOS | Neutron + flannel hostgw | [docs](/docs/getting-started-guides/openstack-heat/)            |  Community ([@FujitsuEnablingSoftwareTechnologyGmbH](https://github.com/FujitsuEnablingSoftwareTechnologyGmbH))
+any                  | any          | any    | any         | [docs](/docs/getting-started-guides/scratch/)                                |  Community ([@erictune](https://github.com/erictune))
 any                  | any          | any    | any         | [docs](http://docs.projectcalico.org/v2.2/getting-started/kubernetes/installation/)                                |  Commercial and Community

 **Note**: The above table is ordered by version test/used in nodes, followed by support level.
--- a/docs/tasks/access-application-cluster/access-cluster.md
+++ b/docs/tasks/access-application-cluster/access-cluster.md
@ -14,7 +14,7 @@ Kubernetes CLI, `kubectl`.

 To access a cluster, you need to know the location of the cluster and have credentials
 to access it.  Typically, this is automatically set-up when you work through
-a [Getting started guide](/docs/home/),
+a [Getting started guide](/docs/getting-started-guides/),
 or someone else setup the cluster and provided you with credentials and a location.

 Check the location and credentials that kubectl knows about with this command:
@ -183,7 +183,7 @@ In each case, the credentials of the pod are used to communicate securely with t

 The previous section was about connecting the Kubernetes API server.  This section is about
 connecting to other services running on Kubernetes cluster.  In Kubernetes, the
-[nodes](/docs/admin/node), [pods](/docs/user-guide/pods) and [services](/docs/concepts/services-networking/service/) all have
+[nodes](/docs/admin/node), [pods](/docs/user-guide/pods) and [services](/docs/user-guide/services) all have
 their own IPs.  In many cases, the node IPs, pod IPs, and some service IPs on a cluster will not be
 routable, so they will not be reachable from a machine outside the cluster,
 such as your desktop machine.
@ -194,7 +194,7 @@ You have several options for connecting to nodes, pods and services from outside

  - Access services through public IPs.
    - Use a service with type `NodePort` or `LoadBalancer` to make the service reachable outside
-      the cluster.  See the [services](/docs/concepts/services-networking/service/) and
+      the cluster.  See the [services](/docs/user-guide/services) and
      [kubectl expose](/docs/user-guide/kubectl/v1.6/#expose) documentation.
    - Depending on your cluster environment, this may just expose the service to your corporate network,
      or it may expose it to the internet.  Think about whether the service being exposed is secure.
--- a/docs/tasks/access-application-cluster/web-ui-dashboard.md
+++ b/docs/tasks/access-application-cluster/web-ui-dashboard.md
@ -64,7 +64,7 @@ To access the deploy wizard from the Welcome page, click the respective button.

 The deploy wizard expects that you provide the following information:

- **App name** (mandatory): Name for your application. A [label](/docs/concepts/overview/working-with-objects/labels/) with the name will be added to the Deployment and Service, if any, that will be deployed.
+- **App name** (mandatory): Name for your application. A [label](/docs/user-guide/labels/) with the name will be added to the Deployment and Service, if any, that will be deployed.

  The application name must be unique within the selected Kubernetes [namespace](/docs/tasks/administer-cluster/namespaces/). It must start with a lowercase character, and end with a lowercase character or a number, and contain only lowercase letters, numbers and dashes (-). It is limited to 24 characters. Leading and trailing spaces are ignored.

@ -84,7 +84,7 @@ If needed, you can expand the **Advanced options** section where you can specify

 - **Description**: The text you enter here will be added as an [annotation](/docs/concepts/overview/working-with-objects/annotations/) to the Deployment and displayed in the application's details.

- **Labels**: Default [labels](/docs/concepts/overview/working-with-objects/labels/) to be used for your application are application name and version. You can specify additional labels to be applied to the Deployment, Service (if any), and Pods, such as release, environment, tier, partition, and release track.
+- **Labels**: Default [labels](/docs/user-guide/labels/) to be used for your application are application name and version. You can specify additional labels to be applied to the Deployment, Service (if any), and Pods, such as release, environment, tier, partition, and release track.

  Example:

--- a/docs/tasks/administer-cluster/access-cluster-api.md
+++ b/docs/tasks/administer-cluster/access-cluster-api.md
@ -22,7 +22,7 @@ Kubernetes command-line tool, `kubectl`.

 To access a cluster, you need to know the location of the cluster and have credentials
 to access it.  Typically, this is automatically set-up when you work through
-a [Getting started guide](/docs/home/),
+a [Getting started guide](/docs/getting-started-guides/),
 or someone else setup the cluster and provided you with credentials and a location.

 Check the location and credentials that kubectl knows about with this command:
--- a/docs/tasks/administer-cluster/access-cluster-services.md
+++ b/docs/tasks/administer-cluster/access-cluster-services.md
@ -15,7 +15,7 @@ This page shows how to connect to services running on the Kubernetes cluster.

 ## Accessing services running on the cluster

-In Kubernetes, [nodes](/docs/admin/node), [pods](/docs/user-guide/pods) and [services](/docs/concepts/services-networking/service/) all have
+In Kubernetes, [nodes](/docs/admin/node), [pods](/docs/user-guide/pods) and [services](/docs/user-guide/services) all have
 their own IPs.  In many cases, the node IPs, pod IPs, and some service IPs on a cluster will not be
 routable, so they will not be reachable from a machine outside the cluster,
 such as your desktop machine.
@ -26,7 +26,7 @@ You have several options for connecting to nodes, pods and services from outside

  - Access services through public IPs.
    - Use a service with type `NodePort` or `LoadBalancer` to make the service reachable outside
-      the cluster.  See the [services](/docs/concepts/services-networking/service/) and
+      the cluster.  See the [services](/docs/user-guide/services) and
      [kubectl expose](/docs/user-guide/kubectl/v1.6/#expose) documentation.
    - Depending on your cluster environment, this may just expose the service to your corporate network,
      or it may expose it to the internet.  Think about whether the service being exposed is secure.
--- a/docs/tasks/administer-cluster/calico-network-policy.md
+++ b/docs/tasks/administer-cluster/calico-network-policy.md
@ -15,7 +15,7 @@ This page shows how to use Calico for NetworkPolicy.
 {% capture steps %}
 ## Deploying a cluster using Calico

-You can deploy a cluster using Calico for network policy in the default [GCE deployment](/docs/home/gce/) using the following set of commands:
+You can deploy a cluster using Calico for network policy in the default [GCE deployment](/docs/getting-started-guides/gce) using the following set of commands:

 ```shell
 export NETWORK_POLICY_PROVIDER=calico
@ -55,7 +55,7 @@ There are two main components to be aware of:
 {% endcapture %}

 {% capture whatsnext %}
-Once your cluster is running, you can follow the [NetworkPolicy getting started guide](/docs/home/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.
+Once your cluster is running, you can follow the [NetworkPolicy getting started guide](/docs/getting-started-guides/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.
 {% endcapture %}

 {% include templates/task.md %}
--- a/docs/tasks/administer-cluster/cilium-network-policy.md
+++ b/docs/tasks/administer-cluster/cilium-network-policy.md
@ -72,7 +72,7 @@ There are two main components to be aware of:
 {% endcapture %}

 {% capture whatsnext %}
-Once your cluster is running, you can follow the [NetworkPolicy getting started guide](/docs/home/network-policy/walkthrough) to try out Kubernetes NetworkPolicy with Cilium.  Have fun, and if you have questions, contact us using the [Cilium Slack Channel](https://cilium.herokuapp.com/).
+Once your cluster is running, you can follow the [NetworkPolicy getting started guide](/docs/getting-started-guides/network-policy/walkthrough) to try out Kubernetes NetworkPolicy with Cilium.  Have fun, and if you have questions, contact us using the [Cilium Slack Channel](https://cilium.herokuapp.com/).
 {% endcapture %}

 {% include templates/task.md %}
--- a/docs/tasks/administer-cluster/cluster-management.md
+++ b/docs/tasks/administer-cluster/cluster-management.md
@ -15,7 +15,7 @@ running cluster.

 ## Creating and configuring a Cluster

-To install Kubernetes on a set of machines, consult one of the existing [Getting Started guides](/docs/home/) depending on your environment.
+To install Kubernetes on a set of machines, consult one of the existing [Getting Started guides](/docs/getting-started-guides/) depending on your environment.

 ## Upgrading a cluster

--- a/docs/tasks/administer-cluster/kube-router-network-policy.md
+++ b/docs/tasks/administer-cluster/kube-router-network-policy.md
@ -18,7 +18,7 @@ The Kube-router Addon comes with a Network Policy Controller that watches Kubern
 {% endcapture %}

 {% capture whatsnext %}
-Once you have installed the Kube-router addon, you can follow the [NetworkPolicy getting started guide](/docs/home/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.
+Once you have installed the Kube-router addon, you can follow the [NetworkPolicy getting started guide](/docs/getting-started-guides/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.
 {% endcapture %}

 {% include templates/task.md %}
--- a/docs/tasks/administer-cluster/namespaces-walkthrough.md
+++ b/docs/tasks/administer-cluster/namespaces-walkthrough.md
@ -20,7 +20,7 @@ This example demonstrates how to use Kubernetes namespaces to subdivide your clu

 This example assumes the following:

-1. You have an [existing Kubernetes cluster](/docs/home/).
+1. You have an [existing Kubernetes cluster](/docs/getting-started-guides/).
 2. You have a basic understanding of Kubernetes _[Pods](/docs/concepts/workloads/pods/pod/)_, _[Services](/docs/concepts/services-networking/service/)_, and _[Deployments](/docs/concepts/workloads/controllers/deployment/)_.

 ### Step One: Understand the default namespace
--- a/docs/tasks/administer-cluster/namespaces.md
+++ b/docs/tasks/administer-cluster/namespaces.md
@ -10,7 +10,7 @@ This page shows how to view, work in, and delete namespaces. The page also shows
 {% endcapture %}

 {% capture prerequisites %}
-* Have an [existing Kubernetes cluster](/docs/home/).
+* Have an [existing Kubernetes cluster](/docs/getting-started-guides/).
 * Have a basic understanding of Kubernetes _[Pods](/docs/concepts/workloads/pods/pod/)_, _[Services](/docs/concepts/services-networking/service/)_, and _[Deployments](/docs/concepts/workloads/controllers/deployment/)_.
 {% endcapture %}

--- a/docs/tasks/administer-cluster/out-of-resource.md
+++ b/docs/tasks/administer-cluster/out-of-resource.md
@ -49,7 +49,7 @@ container, and if users use the [node
 allocatable](/docs/tasks/administer-cluster/reserve-compute-resources/#node-allocatable) feature, out of resource decisions
 are made local to the end user pod part of the cgroup hierarchy as well as the
 root node.  This
-[script](/docs/tasks/administer-cluster/out-of-resource/memory-available.sh)
+[script](/docs/concepts/cluster-administration/out-of-resource/memory-available.sh)
 reproduces the same set of steps that the `kubelet` performs to calculate
 `memory.available`. The `kubelet` excludes inactive_file (i.e. # of bytes of
 file-backed memory on inactive LRU list) from its calculation as it assumes that
--- a/docs/tasks/administer-cluster/romana-network-policy.md
+++ b/docs/tasks/administer-cluster/romana-network-policy.md
@ -12,7 +12,7 @@ This page shows how to use Romana for NetworkPolicy.

 {% capture prerequisites %}

-Complete steps 1, 2, and 3 of  the [kubeadm getting started guide](/docs/home/kubeadm/).
+Complete steps 1, 2, and 3 of  the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/).

 {% endcapture %}

@ -34,7 +34,7 @@ To apply network policies use one of the following:

 {% capture whatsnext %}

-Once your have installed Romana, you can follow the [NetworkPolicy getting started guide](/docs/home/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.
+Once your have installed Romana, you can follow the [NetworkPolicy getting started guide](/docs/getting-started-guides/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.

 {% endcapture %}

--- a/docs/tasks/administer-cluster/weave-network-policy.md
+++ b/docs/tasks/administer-cluster/weave-network-policy.md
@ -12,7 +12,7 @@ This page shows how to use Weave Net for NetworkPolicy.

 {% capture prerequisites %}

-Complete steps 1, 2, and 3 of the [kubeadm getting started guide](/docs/home/kubeadm/).
+Complete steps 1, 2, and 3 of the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/).

 {% endcapture %}

@ -108,7 +108,7 @@ spec:

 {% capture whatsnext %}

-Once you have installed the Weave Net addon, you can follow the [NetworkPolicy getting started guide](/docs/home/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.
+Once you have installed the Weave Net addon, you can follow the [NetworkPolicy getting started guide](/docs/getting-started-guides/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.

 {% endcapture %}

--- a/docs/tasks/administer-federation/events.md
+++ b/docs/tasks/administer-federation/events.md
@ -19,7 +19,7 @@ this for you). Other tutorials, for example
 by Kelsey Hightower, are also available to help you.

 You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/home/) in
+[working knowledge of Kubernetes](/docs/getting-started-guides/) in
 general.

 ## Overview
--- a/docs/tasks/administer-federation/ingress.md
+++ b/docs/tasks/administer-federation/ingress.md
@ -66,7 +66,7 @@ this for you). Other tutorials, for example
 by Kelsey Hightower, are also available to help you.

 You must also have a basic
-[working knowledge of Kubernetes](/docs/home/) in
+[working knowledge of Kubernetes](/docs/getting-started-guides/) in
 general, and [Ingress](/docs/concepts/services-networking/ingress/) in particular.
 {% endcapture %}

--- a/docs/tasks/administer-federation/replicaset.md
+++ b/docs/tasks/administer-federation/replicaset.md
@ -16,7 +16,7 @@ replicas exist across the registered clusters.

 * {% include federated-task-tutorial-prereqs.md %}
 * You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/home/) in
+[working knowledge of Kubernetes](/docs/getting-started-guides/) in
 general and [ReplicaSets](/docs/concepts/workloads/controllers/replicaset/) in particular.
 {% endcapture %}

--- a/docs/tasks/administer-federation/secret.md
+++ b/docs/tasks/administer-federation/secret.md
@ -18,7 +18,7 @@ this for you). Other tutorials, for example
 by Kelsey Hightower, are also available to help you.

 You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/home/) in
+[working knowledge of Kubernetes](/docs/getting-started-guides/) in
 general and [Secrets](/docs/concepts/configuration/secret/) in particular.

 ## Overview
--- a/docs/tasks/configure-pod-container/assign-pods-nodes.md
+++ b/docs/tasks/configure-pod-container/assign-pods-nodes.md
@ -75,7 +75,7 @@ a `disktype=ssd` label.

 {% capture whatsnext %}
 Learn more about
-[labels and selectors](/docs/concepts/overview/working-with-objects/labels/).
+[labels and selectors](/docs/user-guide/labels/).
 {% endcapture %}

 {% include templates/task.md %}
--- a/docs/tasks/configure-pod-container/configure-persistent-volume-storage.md
+++ b/docs/tasks/configure-pod-container/configure-persistent-volume-storage.md
@ -22,7 +22,7 @@ bound to a suitable PersistentVolume.
 * You need to have a Kubernetes cluster that has only one Node, and the kubectl
 command-line tool must be configured to communicate with your cluster. If you
 do not already have a single-node cluster, you can create one by using
-[Minikube](/docs/home/minikube).
+[Minikube](/docs/getting-started-guides/minikube).

 * Familiarize yourself with the material in
 [Persistent Volumes](/docs/concepts/storage/persistent-volumes/).
--- a/docs/tasks/debug-application-cluster/debug-application-introspection.md
+++ b/docs/tasks/debug-application-cluster/debug-application-introspection.md
@ -379,7 +379,7 @@ Learn about additional debugging tools, including:
 * [Logging](/docs/user-guide/logging/overview)
 * [Monitoring](/docs/user-guide/monitoring)
 * [Getting into containers via `exec`](/docs/user-guide/getting-into-containers)
-* [Connecting to containers via proxies](/docs/tasks/access-kubernetes-api/http-proxy-access-api/)
+* [Connecting to containers via proxies](/docs/user-guide/connecting-to-applications-proxy)
 * [Connecting to containers via port forwarding](/docs/user-guide/connecting-to-applications-port-forward)


--- a/docs/tasks/debug-application-cluster/debug-stateful-set.md
+++ b/docs/tasks/debug-application-cluster/debug-stateful-set.md
@ -79,7 +79,7 @@ kubectl annotate pods <pod-name> pod.alpha.kubernetes.io/initialized="true" --ov

 {% capture whatsnext %}

-Learn more about [debugging an init-container](/docs/tasks/debug-application-cluster/debug-init-containers/).
+Learn more about [debugging an init-container](/docs/tasks/troubleshoot/debug-init-containers/).

 {% endcapture %}

--- a/docs/tasks/debug-application-cluster/resource-usage-monitoring.md
+++ b/docs/tasks/debug-application-cluster/resource-usage-monitoring.md
@ -4,7 +4,7 @@ approvers:
 title: Tools for Monitoring Compute, Storage, and Network Resources
 ---

-Understanding how an application behaves when deployed is crucial to scaling the application and providing a reliable service. In a Kubernetes cluster, application performance can be examined at many different levels: containers, [pods](/docs/user-guide/pods), [services](/docs/concepts/services-networking/service/), and whole clusters. As part of Kubernetes we want to provide users with detailed resource usage information about their running applications at all these levels. This will give users deep insights into how their applications are performing and where possible application bottlenecks may be found. In comes [Heapster](https://github.com/kubernetes/heapster), a project meant to provide a base monitoring platform on Kubernetes.
+Understanding how an application behaves when deployed is crucial to scaling the application and providing a reliable service. In a Kubernetes cluster, application performance can be examined at many different levels: containers, [pods](/docs/user-guide/pods), [services](/docs/user-guide/services), and whole clusters. As part of Kubernetes we want to provide users with detailed resource usage information about their running applications at all these levels. This will give users deep insights into how their applications are performing and where possible application bottlenecks may be found. In comes [Heapster](https://github.com/kubernetes/heapster), a project meant to provide a base monitoring platform on Kubernetes.

 ## Overview

--- a/docs/tasks/federation/federation-service-discovery.md
+++ b/docs/tasks/federation/federation-service-discovery.md
@ -25,7 +25,7 @@ this for you). Other tutorials, for example
 by Kelsey Hightower, are also available to help you.

 You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/home/) in
+[working knowledge of Kubernetes](/docs/getting-started-guides/) in
 general, and [Services](/docs/concepts/services-networking/service/) in particular.

 ## Overview
--- a/docs/tasks/federation/set-up-cluster-federation-kubefed.md
+++ b/docs/tasks/federation/set-up-cluster-federation-kubefed.md
@ -21,7 +21,7 @@ using `kubefed`.
 ## Prerequisites

 This guide assumes that you have a running Kubernetes cluster. Please
-see one of the [getting started](/docs/home/) guides
+see one of the [getting started](/docs/getting-started-guides/) guides
 for installation instructions for your platform.


@ -367,7 +367,7 @@ kubefed init fellowship \
 ```

 For more information see
-[Setting up CoreDNS as DNS provider for Cluster Federation](/docs/tasks/federation/set-up-coredns-provider-federation/).
+[Setting up CoreDNS as DNS provider for Cluster Federation](/docs/tutorials/federation/set-up-coredns-provider-federation/).

 ## Adding a cluster to a federation

--- a/docs/tasks/federation/set-up-coredns-provider-federation.md
+++ b/docs/tasks/federation/set-up-coredns-provider-federation.md
@ -23,7 +23,7 @@ DNS provider for Cluster Federation.

 * You need to have a running Kubernetes cluster (which is
 referenced as host cluster). Please see one of the
-[getting started](/docs/home/) guides for
+[getting started](/docs/getting-started-guides/) guides for
 installation instructions for your platform.
 * Support for `LoadBalancer` services in member clusters of federation is
 mandatory to enable `CoreDNS` for service discovery across federated clusters.
--- a/docs/tasks/federation/set-up-placement-policies-federation.md
+++ b/docs/tasks/federation/set-up-placement-policies-federation.md
@ -12,7 +12,7 @@ resources using an external policy engine.
 {% capture prerequisites %}

 You need to have a running Kubernetes cluster (which is referenced as host
-cluster). Please see one of the [getting started](/docs/home/)
+cluster). Please see one of the [getting started](/docs/getting-started-guides/)
 guides for installation instructions for your platform.

 {% endcapture %}
--- a/docs/tasks/job/parallel-processing-expansion.md
+++ b/docs/tasks/job/parallel-processing-expansion.md
@ -109,7 +109,7 @@ Processing item cherry

 In the first example, each instance of the template had one parameter, and that parameter was also
 used as a label.  However label keys are limited in [what characters they can
-contain](/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set).
+contain](/docs/user-guide/labels/#syntax-and-character-set).

 This slightly more complex example uses the jinja2 template language to generate our objects.
 We will use a one-line python script to convert the template to a file.
--- a/docs/tasks/manage-daemon/update-daemon-set.md
+++ b/docs/tasks/manage-daemon/update-daemon-set.md
@ -159,7 +159,7 @@ causes:

 The rollout is stuck because new DaemonSet pods can't be scheduled on at least one
 node. This is possible when the node is 
-[running out of resources](/docs/tasks/administer-cluster/out-of-resource/).
+[running out of resources](/docs/concepts/cluster-administration/out-of-resource/).

 When this happens, find the nodes that don't have the DaemonSet pods scheduled on
 by comparing the output of `kubectl get nodes` and the output of:
--- a/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
+++ b/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
@ -18,7 +18,7 @@ This document walks you through an example of enabling Horizontal Pod Autoscalin
 This example requires a running Kubernetes cluster and kubectl, version 1.2 or later.
 [Heapster](https://github.com/kubernetes/heapster) monitoring needs to be deployed in the cluster
 as Horizontal Pod Autoscaler uses it to collect metrics
-(if you followed [getting started on GCE guide](/docs/home/gce/),
+(if you followed [getting started on GCE guide](/docs/getting-started-guides/gce),
 heapster monitoring will be turned-on by default).

 To specify multiple resource metrics for a Horizontal Pod Autoscaler, you must have a Kubernetes cluster
--- a/docs/tasks/run-application/run-replicated-stateful-application.md
+++ b/docs/tasks/run-application/run-replicated-stateful-application.md
@ -13,7 +13,7 @@ title: Run a Replicated Stateful Application
 {% capture overview %}

 This page shows how to run a replicated stateful application using a
-[StatefulSet](/docs/concepts/workloads/controllers/statefulset/) controller.
+[StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/) controller.
 The example is a MySQL single-master topology with multiple slaves running
 asynchronous replication.

@ -29,7 +29,7 @@ on general patterns for running stateful applications in Kubernetes.
 * {% include default-storage-class-prereqs.md %}
 * This tutorial assumes you are familiar with
  [PersistentVolumes](/docs/concepts/storage/persistent-volumes/)
-  and [StatefulSets](/docs/concepts/workloads/controllers/statefulset/),
+  and [StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/),
  as well as other core concepts like [Pods](/docs/concepts/workloads/pods/pod/),
  [Services](/docs/concepts/services-networking/service/), and
  [ConfigMaps](/docs/tasks/configure-pod-container/configmap/).
@ -169,7 +169,7 @@ Because the example topology consists of a single MySQL master and any number of
 slaves, the script simply assigns ordinal `0` to be the master, and everyone
 else to be slaves.
 Combined with the StatefulSet controller's
-[deployment order guarantee](/docs/concepts/workloads/controllers/statefulset/#deployment-and-scaling-guarantee),
+[deployment order guarantee](/docs/concepts/abstractions/controllers/statefulsets/#deployment-and-scaling-guarantee),
 this ensures the MySQL master is Ready before creating slaves, so they can begin
 replicating.

--- a/docs/tasks/tools/install-kubectl.md
+++ b/docs/tasks/tools/install-kubectl.md
@ -130,7 +130,7 @@ Edit the config file with a text editor of your choice, such as Notepad for exam

 ## Configure kubectl

-In order for kubectl to find and access a Kubernetes cluster, it needs a [kubeconfig file](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/), which is created automatically when you create a cluster using kube-up.sh or successfully deploy a Minikube cluster. See the [getting started guides](/docs/home/) for more about creating clusters. If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/administer-cluster/share-configuration/).
+In order for kubectl to find and access a Kubernetes cluster, it needs a [kubeconfig file](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/), which is created automatically when you create a cluster using kube-up.sh or successfully deploy a Minikube cluster. See the [getting started guides](/docs/getting-started-guides/) for more about creating clusters. If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/administer-cluster/share-configuration/).
 By default, kubectl configuration is located at `~/.kube/config`.

 ## Check the kubectl configuration
--- a/docs/tasks/tools/install-minikube.md
+++ b/docs/tasks/tools/install-minikube.md
@ -46,7 +46,7 @@ If you do not already have a hypervisor installed, install one now.

 {% capture whatsnext %}

-* [Running Kubernetes Locally via Minikube](/docs/home/minikube/)
+* [Running Kubernetes Locally via Minikube](/docs/getting-started-guides/minikube/)

 {% endcapture %}

--- a/docs/tools/index.md
+++ b/docs/tools/index.md
@ -16,7 +16,7 @@ Kubernetes contains the following built-in tools:

 ##### Kubeadm 

-[`kubeadm`](/docs/home/kubeadm/) is the command line tool for easily provisioning a secure Kubernetes cluster on top of physical or cloud servers or virtual machines (currently in alpha).
+[`kubeadm`](/docs/getting-started-guides/kubeadm/) is the command line tool for easily provisioning a secure Kubernetes cluster on top of physical or cloud servers or virtual machines (currently in alpha).

 ##### Kubefed

@ -25,7 +25,7 @@ to help you administrate your federated clusters.

 ##### Minikube

-[`minikube`](/docs/home/minikube/) is a tool that makes it
+[`minikube`](/docs/getting-started-guides/minikube/) is a tool that makes it
 easy to run a single-node Kubernetes cluster locally on your workstation for
 development and testing purposes.

--- a/docs/tutorials/stateful-application/basic-stateful-set.md
+++ b/docs/tutorials/stateful-application/basic-stateful-set.md
@ -11,7 +11,7 @@ title: StatefulSet Basics

 {% capture overview %}
 This tutorial provides an introduction to managing applications with
-[StatefulSets](/docs/concepts/workloads/controllers/statefulset/). It 
+[StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/). It 
 demonstrates how to create, delete, scale, and update the Pods of StatefulSets.
 {% endcapture %}

@ -24,7 +24,7 @@ following Kubernetes concepts.
 * [Headless Services](/docs/concepts/services-networking/service/#headless-services)
 * [PersistentVolumes](/docs/concepts/storage/persistent-volumes/)
 * [PersistentVolume Provisioning](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/staging/persistent-volume-provisioning/)
-* [StatefulSets](/docs/concepts/workloads/controllers/statefulset/)
+* [StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/)
 * [kubectl CLI](/docs/user-guide/kubectl)

 This tutorial assumes that your cluster is configured to dynamically provision 
@ -54,7 +54,7 @@ After this tutorial, you will be familiar with the following.

 Begin by creating a StatefulSet using the example below. It is similar to the 
 example presented in the
-[StatefulSets](/docs/concepts/workloads/controllers/statefulset/) concept. 
+[StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/) concept. 
 It creates a [Headless Service](/docs/concepts/services-networking/service/#headless-services), 
 `nginx`, to publish the IP addresses of Pods in the StatefulSet, `web`. 

@ -133,7 +133,7 @@ web-1     1/1       Running   0          1m

 ```

-As mentioned in the [StatefulSets](/docs/concepts/workloads/controllers/statefulset/) 
+As mentioned in the [StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/) 
 concept, the Pods in a StatefulSet have a sticky, unique identity. This identity 
 is based on a unique ordinal index that is assigned to each Pod by the 
 StatefulSet controller. The Pods' names take the form 
--- a/docs/tutorials/stateful-application/cassandra.md
+++ b/docs/tutorials/stateful-application/cassandra.md
@ -45,7 +45,7 @@ To complete this tutorial, you should already have a basic familiarity with [Pod

 ### Additional Minikube Setup Instructions

-**Caution:** [Minikube](/docs/home/minikube/) defaults to 1024MB of memory and 1 CPU which results in an insufficient resource errors during this tutorial. 
+**Caution:** [Minikube](/docs/getting-started-guides/minikube/) defaults to 1024MB of memory and 1 CPU which results in an insufficient resource errors during this tutorial. 
 {: .caution}

 To avoid these errors, run minikube with:
--- a/docs/tutorials/stateful-application/zookeeper.md
+++ b/docs/tutorials/stateful-application/zookeeper.md
@ -12,9 +12,9 @@ title: Running ZooKeeper, A CP Distributed System

 {% capture overview %}
 This tutorial demonstrates [Apache Zookeeper](https://zookeeper.apache.org) on 
-Kubernetes using [StatefulSets](/docs/concepts/workloads/controllers/statefulset/), 
+Kubernetes using [StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/), 
 [PodDisruptionBudgets](/docs/concepts/workloads/pods/disruptions/#specifying-a-poddisruptionbudget), 
-and [PodAntiAffinity](/docs/concepts/configuration/assign-pod-node//#inter-pod-affinity-and-anti-affinity-beta-feature).
+and [PodAntiAffinity](/docs/user-guide/node-selection/#inter-pod-affinity-and-anti-affinity-beta-feature).
 {% endcapture %}

 {% capture prerequisites %}
@ -28,9 +28,9 @@ Kubernetes concepts.
 * [PersistentVolumes](/docs/concepts/storage/volumes/)
 * [PersistentVolume Provisioning](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/staging/persistent-volume-provisioning/)
 * [ConfigMaps](/docs/tasks/configure-pod-container/configmap/)
-* [StatefulSets](/docs/concepts/workloads/controllers/statefulset/)
+* [StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/)
 * [PodDisruptionBudgets](/docs/concepts/workloads/pods/disruptions/#specifying-a-poddisruptionbudget)
-* [PodAntiAffinity](/docs/concepts/configuration/assign-pod-node//#inter-pod-affinity-and-anti-affinity-beta-feature)
+* [PodAntiAffinity](/docs/user-guide/node-selection/#inter-pod-affinity-and-anti-affinity-beta-feature)
 * [kubectl CLI](/docs/user-guide/kubectl)

 You will require a cluster with at least four nodes, and each node will require
@ -92,7 +92,7 @@ The manifest below contains a
 [Headless Service](/docs/concepts/services-networking/service/#headless-services), 
 a [ConfigMap](/docs/tasks/configure-pod-container/configmap/), 
 a [PodDisruptionBudget](/docs/concepts/workloads/pods/disruptions//#specifying-a-poddisruptionbudget), 
-and a [StatefulSet](/docs/concepts/workloads/controllers/statefulset/). 
+and a [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/). 

 {% include code.html language="yaml" file="zookeeper.yaml" ghlink="/docs/tutorials/stateful-application/zookeeper.yaml" %}

--- a/docs/tutorials/stateless-application/hello-minikube.md
+++ b/docs/tutorials/stateless-application/hello-minikube.md
@ -7,7 +7,7 @@ title: Hello Minikube
 The goal of this tutorial is for you to turn a simple Hello World Node.js app
 into an application running on Kubernetes. The tutorial shows you how to
 take code that you have developed on your machine, turn it into a Docker
-container image and then run that image on [Minikube](/docs/home/minikube).
+container image and then run that image on [Minikube](/docs/getting-started-guides/minikube).
 Minikube provides a simple way of running Kubernetes on your local machine for free.

 {% endcapture %}
@ -45,7 +45,7 @@ create a local cluster. This tutorial also assumes you are using
 on OS X. If you are on a different platform like Linux, or using VirtualBox
 instead of Docker for Mac, the instructions to install Minikube may be
 slightly different. For general Minikube installation instructions, see
-the [Minikube installation guide](/docs/home/minikube/).
+the [Minikube installation guide](/docs/getting-started-guides/minikube/).

 Use `curl` to download and install the latest Minikube release:

--- a/Show More
+++ b/Show More