Revert "re-organize docker cloud topics, public intro to swarm mode"

_data/advisories.yaml

@@ -4,8 +4,8 @@
 
 
 # Define Advisory texts
-# can be used in page frontmatter, e.g.:
-#       advisory: experimental
+# can be used in page frontmatter:
+#       advisory = "experimental"
 
 texts:
   experimental: "The functionality described on this page is marked as Experimental, and as such, may change before it becomes generally available."
@@ -17,7 +17,6 @@ texts:
   swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product."
   swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands), and the advanced [Learn Docker sample app](/engine/getstarted-voting-app/). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands."
   engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta."
-  cloud-swarm: "**Beta Feature.** Swarm Mode for Docker Cloud is currently a public Beta."
 
 
 # URL based advisories

_data/toc.yaml

@@ -919,7 +919,72 @@ manuals:
     title: Docker Cloud Settings and Docker ID
   - path: /docker-cloud/orgs/
     title: Organizations and Teams
-
+  - sectiontitle: Getting Started
+    section:
+    - path: /docker-cloud/getting-started/intro_cloud/
+      title: Introducing Docker Cloud
+    - path: /docker-cloud/getting-started/connect-infra/
+      title: Link to your Infrastructure
+    - path: /docker-cloud/getting-started/your_first_node/
+      title: Deploy your first node
+    - path: /docker-cloud/getting-started/your_first_service/
+      title: Deploy your first service
+    - sectiontitle: Deploy an application
+      section:
+      - path: /docker-cloud/getting-started/deploy-app/1_introduction/
+        title: Introduction to Deploying an app in Docker Cloud
+      - path: /docker-cloud/getting-started/deploy-app/2_set_up/
+        title: Set up your environment
+      - path: /docker-cloud/getting-started/deploy-app/3_prepare_the_app/
+        title: Prepare the application
+      - path: /docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry/
+        title: Push the image to Docker Cloud's Registry
+      - path: /docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service/
+        title: Deploy the app as a Docker Cloud service
+      - path: /docker-cloud/getting-started/deploy-app/6_define_environment_variables/
+        title: Define environment variables
+      - path: /docker-cloud/getting-started/deploy-app/7_scale_the_service/
+        title: Scale the service
+      - path: /docker-cloud/getting-started/deploy-app/8_view_logs/
+        title: View service logs
+      - path: /docker-cloud/getting-started/deploy-app/9_load-balance_the_service/
+        title: Load-balance the service
+      - path: /docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service/
+        title: Provision a data backend for the service
+      - path: /docker-cloud/getting-started/deploy-app/11_service_stacks/
+        title: Stackfiles for your service
+      - path: /docker-cloud/getting-started/deploy-app/12_data_management_with_volumes/
+        title: Data management with Volumes
+  - sectiontitle: Manage Applications
+    section:
+    - path: /docker-cloud/apps/deploy-to-cloud-btn/
+      title: Add a Deploy to Docker Cloud button
+    - path: /docker-cloud/apps/auto-destroy/
+      title: Automatic container destroy
+    - path: /docker-cloud/apps/autorestart/
+      title: Automatic container restart
+    - path: /docker-cloud/apps/auto-redeploy/
+      title: Automatic service redeploy
+    - path: /docker-cloud/apps/load-balance-hello-world/
+      title: Create a proxy or load balancer
+    - path: /docker-cloud/apps/deploy-tags/
+      title: Deployment tags
+    - path: /docker-cloud/apps/stacks/
+      title: Manage service stacks
+    - path: /docker-cloud/apps/ports/
+      title: Publish and expose service or container ports
+    - path: /docker-cloud/apps/service-redeploy/
+      title: Redeploy running services
+    - path: /docker-cloud/apps/service-scaling/
+      title: Scale your service
+    - path: /docker-cloud/apps/api-roles/
+      title: Service API Roles
+    - path: /docker-cloud/apps/service-links/
+      title: Service discovery and links
+    - path: /docker-cloud/apps/triggers/
+      title: Use triggers
+    - path: /docker-cloud/apps/volumes/
+      title: Work with data volumes
   - sectiontitle: Manage Builds and Images
     section:
     - path: /docker-cloud/builds/
@@ -938,21 +1003,7 @@ manuals:
       title: Automated repository tests
     - path: /docker-cloud/builds/advanced/
       title: Advanced options for Autobuild and Autotest
-  - sectiontitle: Manage Swarms (Beta Swarm Mode)
-    section:
-    - path: /docker-cloud/cloud-swarm/
-      title: Overview
-    - path: /docker-cloud/cloud-swarm/using-swarm-mode/
-      title: Using Swarm Mode
-    - path: /docker-cloud/cloud-swarm/register-swarms/
-      title: Register existing swarms
-    - path: /docker-cloud/cloud-swarm/create-cloud-swarm/
-      title: Create a new swarm in Docker Cloud
-    - path: /docker-cloud/cloud-swarm/connect-to-swarm/
-      title: Connect to a swarm through Docker Cloud
-    - path: /docker-cloud/cloud-swarm/link-aws-swarm/
-      title: Link to Amazon Web Services to create Swarms
-  - sectiontitle: Manage Infrastructure (Standard Mode)
+  - sectiontitle: Manage Infrastructure
     section:
     - path: /docker-cloud/infrastructure/
       title: Infrastructure Overview
