Revert "Merge pull request docker#437 from gdevillele/fix_keywords_fo…

…rmat" This reverts commit 13ddc13, reversing changes made to 7a11f05.
alexmavr · Nov 4, 2016 · 1a193d7 · 1a193d7
1 parent 2424da4
commit 1a193d7
Show file tree

Hide file tree

Showing 439 changed files with 1,517 additions and 941 deletions.
diff --git a/_data/staging-container/Dockerfile b/_data/staging-container/Dockerfile
@@ -4,4 +4,4 @@ VOLUME /usr/src/app
 
 EXPOSE 4000
 
-CMD jekyll clean && jekyll serve -d /_site --watch -H 0.0.0.0 -P 4000
+CMD jekyll serve -d /_site --watch -H 0.0.0.0 -P 4000
diff --git a/_data/toc.yaml b/_data/toc.yaml
@@ -1075,8 +1075,6 @@ toc:
       title: Amazon Web Services
     - path: /machine/drivers/digital-ocean/
       title: Digital Ocean
-    - path: /machine/drivers/exoscale/
-      title: Exoscale
     - path: /machine/drivers/generic/
       title: Generic
     - path: /machine/drivers/gce/
@@ -1099,6 +1097,8 @@ toc:
       title: VMware vCloud Air
     - path: /machine/drivers/vsphere/
       title: VMware vSphere
+    - path: /machine/drivers/exoscale/
+      title: exoscale
   - path: /machine/completion/
     title: Command-line Completion
 - sectiontitle: Docker Store

diff --git a/compose/bundles.md b/compose/bundles.md
@@ -2,7 +2,8 @@
 advisory: experimental
 description: Description of Docker and Compose's experimental support for application
   bundles
-keywords: documentation, docs,  docker, compose, bundles, stacks
+keywords:
+- documentation, docs,  docker, compose, bundles, stacks
 menu:
   main:
     parent: workw_compose
@@ -205,4 +206,4 @@ A service has the following fields:
 </dl>
 
 > **Note:** Some configuration options are not yet supported in the DAB format,
-> including volume mounts.
+> including volume mounts.
diff --git a/compose/completion.md b/compose/completion.md
@@ -1,6 +1,7 @@
 ---
 description: Compose CLI reference
-keywords: fig, composition, compose, docker, orchestration, cli,  reference
+keywords:
+- fig, composition, compose, docker, orchestration, cli,  reference
 menu:
   main:
     parent: workw_compose
@@ -64,4 +65,4 @@ Enjoy working with Compose faster and with less typos!
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/compose-file.md b/compose/compose-file.md
@@ -2,7 +2,8 @@
 aliases:
 - /compose/yml
 description: Compose file reference
-keywords: fig, composition, compose, docker
+keywords:
+- fig, composition, compose, docker
 menu:
   main:
     parent: workw_compose
@@ -1168,4 +1169,4 @@ If you forget and use a single dollar sign (`$`), Compose interprets the value a
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
-- [Command line reference](./reference/index.md)
+- [Command line reference](./reference/index.md)
diff --git a/compose/django.md b/compose/django.md
@@ -1,6 +1,7 @@
 ---
 description: Getting started with Docker Compose and Django
-keywords: documentation, docs,  docker, compose, orchestration, containers
+keywords:
+- documentation, docs,  docker, compose, orchestration, containers
 menu:
   main:
     parent: workw_compose
@@ -189,4 +190,4 @@ In this section, you set up the database connection for Django.
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/env-file.md b/compose/env-file.md
@@ -1,6 +1,7 @@
 ---
 description: Declaring default environment variables in file
-keywords: fig, composition, compose, docker, orchestration, environment, env file
+keywords:
+- fig, composition, compose, docker, orchestration, environment, env file
 menu:
   main:
     parent: workw_compose
