Merge pull request docker#10281 from justincormack/notary

Use Notary not "Docker Notary"

Author: thaJeztah

datacenter/dtr/2.0/configure/config-general.md

@@ -30,7 +30,7 @@ for the new domain. This also works with IP addresses.
 
 ## Docker Content Trust
 
-The Trusted Registry's includes integration with of Docker Notary to provide
+The Trusted Registry's includes integration with of Notary to provide
 Content Trust functionality, allowing your organization to push and pull
 trusted images. After pushing images in the Trusted Registry, you can see
 which image tags were signed by viewing the appropriate repositories through
@@ -47,4 +47,4 @@ already.
 
 ## See also
 
-* [Configure storage settings](config-storage.md)
+* [Configure storage settings](config-storage.md)

datacenter/dtr/2.0/release-notes/index.md

@@ -141,8 +141,8 @@ future release. Configure user authentication in UCP.
   This issue should be fixed on CS Engine 1.12.
   * When the DTR proxy container stops, it may seem that the DTR UI is
   responding, but it shows an "empty" notification when saving settings.
-  * When configuring DTR to use a proxy, connections to the Docker Notary server
-  are routed through the proxy. If the Docker Notary is not reachable through
+  * When configuring DTR to use a proxy, connections to the Notary server
+  are routed through the proxy. If the Notary is not reachable through
   the proxy, you need to add the Notary server url to the NO_PROXY settings.
 
 ## Version 2.0.0
@@ -224,4 +224,4 @@ future release. Configure user authentication in UCP.
 ## Prior versions
 
 You can find the release notes for older versions of DTR on the
-[release notes archive](prior-release-notes.md).
+[release notes archive](prior-release-notes.md).

datacenter/ucp/2.0/guides/content-trust/index.md

@@ -33,7 +33,7 @@ team, or someone that is a member of all those teams.
 If you don't specify any team, the image will be trusted as long as it is signed
 by any UCP user whose keys are trusted in a Notary delegation role.
 
-## Set up the Docker Notary CLI client
+## Set up the Notary CLI client
 
 After you configure UCP to only run applications that use Docker images you
 trust, you need to specify which Docker images can be trusted using the Docker
@@ -67,7 +67,7 @@ $ alias notary="notary -s https://<dtr_url> -d ~/.docker/trust --tlscacert <dtr_
 
 ## Set up a trusted image repository
 
-Once your Docker Notary CLI client is configured, you can check if Notary has
+Once your Notary CLI client is configured, you can check if Notary has
 information about a specific repository:
 
 ```bash
@@ -90,7 +90,7 @@ a passphrase to encrypt the private key, and stores the key pair in the
 directory you've specified with the `notary -d` flag.
 You should ensure you create backups for these keys, and that they are kept
 securely and offline.
-[Learn more about the keys used by Docker Notary.](/engine/security/trust/trust_key_mng.md)
+[Learn more about the keys used by Notary.](/engine/security/trust/trust_key_mng.md)
 
 ## Sign and push an image
 

notary/getting_started.md

@@ -1,7 +1,7 @@
 ---
 description: Performing basic operation to use Notary in tandem with Docker Content Trust.
 keywords: docker, Notary, notary-client, docker content trust, content trust
-title: Get started with Docker Notary
+title: Get started with Notary
 ---
 
 This document describes basic use of the Notary CLI as a tool supporting Docker

notary/index.md

@@ -1,7 +1,7 @@
 ---
 description: List of Notary Documentation
 keywords: docker, notary, trust, image, signing, repository, tuf
-title: Docker Notary
+title: Notary
 notoc: true
 ---