@@ -978,87 +1029,18 @@ manuals:
       title: Using Docker Cloud and Packet.net
     - path: /docker-cloud/infrastructure/cloud-on-aws-faq/
       title: Using Docker Cloud on AWS
-  - sectiontitle: Manage Nodes and Apps (Standard Mode)
-    section:
-    - path: /docker-cloud/standard/
-      title: Overview
-    - sectiontitle: Getting Started
-      section:
-      - path: /docker-cloud/getting-started/
-        title: Getting started with Docker Cloud
-      - path: /docker-cloud/getting-started/intro_cloud/
-        title: Introducing Docker Cloud
-      - path: /docker-cloud/getting-started/connect-infra/
-        title: Link to your Infrastructure
-      - path: /docker-cloud/getting-started/your_first_node/
-        title: Deploy your first node
-      - path: /docker-cloud/getting-started/your_first_service/
-        title: Deploy your first service
-      - sectiontitle: Deploy an application
-        section:
-        - path: /docker-cloud/getting-started/deploy-app/1_introduction/
-          title: Introduction to Deploying an app in Docker Cloud
-        - path: /docker-cloud/getting-started/deploy-app/2_set_up/
-          title: Set up your environment
-        - path: /docker-cloud/getting-started/deploy-app/3_prepare_the_app/
-          title: Prepare the application
-        - path: /docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry/
-          title: Push the image to Docker Cloud's Registry
-        - path: /docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service/
-          title: Deploy the app as a Docker Cloud service
-        - path: /docker-cloud/getting-started/deploy-app/6_define_environment_variables/
-          title: Define environment variables
-        - path: /docker-cloud/getting-started/deploy-app/7_scale_the_service/
-          title: Scale the service
-        - path: /docker-cloud/getting-started/deploy-app/8_view_logs/
-          title: View service logs
-        - path: /docker-cloud/getting-started/deploy-app/9_load-balance_the_service/
-          title: Load-balance the service
-        - path: /docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service/
-          title: Provision a data backend for the service
-        - path: /docker-cloud/getting-started/deploy-app/11_service_stacks/
-          title: Stackfiles for your service
-        - path: /docker-cloud/getting-started/deploy-app/12_data_management_with_volumes/
-          title: Data management with Volumes
-    - sectiontitle: Manage Applications
-      section:
-      - path: /docker-cloud/apps/
-        title: Applications in Docker Cloud
-      - path: /docker-cloud/apps/deploy-to-cloud-btn/
-        title: Add a Deploy to Docker Cloud button
-      - path: /docker-cloud/apps/auto-destroy/
-        title: Automatic container destroy
-      - path: /docker-cloud/apps/autorestart/
-        title: Automatic container restart
-      - path: /docker-cloud/apps/auto-redeploy/
-        title: Automatic service redeploy
-      - path: /docker-cloud/apps/load-balance-hello-world/
-        title: Create a proxy or load balancer
-      - path: /docker-cloud/apps/deploy-tags/
-        title: Deployment tags
-      - path: /docker-cloud/apps/stacks/
-        title: Manage service stacks
-      - path: /docker-cloud/apps/ports/
-        title: Publish and expose service or container ports
-      - path: /docker-cloud/apps/service-redeploy/
-        title: Redeploy running services
-      - path: /docker-cloud/apps/service-scaling/
-        title: Scale your service
-      - path: /docker-cloud/apps/api-roles/
-        title: Service API Roles
-      - path: /docker-cloud/apps/service-links/
-        title: Service discovery and links
-      - path: /docker-cloud/apps/triggers/
-        title: Use triggers
-      - path: /docker-cloud/apps/volumes/
-        title: Work with data volumes
-    - path: /docker-cloud/apps/stack-yaml-reference/
-      title: Cloud stack file YAML reference
+  - title: Cloud API reference
+    path: /apidocs/docker-cloud/
+  - title: Cloud stack file YAML reference
+    path: /docker-cloud/apps/stack-yaml-reference/
   - path: /docker-cloud/slack-integration/
     title: Docker Cloud notifications in Slack
   - path: /apidocs/docker-cloud/
     title: Docker Cloud API
     nosync: true
+  - path: /docker-cloud/apps/stack-yaml-reference/
+    title: Stack file YAML reference
+    nosync: true
   - path: /docker-cloud/installing-cli/
     title: The Docker Cloud CLI
   - path: /docker-cloud/docker-errors-faq/

_layouts/docs.html

