Merge branch 'master' of https://github.com/docker/docker.github.io

 the commit.

Author: johndmulhausen

apidocs/cloud-api-source/source/includes/node.md

@@ -1,5 +1,3 @@
-{% raw %}
-
 # Nodes
 
 ## Node
@@ -376,5 +374,3 @@ Available in Docker Cloud's **REST API**
 Parameter | Description
 --------- | -----------
 uuid | The UUID of the node to terminate
-
-{% endraw %}

apidocs/cloud-api-source/source/includes/stack.md

@@ -1,5 +1,3 @@
-{% raw %}
-
 # Stacks
 
 ## Stack
@@ -568,5 +566,3 @@ Available in Docker Cloud's **REST API**
 Parameter | Description
 --------- | -----------
 uuid | The UUID of the stack to terminate
-
-{% endraw %}

engine/admin/formatting.md

@@ -9,8 +9,6 @@ menu:
 title: Format command and log output
 ---
 
-{% raw %}
-
 # Formatting reference
 
 Docker uses [Go templates](https://golang.org/pkg/text/template/) to allow users manipulate the output format
@@ -35,36 +33,46 @@ 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 %}
 
 ### Title
 
 Title capitalizes a string.
 
+	{% raw %}
 	$ docker inspect --format "{{title .Name}}" container
+	{% endraw %}
 
 ### Upper
 
 Upper turns a string into its upper case representation.
 
+	{% raw %}
 	$ docker inspect --format "{{upper .Name}}" container
-
-{% endraw %}
+	{% endraw %}

engine/admin/logging/fluentd.md

@@ -10,8 +10,6 @@ menu:
 title: Fluentd logging driver
 ---
 
-{% raw %}
-
 # Fluentd logging driver
 
 The `fluentd` logging driver sends container logs to the
@@ -35,8 +33,10 @@ 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
@@ -115,5 +115,3 @@ aggregate store.
 3. Start one or more containers with the `fluentd` logging driver:
 
         $ docker run --log-driver=fluentd your/application
-
-{% endraw %}

engine/admin/logging/log_tags.md

@@ -11,8 +11,6 @@ menu:
 title: Log tags for logging driver
 ---
 
-{% raw %}
-
 # Log Tags
 
 The `tag` log option specifies how to format a tag that identifies the
@@ -25,6 +23,7 @@ docker run --log-driver=fluentd --log-opt fluentd-address=myhost.local:24224 --l
 
 Docker supports some special template markup you can use when specifying a tag's value:
 
+{% raw %}
 | Markup             | Description                                          |
 |--------------------|------------------------------------------------------|
 | `{{.ID}}`          | The first 12 characters of the container id.         |
@@ -36,30 +35,33 @@ Docker supports some special template markup you can use when specifying a tag's
 | `{{.DaemonName}}`  | The name of the docker program (`docker`).           |
 
 For example, specifying a `--log-opt tag="{{.ImageName}}/{{.Name}}/{{.ID}}"` value yields `syslog` log lines like:
+{% endraw %}
 
 ```
 Aug  7 18:33:19 HOSTNAME docker/hello-world/foobar/5790672ab6a0[9103]: Hello from Docker.
 ```
 
+{% raw %}
 At startup time, the system sets the `container_name` field and `{{.Name}}` in
 the tags. If you use `docker rename` to rename a container, the new name is not
 reflected in the log messages. Instead, these messages continue to use the
 original container name.
