merge master to 1.10, with fixes (#7682)

_data/docs-home.yml

@@ -18,8 +18,13 @@ toc:
   - docs/home/contribute/review-issues.md
   - docs/home/contribute/style-guide.md
   - docs/home/contribute/includes.md
+<<<<<<< HEAD
   - docs/home/contribute/localization.md
   - docs/home/contribute/blog-post.md
+||||||| merged common ancestors
+=======
+  - docs/home/contribute/localization.md
+>>>>>>> merge master to 1.10, with fixes (#7682)
 
   - title: Updating Automatically Generated Reference Pages
     section:

_data/reference.yml

@@ -32,7 +32,12 @@ toc:
   - docs/reference/workloads-18-19.md
 
 - title: API Reference
+<<<<<<< HEAD
   landing_page: /docs/reference/generated/kubernetes-api/v1.10/
+||||||| merged common ancestors
+=======
+  landing_page: /docs/api-reference/v1.8/
+>>>>>>> merge master to 1.10, with fixes (#7682)
   section:
   - title: v1.10
     path: /docs/reference/generated/kubernetes-api/v1.10/

_data/setup.yml

@@ -32,8 +32,14 @@ toc:
   - docs/getting-started-guides/alternatives.md
 
 - title: Hosted Solutions
+<<<<<<< HEAD
   landing_page: /docs/setup/pick-right-solution/#hosted-solutions
+||||||| merged common ancestors
+=======
+  landing_page: /docs/setup/hosted-solutions/overview/
+>>>>>>> merge master to 1.10, with fixes (#7682)
   section:
+  - docs/setup/hosted-solutions/overview.md
   - title: Running Kubernetes on Google Kubernetes Engine
     path: https://cloud.google.com/kubernetes-engine/docs/before-you-begin/
   - title: Running Kubernetes on Azure Container Service
@@ -75,6 +81,13 @@ toc:
 
     - title: Bare Metal
       section:
+<<<<<<< HEAD
+||||||| merged common ancestors
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+      - docs/getting-started-guides/fedora/fedora_ansible_config.md
+=======
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+>>>>>>> merge master to 1.10, with fixes (#7682)
       - docs/getting-started-guides/fedora/fedora_manual_config.md
       - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
       - docs/getting-started-guides/coreos/index.md

_data/tasks.yml

@@ -186,6 +186,7 @@ toc:
   - docs/tasks/administer-cluster/configure-multiple-schedulers.md
   - docs/tasks/administer-cluster/ip-masq-agent.md
   - docs/tasks/administer-cluster/dns-custom-nameservers.md
+<<<<<<< HEAD
 <<<<<<< HEAD
   - docs/tasks/administer-cluster/dns-debugging-resolution.md
   - docs/tasks/administer-cluster/pvc-protection.md
@@ -193,6 +194,11 @@ toc:
 ||||||| merged common ancestors
   - docs/tasks/administer-cluster/pvc-protection.md
 =======
+||||||| merged common ancestors
+=======
+  - docs/tasks/administer-cluster/dns-debugging-resolution.md
+  - docs/tasks/administer-cluster/pvc-protection.md
+>>>>>>> merge master to 1.10, with fixes (#7682)
   - docs/tasks/administer-cluster/storage-object-in-use-protection.md
 >>>>>>> add pv protection description (#7620)