ENGDOCS-1771

content/admin/company/_index.md

@@ -19,12 +19,12 @@ grid:
 - title: Configure Single Sign-On
   description: Discover how to configure SSO for your entire company.
   icon: key
-  link: /admin/company/settings/sso/
+  link: /security/for-admins/single-sign-on/
 - title: Set up SCIM
   description: Set up SCIM to automatically provision and deprovision users in your
     company.
   icon: checklist
-  link: /admin/company/settings/scim/
+  link: /security/for-admins/scim/
 - title: Domain management
   description: Add and verify your domains.
   icon: domain_verification

content/admin/company/owners.md

@@ -6,7 +6,7 @@ title: Manage company owners
 
 {{< include "admin-early-access.md" >}}
 
-As a company owner, you can configure [Single Sign-on (SSO)](./settings/sso.md) and [System for Cross-domain Identity Management (SCIM)](./settings/scim.md) for all organizations under the company.
+As a company owner, you can configure [Single Sign-on (SSO)](../../security/for-admins/single-sign-on/_index.md) and [System for Cross-domain Identity Management (SCIM)](../../security/for-admins/scim.md) for all organizations under the company.
 
 ## Add a company owner
 

content/admin/organization/_index.md

@@ -24,8 +24,8 @@ grid:
   icon: settings_suggest
   link: /admin/organization/general-settings/
 - title: SSO & SCIM
-  description: 'Set up [Single Sign-On](/admin/organization/security-settings/sso/)
-    and [SCIM](/admin/organization/security-settings/scim/) for your organization.
+  description: 'Set up [Single Sign-On](/security/for-admins/single-sign-on/)
+    and [SCIM](/security/for-admins/scim/) for your organization.
 
     '
   icon: key

content/desktop/release-notes.md

@@ -1639,7 +1639,7 @@ Installing Docker Desktop 4.5.0 from scratch has a bug which defaults Docker Des
 ### New
 
 - Easy, Secure sign in with Auth0 and Single Sign-on
-  - Single Sign-on: Users with a Docker Business subscription can now configure SSO to authenticate using their identity providers (IdPs) to access Docker. For more information, see [Single Sign-on](../single-sign-on/index.md).
+  - Single Sign-on: Users with a Docker Business subscription can now configure SSO to authenticate using their identity providers (IdPs) to access Docker. For more information, see [Single Sign-on](../security/for-admins/single-sign-on/index.md).
   - Signing in to Docker Desktop now takes you through the browser so that you get all the benefits of auto-filling from password managers.
 
 ### Upgrades

content/docker-hub/_index.md

@@ -43,7 +43,7 @@ GitHub and Bitbucket and push them to Docker Hub.
 * [Create and manage teams and organizations](orgs.md)
 * [Create a company](creating-companies.md)
 * [Enforce sign in](configure-sign-in.md)
-* Set up [SSO](../single-sign-on/index.md) and [SCIM](scim.md)
+* Set up [SSO](../security/for-admins/single-sign-on/index.md) and [SCIM](../security/for-admins/scim.md)
 * Use [Group mapping](group-mapping.md)
 * [Carry out domain audits](domain-audit.md)
 * [Use Image Access Management](image-access-management.md) to control developers' access to certain types of images

content/docker-hub/admin-overview.md

@@ -13,7 +13,7 @@ grid:
   description: Learn how to onboard users to your organization.
 - title: Enable Single Sign-On
   description: Understand and use Single Sign-On.
-  link: /single-sign-on/
+  link: /security/for-admins/single-sign-on/
   icon: key
 ---
 

content/docker-hub/api/latest.yaml

@@ -108,7 +108,7 @@ tags:
     x-displayName: SCIM
     description: |
       SCIM is a provisioning system that lets you manage users within your identity provider (IdP).