@@ -38,4 +39,4 @@ file, but can also be used to define the following
 
 - [User guide](index.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/environment-variables.md b/compose/environment-variables.md
@@ -1,6 +1,7 @@
 ---
 description: How to set, use and manage environment variables in Compose
-keywords: fig, composition, compose, docker, orchestration, environment, variables, env file
+keywords:
+- fig, composition, compose, docker, orchestration, environment, variables, env file
 menu:
   main:
     parent: workw_compose
@@ -103,4 +104,4 @@ Several environment variables are available for you to configure the Docker Comp
 
 ## Environment variables created by links
 
-When using the ['links' option](compose-file.md#links) in a [v1 Compose file](compose-file.md#version-1), environment variables will be created for each link. They are documented in the [Link environment variables reference](link-env-deprecated.md). Please note, however, that these variables are deprecated - you should just use the link alias as a hostname instead.
+When using the ['links' option](compose-file.md#links) in a [v1 Compose file](compose-file.md#version-1), environment variables will be created for each link. They are documented in the [Link environment variables reference](link-env-deprecated.md). Please note, however, that these variables are deprecated - you should just use the link alias as a hostname instead.
diff --git a/compose/extends.md b/compose/extends.md
@@ -1,7 +1,8 @@
 ---
 description: How to use Docker Compose's extends keyword to share configuration between
   files and projects
-keywords: fig, composition, compose, docker, orchestration, documentation, docs
+keywords:
+- fig, composition, compose, docker, orchestration, documentation, docs
 menu:
   main:
     parent: workw_compose
@@ -350,4 +351,4 @@ In the case of `environment`, `labels`, `volumes` and `devices`, Compose
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md
@@ -1,6 +1,7 @@
 ---
 description: Getting started with Docker Compose
-keywords: documentation, docs,  docker, compose, orchestration, containers
+keywords:
+- documentation, docs,  docker, compose, orchestration, containers
 menu:
   main:
     parent: workw_compose
@@ -186,4 +187,4 @@ At this point, you have seen the basics of how Compose works.
 - Next, try the quick start guide for [Django](django.md),
   [Rails](rails.md), or [WordPress](wordpress.md).
 - [Explore the full list of Compose commands](./reference/index.md)
-- [Compose configuration file reference](compose-file.md)
+- [Compose configuration file reference](compose-file.md)
diff --git a/compose/index.md b/compose/index.md
@@ -1,6 +1,7 @@
 ---
 description: Introduction and Overview of Compose
-keywords: documentation, docs,  docker, compose, orchestration,  containers
+keywords:
+- documentation, docs,  docker, compose, orchestration,  containers
 menu:
   main:
     identifier: workw_compose
@@ -25,4 +26,4 @@ Compose is a tool for defining and running multi-container Docker applications.
 
 To see a detailed list of changes for past and current releases of Docker
 Compose, please refer to the
-[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
+[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
diff --git a/compose/install.md b/compose/install.md
@@ -1,6 +1,7 @@
 ---
 description: How to install Docker Compose
-keywords: compose, orchestration, install, installation, docker, documentation
+keywords:
+- compose, orchestration, install, installation, docker, documentation
 menu:
   main:
     parent: workw_compose
@@ -131,4 +132,4 @@ To uninstall Docker Compose if you installed using `pip`:
 - [Get started with Rails](rails.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/link-env-deprecated.md b/compose/link-env-deprecated.md
@@ -2,7 +2,8 @@
 aliases:
 - /compose/env
 description: Compose CLI reference
-keywords: fig, composition, compose, docker, orchestration, cli,  reference
+keywords:
+- fig, composition, compose, docker, orchestration, cli,  reference
 menu:
   main:
     parent: workw_compose
@@ -45,4 +46,4 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/networking.md b/compose/networking.md
@@ -1,6 +1,7 @@
 ---
 description: How Compose sets up networking between containers
-keywords: documentation, docs,  docker, compose, orchestration, containers, networking
+keywords:
+- documentation, docs,  docker, compose, orchestration, containers, networking
 menu:
   main:
     parent: workw_compose
@@ -149,4 +150,4 @@ If you want your containers to join a pre-existing network, use the [`external`
         external:
           name: my-pre-existing-network
 
-Instead of attempting to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
+Instead of attempting to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
diff --git a/compose/overview.md b/compose/overview.md
@@ -1,6 +1,7 @@
 ---
 description: Introduction and Overview of Compose
-keywords: documentation, docs,  docker, compose, orchestration,  containers
+keywords:
+- documentation, docs,  docker, compose, orchestration,  containers
 menu:
   main:
     parent: workw_compose
@@ -183,4 +184,4 @@ individuals, we have a number of open channels for communication.
 
 * To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
 
-For more information and resources, please visit the [Getting Help project page](/opensource/get-help/).
+For more information and resources, please visit the [Getting Help project page](/opensource/get-help/).
diff --git a/compose/production.md b/compose/production.md
@@ -1,6 +1,7 @@
 ---
 description: Guide to using Docker Compose in production
-keywords: documentation, docs,  docker, compose, orchestration, containers,  production
+keywords:
+- documentation, docs,  docker, compose, orchestration, containers,  production
 menu:
   main:
     parent: workw_compose
@@ -83,4 +84,4 @@ Read more about the Compose/Swarm integration in the
 
 - [Installing Compose](install.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/rails.md b/compose/rails.md
@@ -1,6 +1,7 @@
 ---
 description: Getting started with Docker Compose and Rails
-keywords: documentation, docs,  docker, compose, orchestration, containers
+keywords:
+- documentation, docs,  docker, compose, orchestration, containers
 menu:
   main:
     parent: workw_compose
@@ -170,4 +171,4 @@ up`.
 - [Get started with Django](django.md)
 - [Get started with WordPress](wordpress.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/compose/swarm.md b/compose/swarm.md
@@ -1,6 +1,7 @@
 ---
 description: How to use Compose and Swarm together to deploy apps to multi-host clusters
-keywords: documentation, docs,  docker, compose, orchestration, containers, swarm
+keywords:
+- documentation, docs,  docker, compose, orchestration, containers, swarm
 menu:
   main:
     parent: workw_compose
@@ -176,4 +177,4 @@ them.
       - "affinity:image==redis"
 
 For the full set of available filters and expressions, see the [Swarm
-documentation](/swarm/scheduler/filter.md).
+documentation](/swarm/scheduler/filter.md).
diff --git a/compose/wordpress.md b/compose/wordpress.md
@@ -1,6 +1,7 @@
 ---
 description: Getting started with Compose and WordPress
-keywords: documentation, docs,  docker, compose, orchestration, containers
+keywords:
+- documentation, docs,  docker, compose, orchestration, containers
 menu:
   main:
     parent: workw_compose
@@ -112,4 +113,4 @@ At this point, WordPress should be running on port `8000` of your Docker Host, a
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Command line reference](./reference/index.md)
-- [Compose file reference](compose-file.md)
+- [Compose file reference](compose-file.md)
diff --git a/cs-engine/index.md b/cs-engine/index.md
@@ -2,7 +2,8 @@
 aliases:
 - /docker-trusted-registry/cs-engine/
 description: Learn more about the Commercially Supported Docker Engine.
-keywords: docker, engine, documentation
+keywords:
+- docker, engine, documentation
 menu:
   main:
     identifier: menu_csengine
@@ -16,4 +17,4 @@ This section includes the following topics:
 
 * [Install CS Docker Engine](install.md)
 * [Upgrade](upgrade.md)
-* [Release notes](release-notes/release-notes.md)
+* [Release notes](release-notes/release-notes.md)
diff --git a/cs-engine/install.md b/cs-engine/install.md
@@ -4,7 +4,8 @@ aliases:
 - /docker-trusted-registry/install/install-csengine/
 - /docker-trusted-registry/cs-engine/install/
 description: Learn how to install the commercially supported version of Docker Engine.
-keywords: docker, engine, dtr, install
+keywords:
+- docker, engine, dtr, install
 menu:
   main:
     identifier: csengine_install
@@ -197,4 +198,4 @@ to the `docker` group.
     $ sudo usermod -a -G docker $USER
     ```
 
-8. Log out and log back in to have your new permissions take effect.
+8. Log out and log back in to have your new permissions take effect.
diff --git a/cs-engine/release-notes/index.md b/cs-engine/release-notes/index.md
@@ -2,7 +2,8 @@
 aliases:
 - /docker-trusted-registry/cs-engine/release-notes/
 description: The release notes for CS Docker Engine.
-keywords: docker, engine, release notes
+keywords:
+- docker, engine, release notes
 menu:
   main:
     identifier: menu_csengine_release_notes
@@ -14,4 +15,4 @@ title: Release notes
 # Docker CS Engine release notes
 
 * [Release notes](release-notes.md)
-* [Prior release notes](prior-release-notes.md)
+* [Prior release notes](prior-release-notes.md)
diff --git a/cs-engine/release-notes/prior-release-notes.md b/cs-engine/release-notes/prior-release-notes.md
@@ -3,7 +3,9 @@ aliases:
 - /docker-trusted-registry/cse-prior-release-notes/
 - /docker-trusted-registry/cs-engine/release-notes/prior-release-notes/
 description: Archived release notes for commercially supported Docker Engine
-keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry, release, commercially supported Docker Engine
+keywords:
+- docker, documentation, about, technology, understanding, enterprise, hub, registry,release,
+  commercially supported Docker Engine
 menu:
   main:
     identifier: csengine_prior_release_notes
@@ -339,4 +341,4 @@ Because this addition is preventative, no CVE-ID is requested.
 (23 Apr 2015)
 
 First release, see the [Docker Engine 1.6.0 Release notes](/v1.6/release-notes/)
-  for more details.
+  for more details.
diff --git a/cs-engine/release-notes/release-notes.md b/cs-engine/release-notes/release-notes.md
@@ -3,8 +3,9 @@ aliases:
 - /docker-trusted-registry/cse-release-notes/
 - /docker-trusted-registry/cs-engine/release-notes/release-notes/
 description: Commercially supported Docker Engine release notes
-keywords: docker, documentation, about, technology, understanding, enterprise, hub,
-  registry, Commercially Supported Docker Engine, release notes
+keywords:
+- docker, documentation, about, technology, understanding, enterprise, hub, registry,
+  Commercially Supported Docker Engine, release notes
 menu:
   main:
     identifier: csengine_release_notes
@@ -111,4 +112,4 @@ https://github.com/docker/docker/issues/22486
 ## CS Engine 1.11.1-cs1
 (27 April 2016)
 
-In this release the CS Engine is supported on RHEL 7.2 OS
+In this release the CS Engine is supported on RHEL 7.2 OS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ VOLUME /usr/src/app

		EXPOSE 4000

		CMD jekyll clean && jekyll serve -d /_site --watch -H 0.0.0.0 -P 4000
		CMD jekyll serve -d /_site --watch -H 0.0.0.0 -P 4000