diff --git a/datacenter/dtr/2.0/install/index.md b/datacenter/dtr/2.0/install/index.md index affab7678b6..5517ab0d7df 100644 --- a/datacenter/dtr/2.0/install/index.md +++ b/datacenter/dtr/2.0/install/index.md @@ -24,7 +24,7 @@ infrastructure has all the [requirements DTR needs to run](system-requirements.m Since DTR requires a Docker Universal Control Plane (UCP) cluster to run, you need to install UCP first. -[Learn how to install UCP](/ucp/installation/install-production/). Make sure that the node you install DTR on is already joined to the UCP cluster. +[Learn how to install UCP](/datacenter/ucp/1.1/installation/install-production.md). Make sure that the node you install DTR on is already joined to the UCP cluster. ## Step 3. Install DTR @@ -37,7 +37,7 @@ To install DTR: Having a UCP client bundle allows you to run Docker commands on a UCP cluster. - [Download a UCP client bundle](/ucp/access-ucp/cli-based-access/) + [Download a UCP client bundle](/datacenter/ucp/1.1/access-ucp/cli-based-access.md) and set up your CLI client to use it. 2. Run the following command to install DTR. diff --git a/datacenter/dtr/2.0/release-notes/prior-release-notes.md b/datacenter/dtr/2.0/release-notes/prior-release-notes.md index 2b81d7051bb..30f9e12881c 100644 --- a/datacenter/dtr/2.0/release-notes/prior-release-notes.md +++ b/datacenter/dtr/2.0/release-notes/prior-release-notes.md @@ -132,7 +132,7 @@ documentation. * Users, depending on their roles, can access account information through the Trusted Registry UI. - * View new API documentation through the Trusted Registry UI. You can also view this [documentation](/docker-trusted-registry/index.md) from Docker, Inc. docs section. + * View new API documentation through the Trusted Registry UI. You can also view this documentation from Docker, Inc. docs section. * New APIs @@ -313,4 +313,4 @@ been disabled for DHE users because of these issues. ## Version 1.0.0 (23 Apr 2015) -- First release \ No newline at end of file +- First release diff --git a/datacenter/install/aws.md b/datacenter/install/aws.md index 114c79f3dda..9d1257dafd3 100644 --- a/datacenter/install/aws.md +++ b/datacenter/install/aws.md @@ -216,7 +216,7 @@ UCP. Then click on **Update**. 7. Final step is to reconfigure DTR to use new UCP DNS and certificates. You need to run a `reconfigure` operation from the CLI. This step can be done from any Docker engine ( local or on the cloud) as long as you have -UCP [client bundle](../datacenter/ucp/2.0/guides/access-ucp/cli-based-access.md). +UCP [client bundle](../ucp/2.0/guides/access-ucp/cli-based-access.md). Once you download the bundle and load it, run the following command: ``` @@ -322,7 +322,7 @@ provides multiple advantages to easily deploy and access your application. #### Non-Swarm Mode Container Based Applications If you are deploying non-swarm mode container-based applications, you can -follow [UCP docs](../datacenter/ucp/2.0/guides/applications/index.md) to +follow [UCP docs](../ucp/2.0/guides/applications/index.md) to deploy your applications. Once you deploy your application on UCP, you can access them by using the specific worker node's public IP address and exposed port. diff --git a/datacenter/install/linux.md b/datacenter/install/linux.md index ea9418fbd99..df300121829 100644 --- a/datacenter/install/linux.md +++ b/datacenter/install/linux.md @@ -59,7 +59,7 @@ docker run --rm -it --name ucp \ This runs the install command in interactive mode, so that you're prompted for any necessary configuration values. -[Learn more about the UCP installation](../ucp/2.9/guides/installation/index.md) +[Learn more about the UCP installation](../ucp/2.0/guides/installation/index.md) ### Step 4: License your installation diff --git a/datacenter/ucp/1.1/install-sandbox-2.md b/datacenter/ucp/1.1/install-sandbox-2.md index 12f69670bab..b2f901c0b77 100644 --- a/datacenter/ucp/1.1/install-sandbox-2.md +++ b/datacenter/ucp/1.1/install-sandbox-2.md @@ -31,9 +31,9 @@ First, we'll set up a security exception that allows a the Docker-machine hosts used in your UCP cluster to push images to and pull images from DTR even though the DTR instance has a self-signed certificate. For a production deployment, you would -[set up certificate trust](/ucp/configuration/dtr-integration/) +[set up certificate trust](configuration/dtr-integration/) between UCP and DTR, and -[between DTR and your Docker Engine](/docker-trusted-registry/repos-and-images/), +between DTR and your Docker Engine/docker-trusted-registry/repos-and-images/, but for our sandbox deployment we can skip this. > **Warning**: These steps produce an insecure DTR connection. Do not use these diff --git a/datacenter/ucp/1.1/installation/install-production.md b/datacenter/ucp/1.1/installation/install-production.md index b00e1c414a2..6b6ed01d6f1 100644 --- a/datacenter/ucp/1.1/installation/install-production.md +++ b/datacenter/ucp/1.1/installation/install-production.md @@ -25,7 +25,7 @@ above to run. It is recommended to install the exact same version of the CS Docker Engine on all nodes. So on each host that you want to be part of the UCP cluster, -[install CS Docker Engine 1.10.0 or above](/docker-trusted-registry/cs-engine/install/). +[install CS Docker Engine 1.10.0 or above](/cs-engine/install.md). In the case where you are creating a VM template with CS Engine already installed, make sure that `/etc/docker/key.json` is not included in the image. You can do this by simply removing `/etc/docker/key.json`. You can then restart diff --git a/index.md b/index.md index 730bd441af7..6cb11b31332 100644 --- a/index.md +++ b/index.md @@ -90,11 +90,11 @@ title: Welcome to the Docs
  • - Docker Trusted Registry + Docker Trusted Registry
    -

    Docker Trusted Registry

    +

    Docker Trusted Registry

    (DTR) stores and signs your images.

    @@ -102,11 +102,11 @@ title: Welcome to the Docs
  • - Docker Universal Control Plane + Docker Universal Control Plane
    -

    Docker Universal Control Plane

    +

    Docker Universal Control Plane

    (UCP) Manage a cluster of on-premises Docker hosts as if they were a single machine.

    @@ -139,4 +139,4 @@ title: Welcome to the Docs
  • - \ No newline at end of file +