Merge branch 'master' of https://github.com/steveperry-53/steveperry-53.github.io

Conflicts:
	README.md
	_config.yml

_data/globals.yml

@@ -4,5 +4,6 @@ tocs:
 - tasks
 - concepts
 - reference
+- tools
 - samples
 - support

_data/guides.yml

@@ -163,10 +163,10 @@ toc:
       path: /docs/getting-started-guides/gce/
     - title: Running Kubernetes on AWS EC2
       path: /docs/getting-started-guides/aws/
+    - title: Running Kubernetes on Azure
+      path: /docs/getting-started-guides/azure/
     - title: Running Kubernetes on Azure (Weave-based)
       path: /docs/getting-started-guides/coreos/azure/
-    - title: Running Kubernetes on Azure (Flannel-based)
-      path: /docs/getting-started-guides/azure/
     - title: Running Kubernetes on CenturyLink Cloud
       path: /docs/getting-started-guides/clc/
     - title: Running Kubernetes on IBM SoftLayer
@@ -252,6 +252,8 @@ toc:
     path: /docs/admin/
   - title: Cluster Management Guide
     path: /docs/admin/cluster-management/
+  - title: kubeadm reference
+    path: /docs/admin/kubeadm/
   - title: Installing Addons
     path: /docs/admin/addons/
   - title: Sharing a Cluster with Namespaces

_data/reference.yml

@@ -63,7 +63,7 @@ toc:
   - title: kubectl Commands
     section:
     - title: kubectl
-      path: /docs/user-guide/kubectl/kubectl/
+      path: /docs/user-guide/kubectl/
     - title: kubectl annotate
       path: /docs/user-guide/kubectl/kubectl_annotate/
     - title: kubectl api-versions
@@ -230,6 +230,8 @@ toc:
     path: /docs/user-guide/services/
   - title: Service Accounts
     path: /docs/user-guide/service-accounts/
+  - title: Third Party Resources
+    path: /docs/user-guide/thirdpartyresources/
   - title: Volumes
     path: /docs/user-guide/volumes/
 

_data/tasks.yml

@@ -10,4 +10,8 @@ toc:
   section:
   - title: Using an HTTP Proxy to Access the Kubernetes API
     path: /docs/tasks/access-kubernetes-api/http-proxy-access-api/
+- title: Administering a Cluster
+  section:
+  - title: Assigning Pods to Nodes
+    path: /docs/tasks/administer-cluster/assign-pods-nodes/
 

_data/tools.yml

@@ -0,0 +1,4 @@
+bigheader: "Tools"
+toc:
+- title: Tools
+  path: /docs/tools/

_data/tutorials.yml

@@ -2,59 +2,49 @@ bigheader: "Tutorials"
 toc:
 - title: Tutorials
   path: /docs/tutorials/
-- title: Getting Started
+- title: Kubernetes Basics
   section:
+  - title: Overview
+    path: /docs/tutorials/kubernetes-basics/
   - title: 1. Create a Cluster
     section:
-    - title: Creating a Cluster
-      path: /docs/tutorials/getting-started/create-cluster/
     - title: Using Minikube to Create a Cluster
-      path: /docs/tutorials/getting-started/cluster-intro/
+      path: /docs/tutorials/kubernetes-basics/cluster-intro/
     - title: Interactive Tutorial - Creating a Cluster
-      path: /docs/tutorials/getting-started/cluster-interactive/
+      path: /docs/tutorials/kubernetes-basics/cluster-interactive/
   - title: 2. Deploy an App
     section:
-    - title: Deploying an App
-      path: /docs/tutorials/getting-started/deploy-app/
     - title: Using kubectl to Create a Deployment
-      path: /docs/tutorials/getting-started/deploy-intro/
+      path: /docs/tutorials/kubernetes-basics/deploy-intro/
     - title: Interactive Tutorial - Deploying an App
-      path: /docs/tutorials/getting-started/deploy-interactive/
+      path: /docs/tutorials/kubernetes-basics/deploy-interactive/
   - title: 3. Explore Your App
     section:
-    - title: Exploring Your App
-      path: /docs/tutorials/getting-started/explore-app/
     - title: Viewing Pods and Nodes
-      path: /docs/tutorials/getting-started/explore-intro/
+      path: /docs/tutorials/kubernetes-basics/explore-intro/
     - title: Interactive Tutorial - Exploring Your App
-      path: /docs/tutorials/getting-started/explore-interactive/
+      path: /docs/tutorials/kubernetes-basics/explore-interactive/
   - title: 4. Expose Your App Publicly
     section:
-    - title: Exposing Your App Publicly
-      path: /docs/tutorials/getting-started/expose-app/
     - title: Using a Service to Expose Your App
-      path: /docs/tutorials/getting-started/expose-intro/
+      path: /docs/tutorials/kubernetes-basics/expose-intro/
     - title: Interactive Tutorial - Exposing Your App
-      path: /docs/tutorials/getting-started/expose-interactive/
+      path: /docs/tutorials/kubernetes-basics/expose-interactive/
   - title: 5. Scale Your App
     section:
-    - title: Scaling Your App
-      path: /docs/tutorials/getting-started/scale-app/
     - title: Running Multiple Instances of Your App
-      path: /docs/tutorials/getting-started/scale-intro/
+      path: /docs/tutorials/kubernetes-basics/scale-intro/
     - title: Interactive Tutorial - Scaling Your App
-      path: /docs/tutorials/getting-started/scale-interactive/
+      path: /docs/tutorials/kubernetes-basics/scale-interactive/
   - title: 6. Update Your App
     section:
-    - title: Updating Your App
-      path: /docs/tutorials/getting-started/update-app/
     - title: Performing a Rolling Update
-      path: /docs/tutorials/getting-started/update-intro/
+      path: /docs/tutorials/kubernetes-basics/update-intro/
     - title: Interactive Tutorial - Updating Your App
-      path: /docs/tutorials/getting-started/update-interactive/
+      path: /docs/tutorials/kubernetes-basics/update-interactive/
 - title: Stateless Applications
   section:
   - title: Running a Stateless Application Using a Deployment
     path: /docs/tutorials/stateless-application/run-stateless-application-deployment/
-  - title: Exposing an External IP Address Using a Service
+  - title: Using a Service to Access an Application in a Cluster
     path: /docs/tutorials/stateless-application/expose-external-ip-address-service/