Jekyll: don't put {% raw %} directives in pre blocks

Replace all occurrences of

    ```foo
    {% raw %}
    bar
    {% endraw %}
    ```

(which generates spurious empty lines in the rendered pre block) with

    {% raw %}
    ```foo
    bar
    ```
    {% endraw %}

Also, fix some occurrences where the raw section is too large and
prevented interpretation of Jekyll directives.

This is the syntax used in the documentation of Jekyll itself:

https://raw.githubusercontent.com/jekyll/jekyll/master/docs/_docs/templates.md

FTR, done with two perl substitutions:

    '^([\t ]*```[^\n]*
    )([ \t]*\{% raw %\}[^\n]*
    )' '$2$1'

and

    '^([ \t]*\{% endraw %\}[^\n]*
    )([\t ]*```[^\n]*
    )' '$2$1'

and manually tweaks.  A mechanical check would be most useful.

Signed-off-by: Akim Demaille <[email protected]>

Author: akimd

config/containers/logging/configure.md

@@ -82,13 +82,13 @@ To find the current logging driver for a running container, if the daemon
 is using the `json-file` logging driver, run the following `docker inspect`
 command, substituting the container name or ID for `<CONTAINER>`:
 
-```bash
 {% raw %}
+```bash
 $ docker inspect -f '{{.HostConfig.LogConfig.Type}}' <CONTAINER>
 
 json-file
-{% endraw %}
 ```
+{% endraw %}
 
 ## Configure the delivery mode of log messages from container to log driver
 

config/containers/logging/splunk.md

@@ -83,8 +83,8 @@ 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.
 
-```bash
 {% raw %}
+```bash
 $ docker run --log-driver=splunk \
            --log-opt splunk-token=176FCEBF-4CF5-4EDF-91BC-703796522D20 \
            --log-opt splunk-url=https://splunkhost:8088 \
@@ -96,8 +96,8 @@ $ docker run --log-driver=splunk \
            --env "TEST=false" \
            --label location=west \
        your/application
-{% endraw %}
 ```
+{% endraw %}
 
 The `splunk-url` for Splunk instances hosted on Splunk Cloud is in a format
 like `https://http-inputs-XXXXXXXX.splunkcloud.com` and does not include a

datacenter/dtr/2.2/guides/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md

@@ -49,8 +49,8 @@ DTR replica to check the DTR internal state.
 Use SSH to log into a node that is running a DTR replica, and run the following
 commands:
 
-```bash
 {% raw %}
+```bash
 # REPLICA_ID will be the replica ID for the current node.
 REPLICA_ID=$(docker ps -lf name='^/dtr-rethinkdb-.{12}$' --format '{{.Names}}' | cut -d- -f3)
 # This command will start a RethinkDB client attached to the database
@@ -59,8 +59,8 @@ docker run -it --rm \
   --net dtr-ol \
   -v dtr-ca-$REPLICA_ID:/ca dockerhubenterprise/rethinkcli:v2.2.0 \
   $REPLICA_ID
-{% endraw %}
 ```
+{% endraw %}
 
 This container connects to the local DTR replica and launches a RethinkDB client 
 that can be used to inspect the contents of the DB. RethinkDB 

datacenter/dtr/2.3/guides/admin/backups-and-disaster-recovery.md

@@ -66,12 +66,11 @@ you can backup the images by using ssh to log into a node where DTR is running,
 and creating a tar archive of the [dtr-registry volume](../architecture.md):
 
 ```none
-{% raw %}
 sudo tar -cf {{ image_backup_file }} \
-$(dirname $(docker volume inspect --format '{{.Mountpoint}}' dtr-registry-<replica-id>))
-{% endraw %}
+  {% raw %}$(dirname $(docker volume inspect --format '{{.Mountpoint}}' dtr-registry-<replica-id>)){% endraw %}
 ```
 
+
 If you're using a different storage backend, follow the best practices
 recommended for that system.
 

datacenter/dtr/2.3/guides/admin/configure/external-storage/index.md

@@ -51,16 +51,16 @@ same images.
 To check how much space your images are taking in the local filesystem, you
 can ssh into the node where DTR is deployed and run:
 
-```
 {% raw %}
+```
 # Find the path to the volume
 docker volume inspect dtr-registry-<replica-id>
 
 # Check the disk usage
 sudo du -hs \
 $(dirname $(docker volume inspect --format '{{.Mountpoint}}' dtr-registry-<dtr-replica>))
-{% endraw %}
 ```
+{% endraw %}
 
 ## NFS
 

datacenter/dtr/2.3/guides/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md

@@ -49,8 +49,8 @@ DTR replica to check the DTR internal state.
 Use SSH to log into a node that is running a DTR replica, and run the following
 commands:
 
-```bash
 {% raw %}
+```bash
 # REPLICA_ID will be the replica ID for the current node.
 REPLICA_ID=$(docker ps -lf name='^/dtr-rethinkdb-.{12}$' --format '{{.Names}}' | cut -d- -f3)
 # This command will start a RethinkDB client attached to the database
@@ -59,8 +59,8 @@ docker run -it --rm \
   --net dtr-ol \
   -v dtr-ca-$REPLICA_ID:/ca dockerhubenterprise/rethinkcli:v2.2.0 \
   $REPLICA_ID
-{% endraw %}
 ```
+{% endraw %}
 
 This container connects to the local DTR replica and launches a RethinkDB client 
 that can be used to inspect the contents of the DB. RethinkDB 

datacenter/dtr/2.4/guides/admin/backups-and-disaster-recovery.md

@@ -67,7 +67,7 @@ and creating a tar archive of the [dtr-registry volume](../architecture.md):
 
 ```none
 sudo tar -cf {{ image_backup_file }} \
-{% raw %}$(dirname $(docker volume inspect --format '{{.Mountpoint}}' dtr-registry-<replica-id>)){% endraw %}
+  {% raw %}$(dirname $(docker volume inspect --format '{{.Mountpoint}}' dtr-registry-<replica-id>)){% endraw %}
 ```
 
 If you're using a different storage backend, follow the best practices

datacenter/dtr/2.4/guides/admin/configure/external-storage/index.md

@@ -51,16 +51,16 @@ same images.
 To check how much space your images are taking in the local filesystem, you
 can ssh into the node where DTR is deployed and run:
 
-```
 {% raw %}
+```
 # Find the path to the volume
 docker volume inspect dtr-registry-<replica-id>
 
 # Check the disk usage
 sudo du -hs \
 $(dirname $(docker volume inspect --format '{{.Mountpoint}}' dtr-registry-<dtr-replica>))
-{% endraw %}
 ```
+{% endraw %}
 
 ## NFS
 

datacenter/dtr/2.4/guides/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md

@@ -49,13 +49,13 @@ DTR replica to check the DTR internal state.
 Use SSH to log into a node that is running a DTR replica, and run the following
 commands:
 
-```bash
 {% raw %}
+```bash
 # This command will start a RethinkDB client attached to the database
 # on the current node.
 docker exec -it $(docker ps -q --filter name=dtr-rethinkdb) rethinkcli
-{% endraw %}
 ```
+{% endraw %}
 
 RethinkDB stores data in different databases that contain multiple tables. The `rethinkcli`
 tool launches an interactive prompt where you can run RethinkDB

datacenter/ucp/2.0/guides/access-ucp/cli-based-access.md

@@ -56,12 +56,12 @@ To verify a client certificate bundle has been loaded and the client is
 successfully communicating with UCP, look for `ucp` in the `Server Version`
 returned by `docker version`.
 
-```bash
 {% raw %}
+```bash
 $ docker version --format '{{.Server.Version}}'
-{% endraw %}
 ucp/2.0.0
 ```
+{% endraw %}
 
 From now on, when you use the Docker CLI client, it includes your client
 certificates as part of the request to the Docker Engine.

datacenter/ucp/2.1/guides/admin/configure/add-sans-to-cluster.md

@@ -37,12 +37,12 @@ that join the cluster.
 
 You can also do this from the CLI by first running:
 
-```bash
 {% raw %}
+```bash
 $ docker node inspect --format '{{ index .Spec.Labels "com.docker.ucp.SANs" }}' <node-id>
 default-cs,127.0.0.1,172.17.0.1
-{% endraw %}
 ```
+{% endraw %}
 
 This gets the current set of SANs for the given manager node. Append your
 desired SAN to this list. For example, `default-cs,127.0.0.1,172.17.0.1,example.com`.

datacenter/ucp/2.1/guides/admin/manage-users/recover-a-user-password.md

@@ -19,10 +19,10 @@ with administrator credentials to change your password.
 If you're the only administrator, use **ssh** to log in to a manager
 node managed by UCP, and run:
 
-```none
 {% raw %}
+```none
 docker exec -it ucp-auth-api enzi \
   "$(docker inspect --format '{{ index .Args 0 }}' ucp-auth-api)" \
   passwd -i
-{% endraw %}  
 ```
+{% endraw %}

datacenter/ucp/2.1/guides/admin/monitor-and-troubleshoot/troubleshoot-configurations.md

@@ -88,22 +88,22 @@ The examples below assume you are logged in with ssh into a UCP manager node.
 
 ### Check the status of the database
 
-```bash
 {% raw %}
+```bash
 # NODE_ADDRESS will be the IP address of this Docker Swarm manager node
 NODE_ADDRESS=$(docker info --format '{{.Swarm.NodeAddr}}')
 # VERSION will be your most recent version of the docker/ucp-auth image
 VERSION=$(docker image ls --format '{{.Tag}}' docker/ucp-auth | head -n 1)
 # This command will output detailed status of all servers and database tables
 # in the RethinkDB cluster.
 docker run --rm -v ucp-auth-store-certs:/tls docker/ucp-auth:${VERSION} --db-addr=${NODE_ADDRESS}:12383 db-status
-{% endraw %}
 ```
+{% endraw %}
 
 ### Manually reconfigure database replication
 
-```bash
 {% raw %}
+```bash
 # NODE_ADDRESS will be the IP address of this Docker Swarm manager node
 NODE_ADDRESS=$(docker info --format '{{.Swarm.NodeAddr}}')
 # NUM_MANAGERS will be the current number of manager nodes in the cluster
@@ -113,8 +113,8 @@ VERSION=$(docker image ls --format '{{.Tag}}' docker/ucp-auth | head -n 1)
 # This reconfigure-db command will repair the RethinkDB cluster to have a
 # number of replicas equal to the number of manager nodes in the cluster.
 docker run --rm -v ucp-auth-store-certs:/tls docker/ucp-auth:${VERSION} --db-addr=${NODE_ADDRESS}:12383 --debug reconfigure-db --num-replicas ${NUM_MANAGERS} --emergency-repair
-{% endraw %}
 ```
+{% endraw %}
 
 ## Where to go next
 

datacenter/ucp/2.1/guides/user/access-ucp/cli-based-access.md

@@ -56,12 +56,12 @@ To verify a client certificate bundle has been loaded and the client is
 successfully communicating with UCP, look for `ucp` in the `Server Version`
 returned by `docker version`.
 
-```bash
 {% raw %}
+```bash
 $ docker version --format '{{.Server.Version}}'
-{% endraw %}
 ucp/2.1.0
 ```
+{% endraw %}
 
 From now on, when you use the Docker CLI client, it includes your client
 certificates as part of the request to the Docker Engine.

datacenter/ucp/2.2/guides/access-control/recover-a-user-password.md

@@ -23,10 +23,10 @@ with administrator credentials to change your password.
 If you're the only administrator, use **ssh** to log in to a manager
 node managed by UCP, and run:
 
-```none
 {% raw %}
+```none
 docker exec -it ucp-auth-api enzi \
   $(docker inspect --format '{{range .Args}}{{if eq "--db-addr=" (printf "%.10s" .)}}{{.}}{{end}}{{end}}' ucp-auth-api) \
   passwd -i
-{% endraw %}  
 ```
+{% endraw %}

datacenter/ucp/2.2/guides/admin/configure/add-sans-to-cluster.md

@@ -36,12 +36,12 @@ that join the swarm.
 
 You can also do this from the CLI by first running:
 
-```bash
 {% raw %}
+```bash
 $ docker node inspect --format '{{ index .Spec.Labels "com.docker.ucp.SANs" }}' <node-id>
 default-cs,127.0.0.1,172.17.0.1
-{% endraw %}
 ```
+{% endraw %}
 
 This will get the current set of SANs for the given manager node. Append your
 desired SAN to this list, for example `default-cs,127.0.0.1,172.17.0.1,example.com`,

datacenter/ucp/2.2/guides/admin/configure/external-auth/enable-ldap-config-file.md

@@ -23,19 +23,19 @@ $ docker container run --rm {{ page.ucp_org }}/{{ page.ucp_repo }}:{{ page.ucp_v
 1.  Use the following command to extract the name of the currently active
     configuration from the `ucp-agent` service.
 
-    ```bash
     {% raw %}
+    ```bash
     $ CURRENT_CONFIG_NAME=$(docker service inspect --format '{{ range $config := .Spec.TaskTemplate.ContainerSpec.Configs }}{{ $config.ConfigName }}{{ "\n" }}{{ end }}' ucp-agent | grep 'com.docker.ucp.config-')
-    {% endraw %}
     ```
+    {% endraw %}
 
 2.  Get the current configuration and save it to a TOML file.
 
-    ```bash
     {% raw %}
+    ```bash
     $ docker config inspect --format '{{ printf "%s" .Spec.Data }}' $CURRENT_CONFIG_NAME > config.toml
-    {% endraw %}
     ```
+    {% endraw %}
 
 3.  Use the output of the `example-config` command as a guide to edit your
     `config.toml` file. Under the `[auth]` sections, set `backend = "ldap"`

datacenter/ucp/2.2/guides/admin/configure/ucp-configuration-file.md

@@ -33,14 +33,14 @@ number that increases with each version, like `com.docker.ucp.config-1`. The
 Use the `docker config inspect` command to view the current settings and emit
 them to a file.
 
-```bash
 {% raw %}
+```bash
 # CURRENT_CONFIG_NAME will be the name of the currently active UCP configuration
 CURRENT_CONFIG_NAME=$(docker service inspect ucp-agent --format '{{range .Spec.TaskTemplate.ContainerSpec.Configs}}{{if eq "/etc/ucp/ucp.toml" .File.Name}}{{.ConfigName}}{{end}}{{end}}')
 # Collect the current config with `docker config inspect`
 docker config inspect --format '{{ printf "%s" .Spec.Data }}' $CURRENT_CONFIG_NAME > ucp-config.toml
-{% endraw %}
 ```
+{% endraw %}
 
 Edit the file, then use the `docker config create` and `docker service update`
 commands to create and apply the configuration from the file.

datacenter/ucp/2.2/guides/admin/install/architecture-specific-images.md

@@ -17,9 +17,7 @@ a [UCP support dump](..\..\get-support.md) to use an environment variable
 that indicates the current architecture:
 
 ```bash
-{% raw %}
-[[ $(docker info --format='{{.Architecture}}') == s390x ]] && export _ARCH='-s390x' || export _ARCH=''
-{% endraw %}
+{% raw %}[[ $(docker info --format='{{.Architecture}}') == s390x ]] && export _ARCH='-s390x' || export _ARCH=''{% endraw %}
 
 docker container run --rm \
   --name ucp \

datacenter/ucp/2.2/guides/admin/monitor-and-troubleshoot/troubleshoot-configurations.md

@@ -91,8 +91,8 @@ The examples below assume you are logged in with ssh into a UCP manager node.
 
 ### Check the status of the database
 
-```bash
 {% raw %}
+```bash
 # NODE_ADDRESS will be the IP address of this Docker Swarm manager node
 NODE_ADDRESS=$(docker info --format '{{.Swarm.NodeAddr}}')
 # VERSION will be your most recent version of the docker/ucp-auth image
@@ -117,13 +117,13 @@ Server Status: [
   }
 ]
 ...
-{% endraw %}
 ```
+{% endraw %}
 
 ### Manually reconfigure database replication
 
-```bash
 {% raw %}
+```bash
 # NODE_ADDRESS will be the IP address of this Docker Swarm manager node
 NODE_ADDRESS=$(docker info --format '{{.Swarm.NodeAddr}}')
 # NUM_MANAGERS will be the current number of manager nodes in the cluster
@@ -140,8 +140,8 @@ time="2017-07-14T20:46:09Z" level=debug msg="Reconfiguring number of replicas to
 time="2017-07-14T20:46:09Z" level=debug msg="(00/16) Emergency Repairing Tables..."
 time="2017-07-14T20:46:09Z" level=debug msg="(01/16) Emergency Repaired Table \"grant_objects\""
 ...
-{% endraw %}
 ```
+{% endraw %}
 
 ## Where to go next
 

datacenter/ucp/2.2/guides/user/access-ucp/cli-based-access.md

@@ -61,9 +61,7 @@ successfully communicating with UCP, look for `ucp` in the `Server Version`
 returned by `docker version`.
 
 ```bash
-{% raw %}
-docker version --format '{{.Server.Version}}'
-{% endraw %}
+{% raw %}docker version --format '{{.Server.Version}}'{% endraw %}
 {{ page.ucp_repo }}/{{ page.ucp_version }}
 ```
 

docker-for-aws/iam-permissions.md

@@ -14,8 +14,8 @@ For instructions, see [Link Amazon Web Services to Docker Cloud](/docker-cloud/c
 This feature is called [AWS CloudFormation Service Role](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-servicerole.html?icmpid=docs_cfn_console)
 follow the link for more information.
 
-```none
 {% raw %}
+```none
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -343,5 +343,5 @@ follow the link for more information.
         }
     ]
 }
-{% endraw %}
 ```
+{% endraw %}