Fix small issues

Author: Jeffrey Morgan

_data/toc.yaml

@@ -3647,8 +3647,6 @@ manuals:
         title: Testing in Builds
       - path: /docker-hub/builds/advanced/
         title: Advanced Builds
-      - path: /docker-hub/builds/webhooks/
-        title: Build Webhooks
       - path: /docker-hub/builds/github/
         title: Connecting GitHub
       - path: /docker-hub/builds/bitbucket/
@@ -3657,7 +3655,7 @@ manuals:
     section:
     - path: /docker-hub/customer_faq/
       title: Subscriptions
-    - path: /docker-store/publish/publisher_faq/
+    - path: /docker-hub/publish/publisher_faq/
       title: Publishers
     - path: /docker-hub/publish/
       title: Publish Images & Plugins

_scripts/make-archive-branch.sh

@@ -85,9 +85,7 @@ bash _scripts/fetch-upstream-resources.sh -l
 # Currently, this is:
 # /samples/
 # /docker-id/
-# /docker-cloud/
 # /docker-hub/
-# /docker-store/
 # These rely on _layout/archive-redirect.html
 
 only_live_contents=("samples" "docker-id" "docker-cloud" "docker-hub" "docker-store")
@@ -145,5 +143,3 @@ echo "    and get back to master, run the following:"
 echo
 echo "      git reset --hard; git clean -fd; git checkout master; git branch -D v$version"
 echo
-
-

datacenter/dtr/2.5/guides/admin/configure/license-your-installation.md

@@ -17,7 +17,7 @@ DTR installation:
 
 ## Download your license
 
