Remove some references to enterprise products

Signed-off-by: Sebastiaan van Stijn <[email protected]>

_data/glossary.yaml

@@ -77,10 +77,6 @@
   develop, ship, and run applications
   - The docker daemon process running on the host which manages images and containers
   (also called Docker Engine)
-<a class="glossary" name="docker_enterprise">Docker Enterprise</a>: |
-  Docker Enterprise is a platform to build, ship, and run containerized applications, that 
-  you can deploy in the cloud or on-premise. It includes a tested and certified version of Docker, 
-  web UIs for managing your app resources, and support.
 <a class="glossary" name="docker_desktop_for_mac">Docker Desktop for Mac</a>: |
   [Docker Desktop for Mac](/docker-for-mac/) is an easy-to-install, lightweight
   Docker development environment designed specifically for the Mac. A native

app/working-with-app.md

@@ -24,7 +24,7 @@ With Docker App, entire applications can now be managed as easily as images and
 Docker App lets you  _build_, _validate_ and _deploy_ applications with the `docker app` command. You can 
 even leverage secure supply-chain features such as signed `push` and `pull` operations.
 
-> **NOTE**: `docker app` works with `Engine - Community 19.03` or higher and `Engine - Enterprise 19.03` or higher. 
+> **NOTE**: `docker app` works with `Docker 19.03` or higher. 
 
 This guide walks you through two scenarios:
 
@@ -42,7 +42,7 @@ This section describes the steps for creating a new Docker App project to famili
 1. Populate the project
 1. Validate the app
 1. Deploy the app
-1. Push the app to Docker Hub or Docker Trusted Registry
+1. Push the app to Docker Hub
 1. Install the app directly from Docker Hub
 
 ### Prerequisites
@@ -394,27 +394,7 @@ $ docker login
 $ docker app push my-app --platform="linux/amd64" --tag <hub-id>/<repo>:0.1.0
 ```
 
-### Push the app to DTR
-
-Pushing an app to Docker Trusted Registry (DTR) involves the same procedure as
-[pushing an app to Docker Hub](#push-the-app-to-docker-hub) except that you
-need your DTR user credentials and [your DTR repository
-information](/ee/dtr/user/manage-images/review-repository-info/). To use client
-certificates for DTR authentication, see [Enable Client Certificate
-Authentication](/ee/enable-client-certificate-authentication/).
-
-By default, all platform architectures are pushed to DTR. If you are pushing an
-official Docker image as part of your app, you may find your app bundle
-becomes large with all image architectures embedded. To just push the
-architecture required, you can add the `--platform` flag.
-
-```bash
-$ docker login dtr.example.com
-
-$ docker app push my-app --platform="linux/amd64" --tag dtr.example.com/<user>/<repo>:0.1.0
-```
-
-### Install the app directly from Docker Hub or DTR
+### Install the app directly from Docker Hub
 
 Now that the app is pushed to the registry, try an `inspect` and `install` command against it. 
 The location of your app is different from the one provided in the examples.
@@ -433,7 +413,7 @@ hello.port     8080
 hello.text     Hello world!
 ```
 
-This action was performed directly against the app in the registry. Note that for DTR, the application will be prefixed with the Fully Qualified Domain Name (FQDN) of your trusted registry.
+This action was performed directly against the app in the registry.
 
 Now install it as a native Docker App by referencing the app in the registry, with a different port.
 

desktop/enterprise/user/mac-user.md

