diff --git a/docs/tutorials/kubernetes-basics/cluster-intro.html b/docs/tutorials/kubernetes-basics/cluster-intro.html
index ab79bd8201..f6e1a60802 100644
--- a/docs/tutorials/kubernetes-basics/cluster-intro.html
+++ b/docs/tutorials/kubernetes-basics/cluster-intro.html
@@ -88,7 +88,7 @@ title: Using Minikube to Create a Cluster
When you deploy applications on Kubernetes, you tell the master to start the application containers. The master schedules the containers to run on the cluster's nodes. The nodes communicate with the master using the Kubernetes API, which the master exposes. End users can also use the Kubernetes API directly to interact with the cluster.
-
A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use Minikube. Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, Mac OS and Windows systems. The Minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this bootcamp, however, you'll use a provided online terminal with Minikube pre-installed.
+
A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use Minikube. Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, macOS, and Windows systems. The Minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this tutorial, however, you'll use a provided online terminal with Minikube pre-installed.
Now that you know what Kubernetes is, let's go to the online tutorial and start our first cluster!
diff --git a/docs/tutorials/kubernetes-basics/expose-intro.html b/docs/tutorials/kubernetes-basics/expose-intro.html
index 12170e56e7..a9d95b2ad5 100644
--- a/docs/tutorials/kubernetes-basics/expose-intro.html
+++ b/docs/tutorials/kubernetes-basics/expose-intro.html
@@ -27,7 +27,9 @@ title: Using a Service to Expose Your App
Overview of Kubernetes Services
-
Kubernetes Pods are mortal. Pods in fact have a lifecycle. When a worker node dies, the Pods running on the Node are also lost. A ReplicationController might then dynamically drive the cluster back to desired state via creation of new Pods to keep your application running. As another example, consider an image-processing backend with 3 replicas. Those replicas are fungible; the front-end system should not care about backend replicas or even if a Pod is lost and recreated. That said, each Pod in a Kubernetes cluster has a unique IP address, even Pods on the same Node, so there needs to be a way of automatically reconciling changes among Pods so that your applications continue to function. Enter Services. A Service in Kubernetes is an abstraction which defines a logical set of Pods and a policy by which to access them. Services enable a loose coupling between dependent Pods. A Service is defined using YAML (preferred) or JSON, like all Kubernetes objects. The set of Pods targeted by a Service is usually determined by a LabelSelector (see below for why you might want a Service without including selector in the spec).
+
Kubernetes Pods are mortal. Pods in fact have a lifecycle. When a worker node dies, the Pods running on the Node are also lost. A ReplicationController might then dynamically drive the cluster back to desired state via creation of new Pods to keep your application running. As another example, consider an image-processing backend with 3 replicas. Those replicas are fungible; the front-end system should not care about backend replicas or even if a Pod is lost and recreated. That said, each Pod in a Kubernetes cluster has a unique IP address, even Pods on the same Node, so there needs to be a way of automatically reconciling changes among Pods so that your applications continue to function.
+
+
Enter Services. A Service in Kubernetes is an abstraction which defines a logical set of Pods and a policy by which to access them. Services enable a loose coupling between dependent Pods. A Service is defined using YAML (preferred) or JSON, like all Kubernetes objects. The set of Pods targeted by a Service is usually determined by a LabelSelector (see below for why you might want a Service without including selector in the spec).
Although Pods each have a unique IP address, those IPs are not exposed outside the cluster without a Service. Services allow your applications to receive traffic. Services can be exposed in different ways by specifying a type in the ServiceSpec:
diff --git a/docs/tutorials/kubernetes-basics/update-intro.html b/docs/tutorials/kubernetes-basics/update-intro.html
index 54c991a2a8..05ca991bcb 100644
--- a/docs/tutorials/kubernetes-basics/update-intro.html
+++ b/docs/tutorials/kubernetes-basics/update-intro.html
@@ -94,7 +94,7 @@ title: Performing a Rolling Update
-
Similar to application Scaling, If a Deployment is exposed publicly, the Service will load-balance the traffic only to available Pods during the update. An available Pod is an instance that is available to the users of the application.
+
Similar to application Scaling, if a Deployment is exposed publicly, the Service will load-balance the traffic only to available Pods during the update. An available Pod is an instance that is available to the users of the application.
Rolling updates allow the following actions:
@@ -116,7 +116,7 @@ title: Performing a Rolling Update
-
In the following interactive tutorial we'll update our application to a new version, and also perform a rollback.
+
In the following interactive tutorial, we'll update our application to a new version, and also perform a rollback.
diff --git a/docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md b/docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md
index 97dac48789..7c6b0e304c 100644
--- a/docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md
+++ b/docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md
@@ -305,10 +305,6 @@ spec:
and `replace` do not retain the `kubectl.kubernetes.io/last-applied-configuration`
that `kubectl apply` uses to compute updates.
-**Warning**: As of Kubernetes 1.5, the `kubectl edit` command is
-incompatible with `kubectl apply`, and the two should not be
-used together.
-
## How to delete objects
There are two approaches to delete objects managed by `kubectl apply`.
diff --git a/robots.txt b/robots.txt
index 681c89e5f4..3094104a31 100644
--- a/robots.txt
+++ b/robots.txt
@@ -8,111 +8,4 @@ Disallow: 404.html
# NOTE: site renders /topic.md into /topic/index.html, effectively /topic/
-Disallow: /docs/admin/addons/
-Disallow: /docs/admin/apparmor/
-Disallow: /docs/admin/audit/
-Disallow: /docs/admin/cluster-components/
-Disallow: /docs/admin/cluster-management/
-Disallow: /docs/admin/cluster-troubleshooting/
-Disallow: /docs/admin/daemons/
-Disallow: /docs/admin/disruptions/
-Disallow: /docs/admin/dns/
-Disallow: /docs/admin/etcd/
-Disallow: /docs/admin/etcd_upgrade/
-Disallow: /docs/admin/federation/kubefed/
-Disallow: /docs/admin/garbage-collection/
-Disallow: /docs/admin/ha-master-gce/
-Disallow: /docs/admin/limitrange/
-Disallow: /docs/admin/master-node-communication/
-Disallow: /docs/admin/multi-cluster/
-Disallow: /docs/admin/multiple-schedulers/
-Disallow: /docs/admin/namespaces/
-Disallow: /docs/admin/namespaces/walkthrough/
-Disallow: /docs/admin/network-plugins/
-Disallow: /docs/admin/networking/
-Disallow: /docs/admin/node-allocatable/
-Disallow: /docs/admin/node-problem/
-Disallow: /docs/admin/node/
-Disallow: /docs/admin/out-of-resource/
-Disallow: /docs/admin/rescheduler/
-Disallow: /docs/admin/resourcequota/
-Disallow: /docs/admin/resourcequota/limitstorageconsumption/
-Disallow: /docs/admin/resourcequota/walkthrough/
-Disallow: /docs/admin/static-pods/
-Disallow: /docs/admin/sysctls/
-Disallow: /docs/admin/upgrade-1-6/
-Disallow: /docs/api/
-Disallow: /docs/contribute/
-Disallow: /kubernetes/swagger-spec/
-Disallow: /kubernetes/third_party/swagger-ui/
-Disallow: /docs/getting-started-guides/kubectl/
-Disallow: /docs/getting-started-guides/network-policy/
-Disallow: /docs/getting-started-guides/running-cloud-controller/
-Disallow: /docs/user-guide/accessing-the-cluster/
-Disallow: /docs/user-guide/annotations/
-Disallow: /docs/user-guide/application-troubleshooting/
-Disallow: /docs/user-guide/compute-resources/
-Disallow: /docs/user-guide/config-best-practices/
-Disallow: /docs/user-guide/configmap/
-Disallow: /docs/user-guide/configuring-containers/
-Disallow: /docs/user-guide/connecting-applications/
-Disallow: /docs/user-guide/connecting-to-applications-port-forward/
-Disallow: /docs/user-guide/connecting-to-applications-proxy/
-Disallow: /docs/user-guide/container-environment/
-Disallow: /docs/user-guide/containers/
-Disallow: /docs/user-guide/cron-jobs/
-Disallow: /docs/user-guide/debugging-pods-and-replication-controllers/
-Disallow: /docs/user-guide/debugging-services/
-Disallow: /docs/user-guide/deploying-applications/
-Disallow: /docs/user-guide/deployments/
-Disallow: /docs/user-guide/downward-api/
-Disallow: /docs/user-guide/environment-guide/
-Disallow: /docs/user-guide/federation/
-Disallow: /docs/user-guide/garbage-collection/
-Disallow: /docs/user-guide/getting-into-containers/
-Disallow: /docs/user-guide/gpus/
-Disallow: /docs/user-guide/horizontal-pod-autoscaling/
-Disallow: /docs/user-guide/identifiers/
-Disallow: /docs/user-guide/images/
-Disallow: /docs/user-guide/ingress/
-Disallow: /docs/user-guide/introspection-and-debugging/
-Disallow: /docs/user-guide/jobs/
-Disallow: /docs/user-guide/kubeconfig-file/
-Disallow: /docs/user-guide/liveness/
-Disallow: /docs/user-guide/load-balancer/
-Disallow: /docs/user-guide/logging/
-Disallow: /docs/user-guide/managing-deployments/
-Disallow: /docs/user-guide/monitoring/
-Disallow: /docs/user-guide/namespaces/
-Disallow: /docs/user-guide/networkpolicies/
-Disallow: /docs/user-guide/node-selection/
-Disallow: /docs/user-guide/persistent-volumes/
-Disallow: /docs/user-guide/petset/
-Disallow: /docs/user-guide/pod-preset/
-Disallow: /docs/user-guide/pod-security-policy/
-Disallow: /docs/user-guide/pod-states/
-Disallow: /docs/user-guide/pod-templates/
-Disallow: /docs/user-guide/pods/
-Disallow: /docs/user-guide/prereqs/
-Disallow: /docs/user-guide/production-pods/
-Disallow: /docs/user-guide/projected-volume/
-Disallow: /docs/user-guide/quick-start/
-Disallow: /docs/user-guide/replicasets/
-Disallow: /docs/user-guide/replication-controller/
-Disallow: /docs/user-guide/resizing-a-replication-controller/
-Disallow: /docs/user-guide/rolling-updates/
-Disallow: /docs/user-guide/secrets/
-Disallow: /docs/user-guide/security-context/
-Disallow: /docs/user-guide/service-accounts/
-Disallow: /docs/user-guide/services-firewalls/
-Disallow: /docs/user-guide/services/
-Disallow: /docs/user-guide/sharing-clusters/
-Disallow: /docs/user-guide/thirdpartyresources/
-Disallow: /docs/user-guide/ui/
-Disallow: /docs/user-guide/update-demo/
-Disallow: /docs/user-guide/volumes/
-Disallow: /docs/user-guide/walkthrough/
-Disallow: /docs/user-guide/working-with-resources/
-Disallow: /docs/whatisk8s/
-
-SITEMAP: http://kubernetes.io/sitemap.xml
+SITEMAP: https://kubernetes.io/sitemap.xml