Sync vnext-engine branch to docker/docker SHA 2f12d28

This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs

Author: Misty Stanley-Jones

engine/admin/ambassador_pattern_linking.md

@@ -150,4 +150,4 @@ case `192.168.1.52:6379`.
     	apk add socat && \
     	rm -r /var/cache/
 
-    CMD	env | grep _TCP= | (sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' && echo wait) | sh
+    CMD	env | grep _TCP= | (sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' && echo wait) | sh

engine/admin/b2d_volume_resize.md

@@ -158,4 +158,4 @@ VirtualBox.
 
   <img src="/articles/b2d_volume_images/verify.png">
 
-You're done!
+You're done!

engine/admin/chef.md

@@ -67,4 +67,4 @@ docker_container 'my_nginx' do
   env 'FOO=bar'
   subscribes :redeploy, 'docker_image[nginx]'
 end
-```
+```

engine/admin/dsc.md

@@ -166,4 +166,4 @@ container:
 ```powershell
 $containerProps = @{Name="web"; Image="node:latest"; Port="80:80"; `
 Env="PORT=80"; Link="db:db"; Command="grunt"}
-```
+```

engine/admin/formatting.md

@@ -13,6 +13,7 @@ list of elements they support in their templates:
 - [Docker Log Tag formatting](logging/log_tags.md)
 - [Docker Network Inspect formatting](../reference/commandline/network_inspect.md)
 - [Docker PS formatting](../reference/commandline/ps.md#formatting)
+- [Docker Stats formatting](../reference/commandline/stats.md#formatting)
 - [Docker Volume Inspect formatting](../reference/commandline/volume_inspect.md)
 - [Docker Version formatting](../reference/commandline/version.md#examples)
 
@@ -26,46 +27,36 @@ This is the complete list of the available functions with examples:
 Join concatenates a list of strings to create a single string.
 It puts a separator between each element in the list.
 
-	{% raw %}
 	$ docker ps --format '{{join .Names " or "}}'
-	{% endraw %}
 
 ### Json
 
 Json encodes an element as a json string.
 
-	{% raw %}
 	$ docker inspect --format '{{json .Mounts}}' container
-	{% endraw %}
 
 ### Lower
 
 Lower turns a string into its lower case representation.
 
-	{% raw %}
 	$ docker inspect --format "{{lower .Name}}" container
-	{% endraw %}
 
 ### Split
 
 Split slices a string into a list of strings separated by a separator.
 
 	{% raw %}
-	$ docker inspect --format '{{split (join .Names "/") "/"}}' container
-	{% endraw %}
+	# docker inspect --format '{{split (join .Names "/") "/"}}' container
+    {% endraw %}
 
 ### Title
 
 Title capitalizes a string.
 
-	{% raw %}
 	$ docker inspect --format "{{title .Name}}" container
-	{% endraw %}
 
 ### Upper
 
-Upper turns a string into its upper case representation.
+Upper turms a string into its upper case representation.
 
-	{% raw %}
 	$ docker inspect --format "{{upper .Name}}" container
-	{% endraw %}

engine/admin/logging/awslogs.md

@@ -82,4 +82,4 @@ and `logs:PutLogEvents` actions, as shown in the following example.
           "Resource": "*"
         }
       ]
-    }
+    }

engine/admin/logging/etwlogs.md

@@ -1,8 +1,6 @@
 ---
 description: Describes how to use the etwlogs logging driver.
 keywords: ETW, docker, logging, driver
-title: ETW logging driver
----
 
 The ETW logging driver forwards container logs as ETW events.
 ETW stands for Event Tracing in Windows, and is the common framework
@@ -58,4 +56,4 @@ context information. Note that the time stamp is also available within the ETW e
 
 **Note**  This ETW provider emits only a message string, and not a specially
 structured ETW event. Therefore, it is not required to register a manifest file
-with the system to read and interpret its ETW events.
+with the system to read and interpret its ETW events.