-      For more information, see [System for Cross-domain Identity management](https://docs.docker.com/docker-hub/scim/).
+      For more information, see [System for Cross-domain Identity management](https://docs.docker.com/security/for-admins/scim/).
 x-tagGroups:
   - name: General
     tags:

content/docker-hub/company-faqs.md

@@ -47,7 +47,7 @@ Contact your designated CSM team member or Docker Support with a list of the Doc
 
 ### How does a company owner manage SSO/SCIM settings from my new parent company?
 
-See your [SCIM](scim.md) and [SSO](../single-sign-on/configure/index.md) settings.
+See your [SCIM](scim.md) and [SSO](../security/for-admins/single-sign-on/configure/index.md) settings.
 
 ### How does a company owner enable group mapping in my IdP?
 

content/docker-hub/company-owner.md

@@ -4,7 +4,7 @@ keywords: company, owners
 title: Manage company owners
 ---
 
-As a company owner, you can configure [Single Sign-on (SSO)](../single-sign-on/configure/index.md) and [System for Cross-domain Identity Management (SCIM)](../docker-hub/scim.md) for all organizations under the company. This is only visible if your organization has a Docker Business subscription. If you want to upgrade your subscription to include the organization under the company, see [upgrade your subscription](../subscription/upgrade.md).
+As a company owner, you can configure [Single Sign-on (SSO)](../security/for-admins/single-sign-on/configure/index.md) and [System for Cross-domain Identity Management (SCIM)](../security/for-admins/scim.md) for all organizations under the company. This is only visible if your organization has a Docker Business subscription. If you want to upgrade your subscription to include the organization under the company, see [upgrade your subscription](../subscription/upgrade.md).
 
 ## Add a company owner
 

content/docker-hub/general-faqs.md

@@ -11,7 +11,7 @@ redirect:
 A Docker ID is a username for your Docker account that lets you access Docker products. All you need is an email address to create a Docker ID, or you can sign up with your Google or GitHub account. Your Docker ID must be between 4 and 30 characters long, and can only contain
 numbers and lowercase letters. You cannot use any special characters or spaces.
 
-For more information, see [Docker ID](../docker-id/index.md). If your admin enforces [Single sign-on (SSO)](../single-sign-on/index.md), a Docker ID is provisioned for new users.
+For more information, see [Docker ID](../docker-id/index.md). If your admin enforces [Single sign-on (SSO)](../security/for-admins/single-sign-on/index.md), a Docker ID is provisioned for new users.
 
 Developers may have multiple Docker IDs in order to separate their Docker IDs that are associated with an organization in Docker Business or Team, and their personal use Docker IDs.
 
@@ -65,7 +65,7 @@ The organization owner can also add additional owners to help them manage users,
 ### Can I configure multiple SSO identity providers (IdPs) to authenticate users to a single org?
 
 Docker SSO allows only one IdP configuration per organization. For more
-information, see [Configure SSO](../single-sign-on/index.md) and [SSO FAQs](../single-sign-on/faqs.md).
+information, see [Configure SSO](../security/for-admins/single-sign-on/index.md) and [SSO FAQs](../faq/security/single-sign-on/faqs.md).
 
 ### What is a service account?
 

content/docker-hub/manage-a-team.md

@@ -26,7 +26,7 @@ An organization owner is an administrator who is responsible to manage
 repositories and add team members to the organization. They have full access to
 private repositories, all teams, billing information, and org settings. An org
 owner can also specify [permissions](#permissions-reference) for each team in
-the organization. Only an org owner can enable [SSO](../single-sign-on/index.md)
+the organization. Only an org owner can enable [SSO](../security/for-admins/single-sign-on/index.md)
 for
 the organization. When SSO is enabled for your organization, the org owner can
 also manage users. Docker can auto-provision Docker IDs for new end-users or
@@ -53,7 +53,7 @@ To give a team access to a repository
 
     ![Team Repo Permissions](images/team-repo-permission.png)
 
-Organization owners can also assign members the editor role to grant partial administrative access. See [Roles and permissions](/docker-hub/roles-and-permissions/) for more about the editor role.
+Organization owners can also assign members the editor role to grant partial administrative access. See [Roles and permissions](/security/for-admins/roles-and-permissions/) for more about the editor role.
 
 ### Permissions reference
 

content/docker-hub/organization-faqs.md

@@ -21,7 +21,7 @@ select the owner role from the drop-down menu. See [Organization owner](manage-a
 
 ### How do I know how many active users are part of my organization?
 
-If your organization uses a Software Asset Management tool, you can use it to find out how many users have Docker Desktop installed. If your organization doesn't use this software, you can run an internal survey to find out who is using Docker Desktop. See [Identify your Docker users and their Docker accounts](../docker-hub/onboard.md#step-1-identify-your-docker-users-and-their-docker-accounts). With a Docker Business subscription, you can manage members in your identity provider and automatically provision them to your Docker organization with [SSO](../single-sign-on/_index.md) or [SCIM](../docker-hub/scim.md).
+If your organization uses a Software Asset Management tool, you can use it to find out how many users have Docker Desktop installed. If your organization doesn't use this software, you can run an internal survey to find out who is using Docker Desktop. See [Identify your Docker users and their Docker accounts](../docker-hub/onboard.md#step-1-identify-your-docker-users-and-their-docker-accounts). With a Docker Business subscription, you can manage members in your identity provider and automatically provision them to your Docker organization with [SSO](../security/for-admins/single-sign-on/_index.md) or [SCIM](../security/for-admins/scim.md).
 
 ### Do users first need to authenticate with Docker before an owner can add them to an organization?
 

content/single-sign-on/domain-faqs.md → content/faq/security/single-sign-on/domain-faqs.md

@@ -2,6 +2,8 @@
 description: Single Sign-on FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on
 title: Domains
+aliases:
+- /single-sign-on/domain-faqs/
 ---
 
 ### Can I add sub-domains?

content/single-sign-on/enforcement-faqs.md → content/faq/security/single-sign-on/enforcement-faqs.md

@@ -2,6 +2,8 @@
 description: Single Sign-on FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on
 title: Enforcement
+aliases:
+- /single-sign-on/enforcement-faqs/
 ---
 
 ### We currently have a Docker Team subscription. How do we enable SSO?
@@ -18,7 +20,7 @@ Yes. You must verify a domain before using it with an SSO connection.
 
 ### Does Docker SSO support authenticating through the command line?
 
-Yes. When SSO is enforced, you can access the Docker CLI through Personal Access Tokens (PATs).  Each user must create a PAT to access the CLI. To learn how to create a PAT, see [Manage access tokens](../security/for-developers/access-tokens.md).
+Yes. When SSO is enforced, you can access the Docker CLI through Personal Access Tokens (PATs).  Each user must create a PAT to access the CLI. To learn how to create a PAT, see [Manage access tokens](../../../security/for-developers/access-tokens.md).
 
 ### How does SSO affect our automation systems and CI/CD pipelines?
 
@@ -60,5 +62,5 @@ No. They are different features that you can use separately or together.
 Enforcing SSO ensures that users sign in using their SSO credentials instead of their Docker ID. One of the benefits is that SSO enables you to better manage user credentials.
 
 Enforcing sign-in to Docker Desktop ensures that users always sign in to an
-account that's a member of your organization. The benefits are that your organization's security settings are always applied to the user's session and your users always receive the benefits of your subscription. For more details, see [Enforce sign-in for Desktop](../security/for-admins/configure-sign-in.md).
+account that's a member of your organization. The benefits are that your organization's security settings are always applied to the user's session and your users always receive the benefits of your subscription. For more details, see [Enforce sign-in for Desktop](../../../security/for-admins/configure-sign-in.md).
 

content/single-sign-on/faqs.md → content/faq/security/single-sign-on/faqs.md

@@ -2,6 +2,8 @@
 description: Single Sign-on FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on
 title: General
+aliases:
+- /single-sign-on/faqs/
 ---
 
 ### Is Docker SSO available for all paid subscriptions?
@@ -18,7 +20,7 @@ Docker supports Service Provider Initiated (SP-initiated) SSO flow. This means u
 
 ### Where can I find detailed instructions on how to configure Docker SSO?
 
-You first need to establish an SSO connection with your identity provider, and the company email domain needs to be verified prior to establishing an SSO connection for your users. For detailed step-by-step instructions on how to configure Docker SSO, see [Single Sign-on](index.md).
+You first need to establish an SSO connection with your identity provider, and the company email domain needs to be verified prior to establishing an SSO connection for your users. For detailed step-by-step instructions on how to configure Docker SSO, see [Single Sign-on](../../../security/for-admins/single-sign-on/configure/_index.md).
 
 ### Does Docker SSO support multi-factor authentication (MFA)?
 

content/single-sign-on/idp-faqs.md → content/faq/security/single-sign-on/idp-faqs.md

@@ -2,6 +2,8 @@
 description: Single Sign-on FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on
 title: Identity providers
+aliases:
+- /single-sign-on/idp-faqs/
 ---
 
 ### Is it possible to use more than one IdP with Docker SSO?

content/single-sign-on/saml-faqs.md → content/faq/security/single-sign-on/saml-faqs.md

@@ -2,6 +2,8 @@
 description: Single Sign-on FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on
 title: SAML
+aliases:
+- /single-sign-on/saml-faqs/
 ---
 
 ### Does SAML authentication require additional attributes?

content/single-sign-on/users-faqs.md → content/faq/security/single-sign-on/users-faqs.md

@@ -2,6 +2,8 @@
 description: Single Sign-on FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on
 title: Manage users
+aliases: 
+- /single-sign-on/users-faqs/
 ---
 
 ### How do I manage users when using SSO?
@@ -32,7 +34,7 @@ If users attempt to sign in through the CLI, they must authenticate using a pers
 
 ### Is it possible to force users of Docker Desktop to authenticate, and/or authenticate using their company’s domain?
 
-Yes. Admins can force users to authenticate with Docker Desktop by provisioning a [`registry.json`](../security/for-admins/configure-sign-in.md) configuration file. The `registry.json` file will force users to authenticate as a user that's configured in the `allowedOrgs` list in the `registry.json` file.
+Yes. Admins can force users to authenticate with Docker Desktop by provisioning a [`registry.json`](../../../security/for-admins/configure-sign-in.md) configuration file. The `registry.json` file will force users to authenticate as a user that's configured in the `allowedOrgs` list in the `registry.json` file.
 
 Once SSO enforcement is set up on their Docker Business organization or company on Hub, when the user is forced to authenticate with Docker Desktop, the SSO enforcement will also force users to authenticate through SSO with their IdP (instead of authenticating using their username and password).
 
@@ -55,7 +57,7 @@ When SSO is enabled and enforced, your users just have to sign in using the emai
 
 ### Is Docker SSO fully synced with the IdP?
 
-Docker SSO provides Just-In-Time (JIT) provisioning by default. This provisioning only happens when a user signs in. If a user leaves the organization, administrators must sign in to Docker Hub and manually [remove the user](/docker-hub/members/#remove-a-member-or-invitee) from the organization. [SCIM](/docker-hub/scim/) is available to provide full synchronization with users and groups.
+Docker SSO provides Just-In-Time (JIT) provisioning by default. This provisioning only happens when a user signs in. If a user leaves the organization, administrators must sign in to Docker Hub and manually [remove the user](/docker-hub/members/#remove-a-member-or-invitee) from the organization. [SCIM](../../../security/for-admins/scim.md) is available to provide full synchronization with users and groups.
 
 Additionally, you can use the [Docker Hub API](/docker-hub/api/latest/) to complete this process.