ee/ucp/user/access -> ee/ucp/user-access

_data/toc.yaml

@@ -1675,14 +1675,14 @@ manuals:
           title: Docker EE Standard use case
         - path: /ee/ucp/authorization/ee-advanced/
           title: Docker EE Advanced use case
-    - sectiontitle: User guides
-      section:
     - sectiontitle: Access UCP
       section:
-        - path: /ee/ucp/user/access-ucp/
+      - path: /ee/ucp/user-access/
         title: Web-based access
-        - path: /ee/ucp/user/access-ucp/cli-based-access/
+      - path: /ee/ucp/user-access/cli/
         title: CLI-based access
+    - sectiontitle: User guides
+      section:
       - sectiontitle: Deploy an application
         section:
         - path: /ee/ucp/user/services/deploy-a-service/

ee/ucp/admin/configure/integrate-with-dtr.md

@@ -20,7 +20,7 @@ Docker images and deploy services to UCP using these images.
 Docker UCP integrates out of the box with Docker Trusted Registry (DTR).
 This means that you can deploy services from the UCP web UI, using Docker
 images that are stored in DTR. You can also use a
-[UCP client bundle](../../user/access-ucp/cli-based-access.md) to do the same from the
+[UCP client bundle](../../user-access/cli.md) to do the same from the
 CLI.
 
 If you've configured DTR to use TLS certificates issued by a globally-trusted

ee/ucp/admin/configure/manage-and-deploy-private-images.md

@@ -43,7 +43,7 @@ To push images to DTR, you need CLI access to a licensed installation of
 Docker EE.
 
 - [License your installation](license-your-installation.md).
-- [Set up your Docker CLI](../../user/access-ucp/cli-based-access.md).
+- [Set up your Docker CLI](../../user-acccess/cli.md).
 
 When you're set up for CLI-based access to a licensed Docker EE instance,
 you can push images to DTR.

ee/ucp/admin/configure/use-your-own-tls-certificates.md

@@ -8,7 +8,7 @@ ui_tabs:
 - version: ucp-2.2
   orlower: true
 next_steps:
-- path: ../../user/access-ucp/cli-based-access/
+- path: ../../user-access/cli/
   title: Access UCP from the CLI
 ---
 {% if include.version=="ucp-3.0" %}
@@ -35,7 +35,7 @@ automatically trusted by your browser and client tools.
 To ensure minimal impact to your business, you should plan for this change to
 happen outside business peak hours. Your applications will continue running
 normally, but existing UCP client certificates will become invalid, so users
-will have to download new ones to [access UCP from the CLI](../../user/access-ucp/cli-based-access.md).
+will have to download new ones to [access UCP from the CLI](../../user-access/cli.md).
 
 ## Configure UCP to use your own TLS certificates and keys
 
@@ -58,7 +58,7 @@ Finally, click **Save** for the changes to take effect.
 
 After replacing the TLS certificates, your users won't be able to authenticate
 with their old client certificate bundles. Ask your users to go to the UCP
-web UI and [get new client certificate bundles](../../user/access-ucp/cli-based-access.md).
+web UI and [get new client certificate bundles](../../user-access/cli.md).
 
 If you deployed Docker Trusted Registry, you'll also need to reconfigure it
 to trust the new UCP TLS certificates.

ee/ucp/admin/monitor-and-troubleshoot/index.md

