Sync published with master (#8778)

* Fixed syntax error (#8732)

Last edit to the REPLICA_ID command introduced a syntax error by adding an extra ')'. Removed it.

* Fix replica ID setting examples

- Accept suggestion from @thajeztah based on product testing
- Apply change to page examples
- Remove NFS backup example based on the following errors: 
tar: /var/lib/docker/volumes/dtr-registry-nfs-36e6bf87816d: Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors

* Update header for example tar

* Fixed link title

* Added new example and deprecation info (#8773)

* Updated multi-stage build doc (#8769)

Changed the 'as' keyword to 'AS' to match the Dockerfile reference docs here: https://docs.docker.com/engine/reference/builder/#from

* Fix typo (#8766)

* Fixed a sentence (#8728)

* Minor edit

* Update configure-tls.md (#8719)

* Update upgrade.md (#8718)

* Update index.md (#8717)

* Update configure-tls.md (#8716)

* Add TOC entry for Hub page title change (#8777)

* Update upgrade.md

* Fix left navigation TOC

* Update get-started.md (#8713)

* Update tmpfs.md (#8711)

* Add an indentation in compose-gettingstarted.md (#8487)

* Fix messaging on service dependencies

_data/toc.yaml

@@ -3341,7 +3341,7 @@ manuals:
   - path: /docker-hub/slack_integration/
     title: Slack Integration
   - path: /docker-hub/upgrade/
-    title: Upgrading your plan
+    title: Upgrade your plan
   - sectiontitle: Automated Builds
     section:
       - path: /docker-hub/builds/

compose/extends.md

@@ -44,7 +44,7 @@ relative to the base file.
 
 ### Example use case
 
-In this section are two common use cases for multiple compose files: changing a
+In this section, there are two common use cases for multiple Compose files: changing a
 Compose app for different environments, and running administrative tasks
 against a Compose app.
 

compose/gettingstarted.md

@@ -119,15 +119,18 @@ the following:
       redis:
         image: "redis:alpine"
 
-This Compose file defines two services, `web` and `redis`. The `web` service:
+This Compose file defines two services: `web` and `redis`. 
 
-* Uses an image that's built from the `Dockerfile` in the current directory.
-* Forwards the exposed port 5000 on the container to port 5000 on the host
-  machine. We use the default port for the Flask web server, `5000`.
+### Web service
 
-The `redis` service uses a public
-[Redis](https://registry.hub.docker.com/_/redis/) image pulled from the Docker
-Hub registry.
+The `web` service uses an image that's built from the `Dockerfile` in the current directory.
+It then binds the container and the host machine to the exposed port, `5000`. This example service uses the default port for 
+the Flask web server, `5000`.
+
+### Redis service
+
+The `redis` service uses a public [Redis](https://registry.hub.docker.com/_/redis/) 
+image pulled from the Docker Hub registry.
 
 ## Step 4: Build and run your app with Compose
 

develop/develop-images/multistage-build.md

@@ -131,13 +131,13 @@ intermediate artifacts are left behind, and not saved in the final image.
 
 By default, the stages are not named, and you refer to them by their integer
 number, starting with 0 for the first `FROM` instruction. However, you can
-name your stages, by adding an `as <NAME>` to the `FROM` instruction. This
+name your stages, by adding an `AS <NAME>` to the `FROM` instruction. This
 example improves the previous one by naming the stages and using the name in
 the `COPY` instruction. This means that even if the instructions in your
 Dockerfile are re-ordered later, the `COPY` doesn't break.
 
 ```conf
-FROM golang:1.7.3 as builder
+FROM golang:1.7.3 AS builder
 WORKDIR /go/src/github.com/alexellis/href-counter/
 RUN go get -d -v golang.org/x/net/html  
 COPY app.go    .

docker-hub/index.md

@@ -141,7 +141,7 @@ Congratulations! You've successfully:
 - Built a Docker container image on your computer
 - Pushed it to Docker Hub
 
-### Next Steps
+### Next steps
 
 - Create an [Organization](orgs.md) to use Docker Hub with your team.
 - Automatically build container images from code through [Builds](builds/index.md).

docker-hub/upgrade.md

@@ -1,12 +1,12 @@
 ---
 description: Upgrading your Docker Hub Plan
 keywords: Docker, docker, trusted, registry, accounts, plans, Dockerfile, Docker Hub, webhooks, docs, documentation
-title: Upgrading your Plan
+title: Upgrade your Plan
 ---
 
 User and organization accounts maintain separate Docker Hub billing profiles.
 
-### Upgrading your personal plan
+### Upgrade your personal plan
 
 Docker Hub includes one private Docker Hub repository for free. If you need
 more private repositories, you can upgrade from your free account to a paid
@@ -17,7 +17,7 @@ To upgrade:
 2. Click Change Plan
 3. Select your plan and provide your payment information to upgrade ![Upgrade Plan](images/index-upgrade-plan.png)
 
-### Upgrading your organization's plan
+### Upgrade your organization's plan
 
 To upgrade an Organization's plan:
 

ee/dtr/admin/disaster-recovery/create-a-backup.md

@@ -78,11 +78,11 @@ docker ps --format "{{.Names}}" | grep dtr
 
 ##### SSH access
 
-Another way to determine the replica ID is to SSH into a DTR node and run the following:
+Another way to determine the replica ID is to log into a DTR node using SSH and run the following:
 
 {% raw %}
 ```bash
-REPLICA_ID=$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-')
+REPLICA_ID=$(docker ps --format '{{.Names}}' -f name=dtr-rethink | cut -f 3 -d '-')
 && echo $REPLICA_ID
 ```
 {% endraw %}
@@ -96,23 +96,14 @@ If you've configured DTR to store images on the local file system or NFS mount,
 you can back up the images by using SSH to log into a DTR node,
 and creating a `tar` archive of the [dtr-registry volume](../../architecture.md):
 
-#### Example backup commands
+#### Example backup command
 
 ##### Local images
 
 {% raw %}
 ```none
 sudo tar -cf dtr-image-backup-$(date +%Y%m%d-%H_%M_%S).tar \
-/var/lib/docker/volumes/dtr-registry-$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-')
-```
-{% endraw %}
-
-##### NFS-mounted images
-
-{% raw %}
-```none
-sudo tar -cf dtr-image-backup-$(date +%Y%m%d-%H_%M_%S).tar \
-  /var/lib/docker/volumes/dtr-registry-nfs-$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-')
+/var/lib/docker/volumes/dtr-registry-$(docker ps --format '{{.Names}}' -f name=dtr-rethink | cut -f 3 -d '-')
 ```
 {% endraw %}
 
@@ -136,7 +127,7 @@ command.
 ```none
 DTR_VERSION=$(docker container inspect $(docker container ps -f name=dtr-registry -q) | \
   grep -m1 -Po '(?<=DTR_VERSION=)\d.\d.\d'); \
-REPLICA_ID=$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-')); \
+REPLICA_ID=$(docker ps --format '{{.Names}}' -f name=dtr-rethink | cut -f 3 -d '-'); \
 read -p 'ucp-url (The UCP URL including domain and port): ' UCP_URL; \
 read -p 'ucp-username (The UCP administrator username): ' UCP_ADMIN; \
 read -sp 'ucp password: ' UCP_PASSWORD; \

ee/dtr/release-notes.md

@@ -26,7 +26,7 @@ to upgrade your installation to the latest release.
 
 ### Security
 
-* Refer to [Docker Hub Maintenance](https://success.docker.com/article/dtr-image-vulnerabilities) for details regarding actions to be taken, timeline, and any status updates/issues/recommendations.
+* Refer to [DTR image vulnerabilities](https://success.docker.com/article/dtr-image-vulnerabilities) for details regarding actions to be taken, timeline, and any status updates/issues/recommendations.
 
 ### Enhancements
 

ee/ucp/admin/configure/ucp-configuration-file.md

@@ -31,16 +31,22 @@ Specify your configuration settings in a TOML file.
 
 Use the `config-toml` API to export the current settings and write them to a file. Within the directory of a UCP admin user's [client certificate bundle](../../user-access/cli.md), the following command exports the current configuration for the UCP hostname `UCP_HOST` to a file named `ucp-config.toml`:
 
-```bash
-curl --cacert ca.pem --cert cert.pem --key key.pem https://UCP_HOST/api/ucp/config-toml > ucp-config.toml
+### Get an authtoken
+
+```
+AUTHTOKEN=$(curl --silent --insecure --data '{"username":"<username>","password":"<password>"}' https://UCP_HOST/auth/login | jq --raw-output .auth_token)
 ```
 
-Edit `ucp-config.toml`, then use the following `curl` command to import it back into
-UCP and apply your configuration changes:
+### Download config file
 
+```
+curl -X GET "https://UCP_HOST/api/ucp/config-toml" -H  "accept: application/toml" -H  "Authorization: Bearer $AUTHTOKEN" > ucp-config.toml
+```
 
-```bash
-curl --cacert ca.pem --cert cert.pem --key key.pem --upload-file ucp-config.toml https://UCP_HOST/api/ucp/config-toml
+### Upload config file
+
+```
+curl -X PUT -H  "accept: application/toml" -H "Authorization: Bearer $AUTHTOKEN" --upload-file 'path/to/ucp-config.toml' https://UCP_HOST/api/ucp/config-toml
 ```
 
 ## Apply an existing configuration file at install time
@@ -141,6 +147,8 @@ Specifies whether DTR images require signing.
 
 ### log_configuration table (optional)
 
+> Note: This feature has been deprecated. Refer to the [Deprecation notice](https://docs.docker.com/ee/ucp/release-notes/#deprecation-notice) for additional information.
+
 Configures the logging options for UCP components.
 
 | Parameter  | Required | Description                                                                                                                                                                                     |

ee/ucp/kubernetes/storage/use-nfs-volumes.md

@@ -20,7 +20,7 @@ To mount existing NFS shares within Kubernetes Pods, we have 2 options:
  - Define NFS shares within the Pod definitions. NFS shares are defined
    manually by each tenant when creating a workload.
  - Define NFS shares as a Cluster object through Persistent Volumes, with
-   the CLuster object lifecycle handled separately from the workload. This is common for
+   the Cluster object lifecycle handled separately from the workload. This is common for
    operators who want to define a range of NFS shares for tenants to request and
    consume.
 

ee/ucp/release-notes.md

@@ -25,7 +25,7 @@ upgrade your installation to the latest release.
 (2019-05-06)
 
 ### Security
-* Refer to [Docker Hub Maintenance](https://success.docker.com/article/ucp-image-vulnerabilities) for details regarding actions to be taken, timeline, and any status updates/issues/recommendations.
+* Refer to [UCP image vulnerabilities](https://success.docker.com/article/ucp-image-vulnerabilities) for details regarding actions to be taken, timeline, and any status updates/issues/recommendations.
 
 ### Bug Fixes
 * Updated the UCP base image layers to fix a number of old libraries and components that had security vulnerabilities.

machine/get-started.md

@@ -7,7 +7,7 @@ title: Get started with Docker Machine and a local VM
 Let's take a look at using `docker-machine` to create, use and manage a
 Docker host inside of a local virtual machine.
 
-## Prerequisite Information
+## Prerequisite information
 
 With the advent of [Docker Desktop for Mac](/docker-for-mac/index.md) and [Docker Desktop for
 Windows](/docker-for-windows/index.md) as replacements for [Docker

storage/tmpfs.md

@@ -29,7 +29,7 @@ persist in either the host or the container writable layer.
 containers.
 * This functionality is only available if you're running Docker on Linux.
 
-## Choosing the --tmpfs or --mount flag
+## Choose the --tmpfs or --mount flag
 
 Originally, the `--tmpfs` flag was used for standalone containers and
 the `--mount` flag was used for swarm services. However, starting with Docker

swarm/configure-tls.md

@@ -543,7 +543,7 @@ do this for the `ubuntu` user on your Docker Engine client.
 
 Congratulations! You have configured a Docker swarm cluster to use TLS.
 
-## Related Information
+## Related information
 
 * [Secure Docker Swarm with TLS](secure-swarm-tls.md)
 * [Docker security](/engine/security/security/)