+{% endraw %}
 
 For advanced usage, the generated tag's use [go
 templates](http://golang.org/pkg/text/template/) and the container's [logging
 context](https://github.com/docker/docker/blob/master/daemon/logger/context.go).
 
 As an example of what is possible with the syslog logger:
 
-```
+```{% raw %}
 $ docker run -it --rm \
     --log-driver syslog \
     --log-opt tag="{{ (.ExtraAttributes nil).SOME_ENV_VAR }}" \
     --log-opt env=SOME_ENV_VAR \
     -e SOME_ENV_VAR=logtester.1234 \
     flyinprogrammer/logtester
-```
+{% endraw %}```
 
 Results in logs like this:
 
@@ -68,5 +70,3 @@ Apr  1 15:22:17 ip-10-27-39-73 docker/logtester.1234[45499]: + exec app
 Apr  1 15:22:17 ip-10-27-39-73 docker/logtester.1234[45499]: 2016-04-01 15:22:17.075416751 +0000 UTC stderr msg: 1
 ```
 
-
-{% endraw %}

engine/admin/logging/overview.md

@@ -11,8 +11,6 @@ menu:
 title: Configuring Logging Drivers
 ---
 
-{% raw %}
-
 # Configure logging drivers
 
 The container can have a different logging driver than the Docker daemon. Use
@@ -245,13 +243,13 @@ logging driver options.
 
 For example, to specify both additional options:
 
-```bash
+```bash{% raw %}
 $ docker run -dit \
     --log-driver=fluentd \
     --log-opt fluentd-address=localhost:24224 \
     --log-opt tag="docker.{{.Name}}" \
     alpine sh
-```
+{% endraw %}```
 
 If container cannot connect to the Fluentd daemon on the specified address and
 `fluentd-async-connect` is not enabled, the container stops immediately.
@@ -307,5 +305,3 @@ The Google Cloud Logging driver supports the following options:
 
 For detailed information about working with this logging driver, see the
 [Google Cloud Logging driver](gcplogs.md). reference documentation.
-
-{% endraw %}

engine/admin/logging/splunk.md

@@ -10,8 +10,6 @@ menu:
 title: Splunk logging driver
 ---
 
-{% raw %}
-
 # Splunk logging driver
 
 The `splunk` logging driver sends container logs to
@@ -35,6 +33,7 @@ You can set the logging driver for a specific container by using the
 You can use the `--log-opt NAME=VALUE` flag to specify these additional Splunk
 logging driver options:
 
+{% raw %}
 | Option                      | Required | Description                                                                                                                                                                                                        |
 |-----------------------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `splunk-token`              | required | Splunk HTTP Event Collector token.                                                                                                                                                                                 |
@@ -48,6 +47,7 @@ logging driver options:
 | `tag`                       | optional | Specify tag for message, which interpret some markup. Default value is `{{.ID}}` (12 characters of the container ID). Refer to the [log tag option documentation](log_tags.md) for customizing the log tag format. |
 | `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.                                                                        |
+{% endraw %}
 
 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 logging message.
@@ -58,6 +58,7 @@ Docker daemon is running. The path to the root certificate and Common Name is
 specified using an HTTPS scheme. This is used for verification.
 The `SplunkServerDefaultCert` is automatically generated by Splunk certificates.
 
+    {% raw %}
     docker run --log-driver=splunk \
         --log-opt splunk-token=176FCEBF-4CF5-4EDF-91BC-703796522D20 \
         --log-opt splunk-url=https://splunkhost:8088 \
@@ -69,5 +70,4 @@ The `SplunkServerDefaultCert` is automatically generated by Splunk certificates.
         --env "TEST=false"
         --label location=west
         your/application
-
-{% endraw %}
+    {% endraw %}

engine/deprecated.md

@@ -11,8 +11,6 @@ menu:
 title: Deprecated Engine Features
 ---
 
-{% raw %}
-
 # Deprecated Engine Features
 
 The following list of features are deprecated in Engine.
@@ -108,7 +106,9 @@ Log tags are now generated in a standard way across different logging drivers.
 Because of which, the driver specific log tag options `syslog-tag`, `gelf-tag` and
 `fluentd-tag` have been deprecated in favor of the generic `tag` option.
 
+    {% raw %}
     docker --log-driver=syslog --log-opt tag="{{.ImageName}}/{{.Name}}/{{.ID}}"
+    {% endraw %}
 
 ### LXC built-in exec driver
 **Deprecated In Release: [v1.8.0](https://github.com/docker/docker/releases/tag/v1.8.0)**
@@ -189,5 +189,3 @@ Since 1.9, Docker Content Trust Offline key has been renamed to Root key and the
 
 - DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE is now named DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE
 - DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE is now named DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE
-
-{% endraw %}

engine/reference/api/docker_remote_api_v1.18.md

@@ -9,8 +9,6 @@ menu:
 title: Remote API v1.18
 ---
 
-{% raw %}
-
 # Docker Remote API v1.18
 
 ## 1. Brief introduction
@@ -525,7 +523,9 @@ Get `stdout` and `stderr` logs from the container ``id``
      Connection: Upgrade
      Upgrade: tcp
 
+     {% raw %}
      {{ STREAM }}
+     {% endraw %}
 
 **Query parameters**:
 
@@ -600,7 +600,9 @@ Export the contents of container `id`
     HTTP/1.1 200 OK
     Content-Type: application/octet-stream
 
+    {% raw %}
     {{ TAR STREAM }}
+    {% endraw %}
 
 **Status codes**:
 
@@ -904,7 +906,9 @@ Attach to the container `id`
     Connection: Upgrade
     Upgrade: tcp
 
+    {% raw %}
     {{ STREAM }}
+    {% endraw %}
 
 **Query parameters**:
 
@@ -984,7 +988,9 @@ Implements websocket protocol handshake according to [RFC 6455](http://tools.iet
 
 **Example response**
 
+    {% raw %}
     {{ STREAM }}
+    {% endraw %}
 
 **Query parameters**:
 
@@ -1077,7 +1083,9 @@ Copy files or folders of container `id`
     HTTP/1.1 200 OK
     Content-Type: application/x-tar
 
+    {% raw %}
     {{ TAR STREAM }}
+    {% endraw %}
 
 **Status codes**:
 
@@ -1183,7 +1191,9 @@ Build an image from a Dockerfile
 
     POST /build HTTP/1.1
 
+    {% raw %}
     {{ TAR STREAM }}
+    {% endraw %}
 
 **Example response**:
 
@@ -1944,7 +1954,9 @@ interactive session with the `exec` command.
     HTTP/1.1 200 OK
     Content-Type: application/vnd.docker.raw-stream
 
+    {% raw %}
     {{ STREAM }}
+    {% endraw %}
 
 **JSON parameters**:
 
@@ -2135,5 +2147,3 @@ To set cross origin requests to the remote api please give values to
 default or blank means CORS disabled
 
     $ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
-
-{% endraw %}