engine/admin/logging/fluentd.md

@@ -28,10 +28,8 @@ The `docker logs` command is not available for this logging driver.
 
 Some options are supported by specifying `--log-opt` as many times as needed:
 
- {% raw %}
  - `fluentd-address`: specify `host:port` to connect `localhost:24224`
  - `tag`: specify tag for fluentd message, which interpret some markup, ex `{{.ID}}`, `{{.FullID}}` or `{{.Name}}` `docker.{{.ID}}`
- {% endraw %}
 
 
 Configure the default logging driver by passing the
@@ -109,4 +107,4 @@ aggregate store.
 
 3. Start one or more containers with the `fluentd` logging driver:
 
-        $ docker run --log-driver=fluentd your/application
+        $ docker run --log-driver=fluentd your/application

engine/admin/logging/gcplogs.md

@@ -34,6 +34,10 @@ takes precedence over information discovered from the metadata server so a
 Docker daemon running in a Google Cloud Project can be overridden to log to a
 different Google Cloud Project using `--gcp-project`.
 
+Docker fetches the values for zone, instance name and instance id from Google
+Cloud metadata server. Those values can be provided via options if metadata
+server is not available. They will not override the values from metadata server.
+
 ## gcplogs options
 
 You can use the `--log-opt NAME=VALUE` flag to specify these additional Google
@@ -45,6 +49,9 @@ Cloud Logging driver options:
 | `gcp-log-cmd`               | optional | Whether to log the command that the container was started with. Defaults to false.                                                          |
 | `labels`                    | optional | Comma-separated list of keys of labels, which should be included in message, if these labels are specified for container.                   |
 | `env`                       | optional | Comma-separated list of keys of environment variables, which should be included in message, if these variables are specified for container. |
+| `gcp-meta-zone`             | optional | Zone name for the instance. |
+| `gcp-meta-name`             | optional | Instance name. |
+| `gcp-meta-id`               | optional | Instance ID. |
 
 If there is collision between `label` and `env` keys, the value of the `env`
 takes precedence. Both options add additional fields to the attributes of a
@@ -54,6 +61,8 @@ Below is an example of the logging options required to log to the default
 logging destination which is discovered by querying the GCE metadata server.
 
     docker run --log-driver=gcplogs \
+        --log-opt labels=location \
+        --log-opt env=TEST \
         --log-opt gcp-log-cmd=true \
         --env "TEST=false" \
         --label location=west \
@@ -62,3 +71,12 @@ logging destination which is discovered by querying the GCE metadata server.
 This configuration also directs the driver to include in the payload the label
 `location`, the environment variable `ENV`, and the command used to start the
 container.
+
+An example of the logging options for running outside of GCE (the daemon must be
+configured with GOOGLE_APPLICATION_CREDENTIALS):
+
+    docker run --log-driver=gcplogs \
+        --log-opt gcp-project=test-project
+        --log-opt gcp-meta-zone=west1 \
+        --log-opt gcp-meta-name=`hostname` \
+        your/application

engine/admin/logging/journald.md

@@ -97,18 +97,5 @@ import systemd.journal
 reader = systemd.journal.Reader()
 reader.add_match('CONTAINER_NAME=web')
 
-for msg in reader:
-  print '{CONTAINER_ID_FULL}: {MESSAGE}'.format(**msg)
-```
-
-## `journald` configuration
-
-Docker hosts with many containers may produce large amounts of logging data.
-By default, `journald` limits the number of messages stored per service per
-time-unit.
-
-If your application needs large-scale logging, configure `RateLimitIntervalSec`
-and `RateLimitBurst` in the `journald` configuration file. By default,
-`systemd` drops messages in excess of 1000 messages per service per 30 seconds.
-For more information about configuring `journald`, see the
-[`journald` documentation](https://www.freedesktop.org/software/systemd/man/journald.conf.html).
+    for msg in reader:
+      print '{CONTAINER_ID_FULL}: {MESSAGE}'.format(**msg)