@@ -52,7 +52,7 @@ Learn how to [monitor the cluster status](/datacenter/ucp/2.2/guides/admin/monit
 {% if include.version=="docker-cli-linux" %}
 
 You can also monitor the status of a UCP cluster using the Docker CLI client.
-Download [a UCP client certificate bundle](../../user/access-ucp/cli-based-access.md)
+Download [a UCP client certificate bundle](../../user-access/cli.md)
 and then run:
 
 ```bash

ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations.md

@@ -40,7 +40,7 @@ sudo apt-get update && sudo apt-get install curl jq
 ```
 
 1. Use a client bundle to authenticate your requests.
-[Learn more](../../user/access-ucp/cli-based-access.md).
+[Learn more](../../user-access/cli.md).
 
 2. Use the REST API to access the cluster configurations. The `$DOCKER_HOST`
    and `$DOCKER_CERT_PATH` environment variables are set when using the client

ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md

@@ -39,7 +39,7 @@ specially useful if the UCP web application is not working.
 
     When using the Docker CLI client, you need to authenticate using client
     certificates.
-    [Learn how to use client certificates](../../user/access-ucp/cli-based-access.md).
+    [Learn how to use client certificates](../../user-access/cli.md).
     If your client certificate bundle is for a non-admin user, you won't have
     permissions to see the UCP system containers.
 

ee/ucp/ucp-architecture.md

@@ -161,7 +161,7 @@ UCP also exposes the standard Docker API, so you can continue using existing
 tools like the Docker CLI client. Since UCP secures your cluster with role-based
 access control, you need to configure your Docker CLI client and other client
 tools to authenticate your requests using
-[client certificates](user/access-ucp/index.md) that you can download
+[client certificates](user-access/index.md) that you can download
 from your UCP profile page.
 
 {% endif %}

ee/ucp/user-access/cli.md

@@ -12,6 +12,7 @@ next_steps:
   title: Deploy a service
 redirect_from:
   - /datacenter/ucp/3.0/guides/user/access-ucp/cli-based-access/
+  - /ee/ucp/user/access-ucp/cli-based-access/
 ---
 {% if include.version=="ucp-3.0" %}
 

ee/ucp/user-access/index.md

@@ -10,6 +10,8 @@ next_steps:
   title: Authorization
 - path: cli-based-access/
   title: Access UCP from the CLI
+redirect_from:
+  - /ee/ucp/user/access-ucp/
 ---
 {% if include.version=="ucp-3.0" %}
 

ee/ucp/user/services/deploy-a-service.md

@@ -23,7 +23,7 @@ NGINX service.
 Fill in the following fields:
 
 | Field        | Value        |
-|:--------------|:------|
+|:-------------|:-------------|
 | Service name | nginx        |
 | Image name   | nginx:latest |
 
@@ -33,7 +33,7 @@ In the left pane, click **Network**. In the **Ports** section,
 click **Publish Port** and fill in the following fields:
 
 | Field         | Value   |
-|:--------------|:------|
+|:--------------|:--------|
 | Internal port | 80      |
 | Protocol      | tcp     |
 | Publish mode  | Ingress |
@@ -59,7 +59,7 @@ page, by going to `http://<node-ip>:8000`.
 {% if include.version=="docker-cli-linux" %}
 
 You can also deploy the same service from the CLI. Once you've set up your
-[UCP client bundle](../access-ucp/cli-based-access.md), run:
+[UCP client bundle](../user-access/cli.md), run:
 
 ```bash
 docker service create --name nginx \

ee/ucp/user/services/deploy-app-cli.md

@@ -19,7 +19,7 @@ Docker UCP secures your Docker cluster with
 so that only authorized users can deploy applications. To be able to run Docker
 commands on a cluster managed by UCP, you need to configure your Docker CLI
 client to authenticate to UCP using client certificates.
-[Learn how to set your CLI to use client certificates](../access-ucp/cli-based-access.md).
+[Learn how to set your CLI to use client certificates](../user-access/cli.md).
 
 ## Deploy the voting application
 

ee/ucp/user/services/deploy-kubernetes-workload.md

@@ -160,7 +160,7 @@ With Docker EE, you deploy your Kubernetes objects on the command line by using
 
 Use a client bundle to configure your client tools, like Docker CLI and `kubectl`
 to communicate with UCP instead of the local deployments you might have running.
-[Get your client bundle by using the Docker EE web UI or the command line](../access-ucp/cli-based-access.md).
+[Get your client bundle by using the Docker EE web UI or the command line](../user-access/cli.md).
 
 When you have the client bundle set up, you can deploy a Kubernetes object
 from YAML.