@@ -212,7 +212,7 @@ true
 ##### Insecure registries
 
 You can set up a custom and insecure [registry](https://docs.docker.com/registry/introduction) to store your public or private images (instead of
-using [Docker Hub](https://hub.docker.com/) or [Docker Trusted Registry](https://docs.docker.com/ee/dtr/). Add URLs for
+using [Docker Hub](https://hub.docker.com/). Add URLs for
 your insecure registries and registry mirrors on which to host your images.
 
 For more information, see:

desktop/enterprise/user/windows-user.md

@@ -352,8 +352,7 @@ Server:
 
 You can set up your own [registries](https://docs.docker.com/registry/introduction) on the **Basic** Daemon settings.
 
-Normally, you store public or private images in [Docker Hub](https://hub.docker.com/)
-and [Docker Trusted Registry](https://docs.docker.com/ee/dtr/). Here, you
+Normally, you store public or private images in [Docker Hub](https://hub.docker.com/). Here, you
 can use Docker to set up your own [insecure registry](https://docs.docker.com/registry/insecure/).
 Simply add URLs for insecure registries and registry mirrors on which to host your images.
 

docker-for-mac/docker-toolbox.md

@@ -159,8 +159,6 @@ is running a different version of server.
     default          *        virtualbox     Running   tcp://192.168.99.100:2376           v19.03.2
     docker-sandbox   -        digitalocean   Running   tcp://104.131.43.236:2376           v19.03.1
 
-You might also run into a similar situation with Docker Universal Control Plane (UCP).
-
 There are a few ways to address this problem and keep using your older
 machines. One solution is to use a version manager like
 [DVM](https://github.com/getcarina/dvm).

docker-for-windows/index.md

@@ -17,7 +17,7 @@ toc_max: 2
 
 Welcome to Docker Desktop!
 
-The _Docker Desktop for Windows_ section contains information about the Docker Desktop Community Stable release. For information about features available in Edge releases, see the [Edge release notes](edge-release-notes/). For information about Docker Desktop Enterprise (DDE) releases, see [Docker Desktop Enterprise](/desktop/enterprise/).
+The _Docker Desktop for Windows_ section contains information about the Docker Desktop Community Stable release. For information about features available in Edge releases, see the [Edge release notes](edge-release-notes.md). For information about Docker Desktop Enterprise (DDE) releases, see [Docker Desktop Enterprise](/desktop/enterprise/).
 
 Docker is a full development platform to build, run, and share containerized applications. Docker Desktop is the best way to get started with Docker _on Windows_.
 
@@ -547,7 +547,7 @@ Docker Desktop creates a certificate bundle of all user-trusted CAs based on
 the Windows certificate store, and appends it to Moby trusted certificates. Therefore, if an enterprise SSL certificate is trusted by the user on the host, it is trusted by Docker Desktop.
 
 To learn more about how to install a CA root certificate for the registry, see
-[Verify repository client with certificates](/engine/security/certificates)
+[Verify repository client with certificates](../engine/security/certificates.md)
 in the Docker Engine topics.
 
 ### How do I add client certificates?

docker-hub/publish/certify-plugins-logging.md

@@ -213,7 +213,7 @@ There are two steps: (1) configure credentials, and (2) configure endpoints.
       -get-logs-script string
         	 An optional custom script used to retrieve the logs.
       -insecure-skip-verify
-           Optional. Specifies to disable SSL verification for an insecure private Docker Trusted Registry.         
+           Optional. Specifies to disable SSL verification for an insecure private Docker Registry.         
       -help
         	 Help on the command.
       -html

engine/context/working-with-contexts.md

@@ -210,8 +210,6 @@ You can verify that the context was imported with `docker context ls`.
 
 The format of the import command is `docker context import <context-name> <context-file>`.
 
-> **Note**: You can import the client bundle `.zip` file generated from UCP and run a command to set your context to UCP. For example, `docker context import ctx-name ucp-bundle.zip`.
-
 Now, let's look at exporting just the Kubernetes parts of a context.
 
 ### Exporting a Kubernetes context

engine/install/linux-postinstall.md

@@ -142,13 +142,6 @@ Docker provides the [capability](../../config/containers/logging/index.md) to co
 
 By default, the Docker daemon listens for connections on a UNIX socket to accept requests from local clients. It is possible to allow Docker to accept requests from remote hosts by configuring it to listen on an IP address and port as well as the UNIX socket. For more detailed information on this configuration option take a look at "Bind Docker to another host/port or a unix socket" section of the [Docker CLI Reference](https://docs.docker.com/engine/reference/commandline/dockerd/) article. 
 
-> Docker EE customers 
->
-> Docker EE customers can get remote CLI access to UCP with the UCP client bundle. 
-> A UCP Client Bundle is generated by UCP and secured by mutual TLS. See the document on 
-> [CLI access for UCP](https://docs.docker.com/ee/ucp/user-access/cli/) for more 
-> information. 
-
 > Secure your connection
 > 
 > Before configuring Docker to accept connections from remote hosts it is critically important that you

engine/security/trust/content_trust.md

@@ -108,21 +108,18 @@ Within the Docker CLI we can sign and push a container image with the
 set, more information on Notary can be found [here](/notary/getting_started/).
 
 A prerequisite for signing an image is a Docker Registry with a Notary server
-attached (Such as the Docker Hub or Docker Trusted Registry). Instructions for
+attached (Such as the Docker Hub ). Instructions for
 standing up a self-hosted environment can be found [here](/engine/security/trust/deploying_notary/).
 
 To sign a Docker Image you will need a delegation key pair. These keys
-can be generated locally using `$ docker trust key generate`, generated
-by a certificate authority, or if you are using Docker Enterprise's
-Universal Control Plane (UCP), a user's Client Bundle provides adequate keys for a
-delegation. Find more information on Delegation Keys
-[here](trust_delegation/#creating-delegation-keys).
+can be generated locally using `$ docker trust key generate` or generated
+by a certificate authority.
 
 First we will add the delegation private key to the local Docker trust
 repository. (By default this is stored in `~/.docker/trust/`). If you are
 generating delegation keys with `$ docker trust key generate`, the private key
 is automatically added to the local trust store. If you are importing a separate
-key, such as one from a UCP Client Bundle you will need to use the
+key, you will need to use the
 `$ docker trust key load` command.
 
 ```
@@ -152,23 +149,23 @@ role of delegations, head to
 [delegations for content trust](trust_delegation/#managing-delegations-in-a-notary-server).
 
 ```
-$ docker trust signer add --key cert.pem jeff dtr.example.com/admin/demo
-Adding signer "jeff" to dtr.example.com/admin/demo...
+$ docker trust signer add --key cert.pem jeff registry.example.com/admin/demo
+Adding signer "jeff" to registry.example.com/admin/demo...
 Enter passphrase for new repository key with ID 10b5e94:
 ```
 
 Finally, we will use the delegation private key to sign a particular tag and
 push it up to the registry.
 
 ```
-$ docker trust sign dtr.example.com/admin/demo:1
-Signing and pushing trust data for local image dtr.example.com/admin/demo:1, may overwrite remote trust data
-The push refers to repository [dtr.example.com/admin/demo]
+$ docker trust sign registry.example.com/admin/demo:1
+Signing and pushing trust data for local image registry.example.com/admin/demo:1, may overwrite remote trust data
+The push refers to repository [registry.example.com/admin/demo]
 7bff100f35cb: Pushed
 1: digest: sha256:3d2e482b82608d153a374df3357c0291589a61cc194ec4a9ca2381073a17f58e size: 528
 Signing and pushing trust metadata
 Enter passphrase for signer key with ID 8ae710e:
-Successfully signed dtr.example.com/admin/demo:1
+Successfully signed registry.example.com/admin/demo:1
 ```
 
 Alternatively, once the keys have been imported an image can be pushed with the
@@ -177,32 +174,32 @@ Alternatively, once the keys have been imported an image can be pushed with the
 ```
 $ export DOCKER_CONTENT_TRUST=1
 
-$ docker push dtr.example.com/admin/demo:1
-The push refers to repository [dtr.example.com/admin/demo:1]
+$ docker push registry.example.com/admin/demo:1
+The push refers to repository [registry.example.com/admin/demo:1]
 7bff100f35cb: Pushed
 1: digest: sha256:3d2e482b82608d153a374df3357c0291589a61cc194ec4a9ca2381073a17f58e size: 528
 Signing and pushing trust metadata
 Enter passphrase for signer key with ID 8ae710e:
-Successfully signed dtr.example.com/admin/demo:1
+Successfully signed registry.example.com/admin/demo:1
 ```
 
 Remote trust data for a tag or a repository can be viewed by the
 `$ docker trust inspect` command:
 
 ```
-$ docker trust inspect --pretty dtr.example.com/admin/demo:1
+$ docker trust inspect --pretty registry.example.com/admin/demo:1
 
-Signatures for dtr.example.com/admin/demo:1
+Signatures for registry.example.com/admin/demo:1
 
 SIGNED TAG          DIGEST                                                             SIGNERS
 1                   3d2e482b82608d153a374df3357c0291589a61cc194ec4a9ca2381073a17f58e   jeff
 
-List of signers and their keys for dtr.example.com/admin/demo:1
+List of signers and their keys for registry.example.com/admin/demo:1
 
 SIGNER              KEYS
 jeff                8ae710e3ba82
 
-Administrative keys for dtr.example.com/admin/demo:1
+Administrative keys for registry.example.com/admin/demo:1
 
   Repository Key:	10b5e94c916a0977471cc08fa56c1a5679819b2005ba6a257aa78ce76d3a1e27
   Root Key:	84ca6e4416416d78c4597e754f38517bea95ab427e5f95871f90d460573071fc
@@ -211,9 +208,9 @@ Administrative keys for dtr.example.com/admin/demo:1
 Remote Trust data for a tag can be removed by the `$ docker trust revoke` command:
 
 ```
-$ docker trust revoke dtr.example.com/admin/demo:1
+$ docker trust revoke registry.example.com/admin/demo:1
 Enter passphrase for signer key with ID 8ae710e:
-Successfully deleted signature for dtr.example.com/admin/demo:1
+Successfully deleted signature for registry.example.com/admin/demo:1
 ```
 
 ## Runtime Enforcement with Docker Content Trust
@@ -416,15 +413,15 @@ succeeds if `someimage:latest` is signed. However, an operation with an explicit
 content hash always succeeds as long as the hash exists:
 
 ```
-$ docker pull dtr.example.com/user/image:1
-Error: remote trust data does not exist for dtr.example.com/user/image: dtr.example.com does not have trust data for dtr.example.com/user/image
+$ docker pull registry.example.com/user/image:1
+Error: remote trust data does not exist for registry.example.com/user/image: registry.example.com does not have trust data for registry.example.com/user/image
 
-$ docker pull dtr.example.com/user/image@sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a
+$ docker pull registry.example.com/user/image@sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a
 sha256:ee7491c9c31db1ffb7673d91e9fac5d6354a89d0e97408567e09df069a1687c1: Pulling from user/image
 ff3a5c916c92: Pull complete
 a59a168caba3: Pull complete
 Digest: sha256:ee7491c9c31db1ffb7673d91e9fac5d6354a89d0e97408567e09df069a1687c1
-Status: Downloaded newer image for dtr.example.com/user/image@sha256:ee7491c9c31db1ffb7673d91e9fac5d6354a89d0e97408567e09df069a1687c1
+Status: Downloaded newer image for registry.example.com/user/image@sha256:ee7491c9c31db1ffb7673d91e9fac5d6354a89d0e97408567e09df069a1687c1
 ```
 
 ## Related information

engine/security/trust/trust_automation.md

@@ -43,11 +43,11 @@ $ export DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE="rootpassphrase123"
 $ export DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE="repopassphrase123"
 
 # Initialise Repo and Push Delegation
-$ docker trust signer add --key delegation.crt jeff dtr.example.com/admin/demo
-Adding signer "jeff" to dtr.example.com/admin/demo...
-Initializing signed repository for dtr.example.com/admin/demo...
-Successfully initialized "dtr.example.com/admin/demo"
-Successfully added signer: dtr.example.com/admin/demo
+$ docker trust signer add --key delegation.crt jeff registry.example.com/admin/demo
+Adding signer "jeff" to registry.example.com/admin/demo...
+Initializing signed repository for registry.example.com/admin/demo...
+Successfully initialized "registry.example.com/admin/demo"
+Successfully added signer: registry.example.com/admin/demo
 ```
 
 ## Sign an image
@@ -59,13 +59,13 @@ trust store with `$ docker trust key load`.
 ```
 $ export DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE="mypassphrase123"
 
-$ docker trust sign dtr.example.com/admin/demo:1
-Signing and pushing trust data for local image dtr.example.com/admin/demo:1, may overwrite remote trust data
-The push refers to repository [dtr.example.com/admin/demo]
+$ docker trust sign registry.example.com/admin/demo:1
+Signing and pushing trust data for local image registry.example.com/admin/demo:1, may overwrite remote trust data
+The push refers to repository [registry.example.com/admin/demo]
 428c97da766c: Layer already exists
 2: digest: sha256:1a6fd470b9ce10849be79e99529a88371dff60c60aab424c077007f6979b4812 size: 524
 Signing and pushing trust metadata
-Successfully signed dtr.example.com/admin/demo:1
+Successfully signed registry.example.com/admin/demo:1
 ```
 
 ## Build with content trust