From 92f12b22057570d8d5f0cada29ad0a5cd0900c23 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 12 Feb 2020 19:56:28 +0000 Subject: [PATCH] Chnage to Notary not Docker Notary This has bnot been the name for some years. Signed-off-by: Justin Cormack --- datacenter/dtr/2.0/configure/config-general.md | 4 ++-- datacenter/dtr/2.0/release-notes/index.md | 6 +++--- datacenter/ucp/2.0/guides/content-trust/index.md | 6 +++--- notary/getting_started.md | 2 +- notary/index.md | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/datacenter/dtr/2.0/configure/config-general.md b/datacenter/dtr/2.0/configure/config-general.md index 726080c7b4f4..7f650a076ab1 100644 --- a/datacenter/dtr/2.0/configure/config-general.md +++ b/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) \ No newline at end of file +* [Configure storage settings](config-storage.md) diff --git a/datacenter/dtr/2.0/release-notes/index.md b/datacenter/dtr/2.0/release-notes/index.md index fd4f0b56ff36..a1e16b61f2e6 100644 --- a/datacenter/dtr/2.0/release-notes/index.md +++ b/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). \ No newline at end of file +[release notes archive](prior-release-notes.md). diff --git a/datacenter/ucp/2.0/guides/content-trust/index.md b/datacenter/ucp/2.0/guides/content-trust/index.md index fd6d824143cc..5aa43d56955c 100644 --- a/datacenter/ucp/2.0/guides/content-trust/index.md +++ b/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:// -d ~/.docker/trust --tlscacert