@@ -218,9 +218,6 @@
               <section class="section" id="DocumentationText">
 								{% if page.title %}<h1>{{ page.title }}</h1>{% endif %}
 								{% if page.advisory %}<blockquote style="border-left: 6px solid #FFD601; background: -webkit-gradient(linear, left top, left bottom, from(#FBFCFC), to(#EBEDEF));">{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>{% endif %}
-
-								{% if page.previewflag %}<blockquote style="border-left: 6px solid #2ECC71; background: -webkit-gradient(linear, left top, left bottom, from(#FBFCFC), to(#EBEDEF));">{{ site.data.previewdocs.texts[page.previewflag] | markdownify }}</blockquote>{% endif %}
-
               {% unless page.tree == false %}{% include read_time.html %}{% endunless %}
 							{{ content }}
 							{% if page.noratings != true %}

docker-cloud/apps/api-roles.md

@@ -4,7 +4,6 @@ keywords: API, Services, roles
 redirect_from:
 - /docker-cloud/feature-reference/api-roles/
 title: Service API roles
-notoc: true
 ---
 
 You can configure a service so that it can access the Docker Cloud API. When you
@@ -32,4 +31,4 @@ $ curl -H "Authorization: $DOCKERCLOUD_AUTH" -H "Accept: application/json" $WEB_
 For example, you can use information retrieved using the API to read the linked
 endpoints, and use them to reconfigure a proxy container.
 
-See the [API documentation](/apidocs/docker-cloud.md) for more information on the different API operations available.
+See the [API documentation](/apidocs/docker-cloud.md) for more information on the different API operations available.

docker-cloud/apps/deploy-to-cloud-btn.md

@@ -18,17 +18,16 @@ This is an example button to deploy our <a href="https://github.com/docker/docke
 
 <a href="https://cloud.docker.com/stack/deploy/?repo=https://github.com/docker/dockercloud-quickstart-python" target="_blank"><img src="https://files.cloud.docker.com/images/deploy-to-dockercloud.svg"></a>
 
-The button redirects the user to the **Launch new Stack** wizard, with the stack
-definition already filled with the contents of any of the following files (which
-are fetched in the order shown) from the repository (taking into account branch
-and relative path):
+The button redirects the user to the **Launch new Stack** wizard, with the stack definition already filled with the contents of any of the following files (which are fetched in the order shown) from the repository (taking into account branch and relative path):
 
 * `docker-cloud.yml`
 * `docker-compose.yml`
 * `fig.yml`
 
 The user can still modify the stack definition before deployment.
 
+
+
 ## Adding the 'Deploy to Docker Cloud' button in GitHub
 
 You can simply add the following snippet to your `README.md` file:

docker-cloud/apps/index.md

@@ -2,7 +2,6 @@
 description: Manage your Docker Cloud Applications
 keywords: applications, reference, Cloud
 title: Applications in Docker Cloud
-notoc: true
 ---
 
 Applications in Docker Cloud are usually several Services linked together using

docker-cloud/apps/stack-yaml-reference.md

@@ -3,7 +3,7 @@ description: Stack YAML reference
 keywords: YAML, stack, reference
 redirect_from:
 - /docker-cloud/feature-reference/stack-yaml-reference/
-title: Cloud stack file YAML reference
+title: Stack file YAML reference
 ---
 
 A stack is a collection of services that make up an application in a specific environment. Learn more about stacks [here](stacks.md). A **stack file** is a file in YAML format that defines one or more services, similar to a `docker-compose.yml` file but with a few extensions. The default name for this file is `docker-cloud.yml`.
@@ -320,4 +320,4 @@ Stack files (`docker-cloud.yml`) were designed with `docker-compose.yml` in mind
 build
 external_links
 env_file
-```
+```

docker-cloud/builds/index.md

@@ -1,8 +1,8 @@
 ---
 description: Manage Builds and Images in Docker Cloud
 keywords: builds, images, Cloud
-title: Builds and images overview
 notoc: true
+title: Builds and images overview
 ---
 
 Docker Cloud provides a hosted registry service where you can create
@@ -23,4 +23,4 @@ running services when a build passes its tests.
 * [Automated repository tests](automated-testing.md)
 * [Advanced options for Autobuild and Autotest](advanced.md)
 
-![Docker Cloud repository General view](images/repo-general.png)
+![a Docker Cloud repository's General view](images/repo-general.png)

docker-cloud/builds/push-images.md

@@ -5,7 +5,6 @@ redirect_from:
 - /docker-cloud/getting-started/intermediate/pushing-images-to-dockercloud/
 - /docker-cloud/tutorials/pushing-images-to-dockercloud/
 title: Push images to Docker Cloud
-notoc: true
 ---
 
 Docker Cloud uses Docker Hub as its native registry for storing both public and

docker-cloud/builds/repos.md

@@ -9,7 +9,7 @@ repositories and manually [push images](push-images.md) using `docker push`, or
 you can link to a source code provider and use [automated builds](automated-build.md) to build the images for you. These repositories
 can be either public or private.
 
-![Docker Cloud repository General view](images/repo-general.png)
+![a Docker Cloud repository's General view](images/repo-general.png)
 
 Additionally, you can access your Docker Hub repositories and automated builds
 from within Docker Cloud.