merge master to 1.10, with fixes (#7682)

_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