-Go to [Docker Store](https://store.docker.com/editions/enterprise/docker-ee-trial)
+Go to [Docker Hub](https://hub.docker.com/editions/enterprise/docker-ee-trial)
 and download your license.
 
 ![](../../images/license-1.png){: .with-border}

datacenter/dtr/2.5/guides/admin/configure/set-up-vulnerability-scans.md

@@ -16,7 +16,7 @@ access.
 
 Before you begin, make sure that you or your organization has purchased a DTR
 license that includes Docker Security Scanning, and that your Docker ID can
-access and download this license from the Docker Store.
+access and download this license from the Docker Hub.
 
 If you are using a license associated with an individual account, no additional
 action is needed. If you are using a license associated with an organization
@@ -36,7 +36,7 @@ this step and proceed to [enable DTR Security Scanning](#enable-dtr-security-sca
 
 If your current DTR license doesn't include scanning, you must first download the new license.
 
-1. Log in to the Docker Store using a Docker ID with access to the license you need.
+1. Log in to the Docker Hub using a Docker ID with access to the license you need.
 2. In the top right corner, click your user account icon, and select **My Content**.
 3. Locate **Docker Enterprise Edition** in the content list, and click **Setup**.
 4. Click **License Key** to download the license.
@@ -141,12 +141,12 @@ Your choice is saved automatically.
 
 To update the CVE database for your DTR instance when it cannot contact the update server, you download and install a `.tar` file that contains the database updates. To download the file:
 
-1. Log in to the [Docker Store](https://store.docker.com/).
+1. Log in to the [Docker Hub](https://hub.docker.com/).
 
-    If you are a member of an Organization managing licenses using Docker Store,
+    If you are a member of an Organization managing licenses using Docker Hub,
     make sure your account is a member of the `Owners` team. Only Owners can
     view and manage licenses and other entitlements for Organizations from the
-    Docker Store.
+    Docker Hub.
 
 2. In the top right corner, click your user account icon, and select **My Content**.
 3. If necessary, select an organization account from the **Accounts** menu at the upper right.

datacenter/dtr/2.5/guides/user/manage-images/sign-images/index.md

@@ -39,7 +39,7 @@ To sign images in a way that UCP trusts them, you need to:
 * Initialize trust metadata for the repository
 * Delegate signing to the keys in your UCP client bundle
 
-In this example we're going to pull an NGINX image from Docker Store,
+In this example we're going to pull an NGINX image from Docker Hub,
 re-tag it as `dtr.example.org/dev/nginx:1`, push the image to DTR and sign it
 in a way that is trusted by UCP. If you manage multiple repositories, you
 need to do the same procedure for every one of them.
@@ -56,11 +56,11 @@ the easiest way to do it is by pushing an image to that repository. Navigate to
 the **DTR web UI**, and create a repository for your image.
 In this example we've created the `dev/nginx` repository.
 
-From the Docker CLI client, pull an NGINX image from Docker Store,
+From the Docker CLI client, pull an NGINX image from Docker Hub,
 re-tag it, sign and push it to DTR.
 
 ```bash
-# Pull NGINX from Docker Store
+# Pull NGINX from Docker Hub
 docker pull nginx:latest
 
 # Re-tag NGINX

datacenter/ucp/3.0/guides/access-control/deploy-view-only-service.md

@@ -9,7 +9,7 @@ collection that contains one service.
 
 1. Create an organization and a team.
 2. Create a collection for the view-only service.
-3. Create a grant to manage user access to the collection. 
+3. Create a grant to manage user access to the collection.
 
 ![](../images/view-only-access-diagram.svg)
 
@@ -22,9 +22,9 @@ who isn't an administrator to the team.
 1.  Log in to UCP as an administrator.
 2.  Navigate to the **Organizations & Teams** page and click
     **Create Organization**. Name the new organization "engineering" and
-    click **Create**. 
+    click **Create**.
 3.  Click **Create Team**, name the new team "Dev", and click **Create**.      
-3.  Add a non-admin user to the Dev team. 
+3.  Add a non-admin user to the Dev team.
 
 ## Create a collection for the service
 
@@ -36,7 +36,7 @@ who isn't an administrator to the team.
 
 ![](../images/deploy-view-only-service-1.png)
 
-The `/Shared/View-only services` collection is ready to use for access 
+The `/Shared/View-only services` collection is ready to use for access
 control.
 
 ## Deploy a service
@@ -48,7 +48,7 @@ collection.
 1.  Navigate to the **Services** page and create a new service, named
     "WordPress".
 2.  In the **Image** textbox, enter "wordpress:latest". This identifies the
-    most recent WordPress image in the Docker Store.
+    most recent WordPress image in the Docker Hub.
 3.  In the left pane, click **Collection**. The **Swarm** collection appears.
 4.  Click **View children** to list all of the collections. In **Shared**,
     Click **View children**, find the **View-only services** collection and
@@ -71,7 +71,7 @@ Currently, users who aren't administrators can't access the
     and click **Select Collection**.
 3.  Click **Roles**, and in the dropdown, select **View Only**.
 4.  Click **Subjects**, and under **Select subject type**, click **Organizations**.
-    In the dropdown, select **engineering**. 
+    In the dropdown, select **engineering**.
 5.  Click **Create** to grant permissions to the organization.
 
 ![](../images/deploy-view-only-service-4.png)
@@ -80,21 +80,21 @@ Everything is in place to show role-based access control in action.
 
 ## Verify the user's permissions
 
-Users in the `engineering` organization have view-only access to the 
+Users in the `engineering` organization have view-only access to the
 `/Shared/View-only services` collection. You can confirm this by logging in
 as a non-admin user in the organization and trying to delete the service.
 
-1.  Log in as the user who you assigned to the Dev team. 
+1.  Log in as the user who you assigned to the Dev team.
 2.  Navigate to the **Services** page and click **WordPress**.
 3.  In the details pane, confirm that the service's collection is
     **/Shared/View-only services**.
 
     ![](../images/deploy-view-only-service-2.png)
-    
+
 4.  Click the checkbox next to the **WordPress** service, click **Actions**,
     and select **Remove**. You get an error message, because the user
     doesn't have `Service Delete` access to the collection.
 
 ## Where to go next
 
-- [Isolate volumes between two different teams](isolate-volumes-between-teams.md)
+- [Isolate volumes between two different teams](isolate-volumes-between-teams.md)

datacenter/ucp/3.0/guides/admin/configure/integrate-with-dtr.md

@@ -78,7 +78,7 @@ system:
   # Restart the Docker daemon
   $ sudo /bin/systemctl restart docker.service
   ```
-  
+
 * For SUSE SLES 12:
 
   ```bash
@@ -105,11 +105,11 @@ images from your local Docker installation to DTR.
 
     ![](/datacenter/ucp/2.2/guides/images/dtr-integration-1.png)
 
-2.  Pull the `hello-world` image from Docker Store, re-tag it, and push it to the
+2.  Pull the `hello-world` image from Docker Hub, re-tag it, and push it to the
 DTR repository you created.
 
     ```none
-    # Pull hello-world from Docker Store
+    # Pull hello-world from Docker Hub
     docker image pull hello-world:latest
 
     # Re-tag it

datacenter/ucp/3.0/guides/admin/configure/license-your-installation.md

@@ -9,15 +9,15 @@ installation. Here's how to do it.
 
 ## Download your license
 
-Go to [Docker Store](https://www.docker.com/enterprise-edition) and
+Go to [Docker Hub](https://www.docker.com/enterprise-edition) and
 download your UCP license, or get a free trial license.
 
 ![](../../images/license-ucp-1.png){: .with-border}
 
 ## License your installation
 
 Once you've downloaded the license file, you can apply it to your UCP
-installation. 
+installation.
 
 In the UCP web UI, log in with administrator credentials and
 navigate to the **Admin Settings** page.

datacenter/ucp/3.0/guides/admin/install/index.md

@@ -79,7 +79,7 @@ To install UCP:
 Now that UCP is installed, you need to license it.
 
 1.  Go to the
-    [Docker Store](https://www.docker.com/enterprise-edition)
+    [Docker Hub](https://www.docker.com/enterprise-edition)
     and buy a Docker EE subscription, or get a free trial license.  
 
 2.  In your browser, navigate to the UCP web UI, log in with your

docker-for-windows/index.md

@@ -443,7 +443,7 @@ to change context so that `kubectl` is pointing to `docker-for-desktop`:
 > kubectl config use-context docker-for-desktop
 ```
 
-You can also change it through the Docker for Windows menu: 
+You can also change it through the Docker for Windows menu:
 
 ![Change Kubernetes Context](images/docker-menu-context-switch.png){:width="600px"}
 
@@ -487,7 +487,7 @@ Visit our [Logs and Troubleshooting](troubleshoot.md) guide for more details.
 
 Log on to our [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows) to get help from the community, review current user topics, or join a discussion.
 
-Log on to [Docker for Windows issues on GitHub](https://github.com/docker/for-win/issues) to report bugs or problems and review community reported issues. 
+Log on to [Docker for Windows issues on GitHub](https://github.com/docker/for-win/issues) to report bugs or problems and review community reported issues.
 
 To give feedback on the documentation or update it yourself, use the Feedback options at the bottom of each docs page.