Merge branch 'master' of https://github.com/kubernetes/website into r…

…elease-1.9

* 'master' of https://github.com/kubernetes/website:
  Rename `gems` to `plugins` in `/_config.yml`
  fix test dependency
  Fix a SVG which received many complaints (#6252)
  update docs to reference latest updates
  Update daemonset.md
  [Monthly Maintenance] Fix broken links from Screaming Frog SEO Spider
  add note that encryption at rest is supported
  call out missing content in effort to fix it

_config.yml

@@ -60,7 +60,7 @@ defaults:
 
 permalink: pretty
 
-gems:
+plugins:
   - jekyll-feed
   - jekyll-sitemap
   - jekyll-seo-tag

_redirects

@@ -139,6 +139,7 @@
 
 /docs/contribute/write-new-topic/        /docs/home/contribute/write-new-topic/ 301
 /docs/deprecate/     /ddocs/reference/deprecation-policy/ 301
+/docs/deprecated/     /ddocs/reference/deprecation-policy/ 301
 /docs/deprecation-policy/     /docs/reference/deprecation-policy/ 301
 
 /docs/federation/api-reference/     /docs/reference/federation/v1/operations/ 301
@@ -269,6 +270,7 @@
 /docs/tutorials/stateless-application/expose-external-ip-address-service/     /docs/tasks/access-application-cluster/service-access-application-cluster/ 301
 /docs/tutorials/stateless-application/run-stateless-ap-replication-controller/     /docs/tasks/run-application/run-stateless-application-deployment/ 301
 /docs/tutorials/stateless-application/run-stateless-application-deployment/     /docs/tasks/run-application/run-stateless-application-deployment/ 301
+/docs/tutorials/tasks/set-up-cluster-federation-kubefed/     /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301
 
 /docs/user-guide/     /docs/home/ 301
 /docs/user-guide/accessing-the-cluster/     /docs/tasks/access-application-cluster/access-cluster/ 301
@@ -279,7 +281,7 @@
 /docs/user-guide/config-best-practices/     /docs/concepts/configuration/overview/ 301
 /docs/user-guide/configmap/     /docs/tasks/configure-pod-container/configmap/ 301
 /docs/user-guide/configmap/README/     /docs/tasks/configure-pod-container/configure-pod-configmap/ 301
-/docs/user-guide/configuring-containers/     /docs/tasks/ 301
+/docs/user-guide/configuring-containers/     /docs/tasks/configure-pod-container/configmap/ 301
 /docs/user-guide/connecting-applications/     /docs/concepts/services-networking/connect-applications-service/ 301
 /docs/user-guide/connecting-to-applications-port-forward/     /docs/tasks/access-application-cluster/port-forward-access-application-cluster/ 301
 /docs/user-guide/connecting-to-applications-proxy/     /docs/tasks/access-kubernetes-api/http-proxy-access-api/ 301
@@ -343,6 +345,7 @@
 /docs/user-guide/namespaces/     /docs/concepts/overview/working-with-objects/namespaces/ 301
 /docs/user-guide/networkpolicies/     /docs/concepts/services-networking/network-policies/ 301
 /docs/user-guide/node-selection/     /docs/concepts/configuration/assign-pod-node/ 301
+/docs/user-guide/node-selection/README     /docs/concepts/configuration/assign-pod-node/ 301
 /docs/user-guide/overview/     /docs/concepts/overview/what-is-kubernetes/ 301
 /docs/user-guide/persistent-volumes/     /docs/concepts/storage/persistent-volumes/ 301
 /docs/user-guide/persistent-volumes/index     /docs/concepts/storage/persistent-volumes/ 301

docs/admin/admission-controllers.md

@@ -364,7 +364,7 @@ For more information about persistent volume claims, see ["PersistentVolumeClaim
 ### PodPreset
 
 This plug-in injects a pod with the fields specified in a matching PodPreset.
-See also [PodPreset concept](docs/concepts/workloads/pods/podpreset/) and
+See also [PodPreset concept](/docs/concepts/workloads/pods/podpreset/) and
 [Inject Information into Pods Using a PodPreset](/docs/tasks/inject-data-application/podpreset)
 for more information.
 

docs/admin/federation/index.md

@@ -6,7 +6,7 @@ approvers:
 title: (Deprecated) Using `federation-up` and `deploy.sh`
 ---
 
-## The mechanisms explained in this doc to setup federation are deprecated. [`kubefed`](/docs/tutorials/tasks/set-up-cluster-federation-kubefed/) is now the recommended way to deploy federation.
+## The mechanisms explained in this doc to setup federation are deprecated. [`kubefed`](/docs/tasks/federation/set-up-cluster-federation-kubefed/) is now the recommended way to deploy federation.
 
 This guide explains how to set up cluster federation that lets us control multiple Kubernetes clusters.
 

docs/concepts/configuration/secret.md

@@ -743,3 +743,6 @@ Pod level](#use-case-secret-visible-to-one-container-in-a-pod).
    by impersonating the kubelet.  It is a planned feature to only send secrets to
    nodes that actually require them, to restrict the impact of a root exploit on a
    single node.
+
+**Note:** As of 1.7 [encryption of secret data at rest is supported](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/).
+{: .note}

docs/concepts/services-networking/network-policies.md

@@ -68,7 +68,7 @@ spec:
 
 *POSTing this to the API server will have no effect unless your chosen networking solution supports network policy.*
 
-__Mandatory Fields__: As with all other Kubernetes config, a `NetworkPolicy` needs `apiVersion`, `kind`, and `metadata` fields.  For general information about working with config files, see [here](/docs/user-guide/simple-yaml), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources).
+__Mandatory Fields__: As with all other Kubernetes config, a `NetworkPolicy` needs `apiVersion`, `kind`, and `metadata` fields.  For general information about working with config files, see [Configure Containers Using a ConfigMap](/docs/tasks/configure-pod-container/configmap/), and [Object Management](https://kubernetes.io/docs/tutorials/object-management-kubectl/object-management/).
 
 __spec__: `NetworkPolicy` [spec](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status) has all the information needed to define a particular network policy in the given namespace.
 

docs/concepts/workloads/controllers/daemonset.md

@@ -88,8 +88,6 @@ controller will think that those Pods were created by it.  Kubernetes will not s
 this.  One case where you might want to do this is manually create a Pod with a different value on
 a node for testing.
 
-If you attempt to create a DaemonSet such that 
-
 ### Running Pods on Only Some Nodes
 
 If you specify a `.spec.template.spec.nodeSelector`, then the DaemonSet controller will

docs/concepts/workloads/controllers/garbage-collection.md

@@ -93,7 +93,7 @@ the owner object.
 
 Note that in the "foregroundDeletion", only dependents with
 `ownerReference.blockOwnerDeletion` block the deletion of the owner object.
-Kubernetes version 1.7 will add an admission controller that controls user access to set
+Kubernetes version 1.7 added an [admission controller](/docs/admin/admission-controllers/#ownerreferencespermissionenforcement) that controls user access to set
 `blockOwnerDeletion` to true based on delete permissions on the owner object, so that
 unauthorized dependents cannot delay deletion of an owner object.
 

docs/concepts/workloads/controllers/replicaset.md

@@ -96,8 +96,7 @@ frontend-qhloh   1/1       Running   0          1m
 ## Writing a ReplicaSet Spec
 
 As with all other Kubernetes API objects, a ReplicaSet needs the `apiVersion`, `kind`, and `metadata` fields.  For
-general information about working with manifests, see [here](/docs/user-guide/simple-yaml/),
-[here](/docs/tasks/), and [here](/docs/concepts/tools/kubectl/object-management-overview/).
+general information about working with manifests, see [Object Management](/docs/concepts/tools/kubectl/object-management-overview/).
 
 A ReplicaSet also needs a [`.spec` section](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status).
 

docs/concepts/workloads/controllers/replicationcontroller.md

@@ -99,9 +99,8 @@ specifies an expression that just gets the name from each pod in the returned li
 
 ## Writing a ReplicationController Spec
 
-As with all other Kubernetes config, a ReplicationController needs `apiVersion`, `kind`, and `metadata` fields.  For
-general information about working with config files, see [here](/docs/user-guide/simple-yaml/),
-[here](/docs/tasks/), and [here](/docs/concepts/tools/kubectl/object-management-overview/).
+As with all other Kubernetes config, a ReplicationController needs `apiVersion`, `kind`, and `metadata` fields.
+For general information about working with config files, see [Object Management](/docs/concepts/tools/kubectl/object-management-overview/).
 
 A ReplicationController also needs a [`.spec` section](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status).
 

docs/getting-started-guides/cloudstack.md

@@ -8,10 +8,7 @@ title: Cloudstack
 
 [CoreOS](http://coreos.com) templates for CloudStack are built [nightly](http://stable.release.core-os.net/amd64-usr/current/). CloudStack operators need to [register](http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/templates.html) this template in their cloud before proceeding with these Kubernetes deployment instructions.
 
-This guide uses an [Ansible playbook](https://github.com/apachecloudstack/k8s).
-This is completely automated, a single playbook deploys Kubernetes.
-
-This [Ansible](http://ansibleworks.com) playbook deploys Kubernetes on a CloudStack based Cloud using CoreOS images. The playbook, creates an ssh key pair, creates a security group and associated rules and finally starts coreOS instances configured via cloud-init.
+This guide uses a single [Ansible playbook](https://github.com/apachecloudstack/k8s), which is completely automated and can deploy Kubernetes on a CloudStack based Cloud using CoreOS images. The playbook, creates an ssh key pair, creates a security group and associated rules and finally starts coreOS instances configured via cloud-init.
 
 
 

docs/tasks/administer-cluster/romana-network-policy.md

@@ -27,7 +27,7 @@ Follow the [containerized installation guide](https://github.com/romana/romana/t
 To apply network policies use one of the following:
 
 * [Romana network policies](https://github.com/romana/romana/wiki/Romana-policies).
-    * [Example of Romana network policy](https://github.com/romana/core/tree/master/policy).
+    * [Example of Romana network policy](https://github.com/romana/core/blob/master/doc/policy.md).
 * The NetworkPolicy API.
 
 {% endcapture %}