Merge branch 'master' into templates3

_data/guides.yml

@@ -8,10 +8,12 @@ toc:
   section:
   - title: What is Kubernetes?
     path: /docs/whatisk8s/
+  - title: Installing Kubernetes on Linux with kubeadm
+    path: /docs/getting-started-guides/kubeadm/
+  - title: Hello World on Google Container Engine
+    path: /docs/hellonode/
   - title: Downloading or Building Kubernetes
     path: /docs/getting-started-guides/binary_release/
-  - title: Hello World Walkthrough
-    path: /docs/hellonode/
   - title: Online Training Course
     path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
 
@@ -58,8 +60,14 @@ toc:
     path: /docs/user-guide/config-best-practices/
   - title: Using kubectl to Manage Resources
     path: /docs/user-guide/working-with-resources/
-  - title: Garbage collection
-    path: /docs/user-guide/garbage-collector/
+  - title: Garbage Collection (Beta)
+    path: /docs/user-guide/garbage-collection/
+  - title: Using NetworkPolicy
+    section:
+    - title: Example Walkthrough
+      path: /docs/getting-started-guides/network-policy/walkthrough/
+    - title: Using Calico for NetworkPolicy 
+      path: /docs/getting-started-guides/network-policy/calico/
 
 - title: Batch Jobs
   section:
@@ -227,6 +235,8 @@ toc:
         path: /docs/getting-started-guides/ubuntu/
       - title: Ubuntu Nodes with Calico
         path: /docs/getting-started-guides/ubuntu-calico/
+    - title: Validate Node Setup
+      path: /docs/admin/node-conformance
   - title: Portable Multi-Node Cluster
     path: /docs/getting-started-guides/docker-multinode/
   - title: Building Large Clusters
@@ -242,6 +252,8 @@ toc:
     path: /docs/admin/
   - title: Cluster Management Guide
     path: /docs/admin/cluster-management/
+  - title: Installing Addons
+    path: /docs/admin/addons/
   - title: Sharing a Cluster with Namespaces
     path: /docs/admin/namespaces/
   - title: Namespaces Walkthrough
@@ -284,3 +296,5 @@ toc:
     path: /docs/admin/salt/
   - title: Monitoring Node Health
     path: /docs/admin/node-problem/
+  - title: AppArmor
+    path: /docs/admin/apparmor/

_data/overrides.yml

@@ -8,10 +8,11 @@ overrides:
 - path: docs/admin/kube-proxy.md
 - path: docs/admin/kube-scheduler.md
 - path: docs/admin/kubelet.md
-- changedpath: docs/api-reference/extensions/v1beta1/definitions.html _includes/v1.3/extensions-v1beta1-definitions.html
-- changedpath: docs/api-reference/extensions/v1beta1/operations.html _includes/v1.3/extensions-v1beta1-operations.html
-- changedpath: docs/api-reference/v1/definitions.html _includes/v1.3/v1-definitions.html
-- changedpath: docs/api-reference/v1/operations.html _includes/v1.3/v1-operations.html
+- changedpath: docs/api-reference/extensions/v1beta1/definitions.html _includes/v1.4/extensions-v1beta1-definitions.html
+- changedpath: docs/api-reference/extensions/v1beta1/operations.html _includes/v1.4/extensions-v1beta1-operations.html
+- changedpath: docs/api-reference/v1/definitions.html _includes/v1.4/v1-definitions.html
+- changedpath: docs/api-reference/v1/operations.html _includes/v1.4/v1-operations.html
+- copypath: k8s/federation/docs/api-reference/ docs/federation/
 - copypath: k8s/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml docs/getting-started-guides/fluentd-gcp.yaml
 - copypath: k8s/examples/blog-logging/counter-pod.yaml docs/getting-started-guides/counter-pod.yaml
 - copypath: k8s/examples/blog-logging/counter-pod.yaml docs/user-guide/counter-pod.yaml

_data/reference.yml

@@ -212,12 +212,16 @@ toc:
     path: /docs/user-guide/petset/    
   - title: Pods
     path: /docs/user-guide/pods/
+  - title: Pod Security Policies
+    path: /docs/user-guide/pod-security-policy/
   - title: Replica Sets
     path: /docs/user-guide/replicasets/
   - title: Replication Controller
     path: /docs/user-guide/replication-controller/    
   - title: Resource Quotas
     path: /docs/admin/resource-quota/    
+  - title: Scheduled Jobs
+    path: /docs/user-guide/scheduled-jobs/
   - title: Secrets
     path: /docs/user-guide/secrets/
   - title: Security Context
@@ -225,7 +229,7 @@ toc:
   - title: Services
     path: /docs/user-guide/services/
   - title: Service Accounts
-    path: /docs/user-guide/service-accounts/    
+    path: /docs/user-guide/service-accounts/
   - title: Volumes
     path: /docs/user-guide/volumes/
 
@@ -243,3 +247,26 @@ toc:
     path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md
   - title: Security in Kubernetes
     path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md    
+
+- title: Federation
+  section:
+  - title: Federation User Guide
+    path: /docs/user-guide/federation/
+  - title: Federated Events
+    path: /docs/user-guide/federation/events/
+  - title: Federated Ingress
+    path: /docs/user-guide/federation/federated-ingress/
+  - title: Federated Namespaces
+    path: /docs/user-guide/federation/namespaces/
+  - title: Federated ReplicaSets
+    path: /docs/user-guide/federation/replicasets/
+  - title: Federated Secrets
+    path: /docs/user-guide/federation/secrets/
+  - title: Federation API
+    path: /docs/federation/api-reference/README/
+  - title: Federation Components
+    section:
+    - title: federation-apiserver
+      path: /docs/admin/federation-apiserver.md
+    - title : federation-controller-mananger
+      path: /docs/admin/federation-controller-manager.md