docs: unify Accounts and Admin under /accounts/

.github/labeler.yml

@@ -153,7 +153,7 @@ area/subscription:
 area/admin:
   - changed-files:
       - any-glob-to-any-file:
-          - content/manuals/admin/**
+          - content/manuals/accounts/organization/**
 
 area/extensions:
   - changed-files:
@@ -175,6 +175,7 @@ area/accounts:
   - changed-files:
       - any-glob-to-any-file:
           - content/manuals/accounts/**
+          - content/manuals/faqs/**
 
 area/copilot:
   - changed-files:

content/guides/admin-set-up.md

@@ -51,7 +51,7 @@ policies.
 
 This guide covers the following Docker features:
 
-- [Organizations](/manuals/admin/organization/_index.md): The core structure
+- [Organizations](/manuals/accounts/organization/_index.md): The core structure
   for managing your Docker environment, grouping users, teams, and image
   repositories. Your organization was created with your subscription and is
   managed by one or more owners. Users signed into the organization are
@@ -130,7 +130,7 @@ files to be distributed to developer machines. Use MDM tools to deploy these con
 ### Identify Docker organizations
 
 Some companies may have more than one
-[Docker organization](/manuals/admin/organization/_index.md) created. These
+[Docker organization](/manuals/accounts/organization/_index.md) created. These
 organizations may have been created for specific purposes, or may not be
 needed anymore.
 
@@ -185,8 +185,8 @@ settings, along with your chosen method for [enforcing sign-in](/manuals/enterpr
 ### Manage your organizations
 
 If you have more than one organization, consider either [consolidating them
-into one organization](/manuals/admin/organization/setup/orgs.md) or creating a
-[Docker company](/manuals/admin/company/_index.md) to manage multiple
+into one organization](/manuals/accounts/organization/setup/orgs.md) or creating a
+[Docker company](/manuals/accounts/organization/company/_index.md) to manage multiple
 organizations.
 
 ### Begin setup
@@ -325,6 +325,6 @@ for Docker.
 
 To continue optimizing your Docker environment:
 
-- Review your [organization's usage data](/manuals/admin/insights.md) to track adoption
+- Review your [organization's usage data](/manuals/accounts/organization/insights.md) to track adoption
 - Monitor [Docker Scout findings](/manuals/scout/explore/analysis.md) for security insights
 - Explore [additional security features](/manuals/enterprise/security/_index.md) to enhance your configuration

content/guides/admin-user-management.md

@@ -46,7 +46,7 @@ With the right configurations, you can ensure your developers have easy access t
 
 Before setting up roles and permissions, it's important to have a clear understanding of who in your organization requires Docker access. Focus on gathering a comprehensive view of active users, their roles within projects, and how they interact with Docker resources. This process can be supported by tools like device management software or manual assessments. Encourage all users to update their Docker accounts to use organizational email addresses, ensuring seamless integration with your subscription.
 
-For steps on how you can do this, see [step 1 of onboarding your organization](/manuals/admin/organization/setup/onboard.md).
+For steps on how you can do this, see [step 1 of onboarding your organization](/manuals/accounts/organization/setup/onboard.md).
 
 ### Assign roles strategically
 
@@ -68,7 +68,7 @@ Teams in Docker provide a structured way to manage member access and they provid
 - Assign permissions at the team level rather than individually. For instance, a development team might have "Read & Write" access to certain repositories, while a QA team has "Read-only" access.
 - As teams grow or responsibilities shift, you can easily update permissions or add new members, maintaining consistency without reconfiguring individual settings.
 
-For more information, see [Create and manage a team](/manuals/admin/organization/manage/manage-a-team.md).
+For more information, see [Create and manage a team](/manuals/accounts/organization/manage/manage-a-team.md).
 
 #### Example scenarios
 
@@ -103,7 +103,7 @@ Members are granted controlled access to resources and enjoy enhanced organizati
 - Access to enhanced features: Members benefit from organization-wide perks, such as increased pull limits and access to premium Docker features.
 - Security control: Apply and enforce security settings at an organizational level, reducing risks associated with unmanaged accounts.
 
-For detailed information, see [Manage organization members](/manuals/admin/organization/manage/members.md).
+For detailed information, see [Manage organization members](/manuals/accounts/organization/manage/members.md).
 
 ### Future-proof user management
 
@@ -168,7 +168,7 @@ Activity logs are available for Docker Team or Docker Business plans, with data
 - Team collaboration review: Logs show which team members pushed updates to a critical repository, ensuring accountability during a development sprint.
 - Billing adjustments: Track who added or removed subscription seats to maintain budgetary control and compliance.
 
-For more information, see [Activity logs](/manuals/admin/activity-logs.md).
+For more information, see [Activity logs](/manuals/accounts/organization/activity-logs.md).
 
 ### Insights
 
@@ -186,13 +186,13 @@ Insights provide data-driven views of Docker usage to improve team productivity
 - Build efficiency: Track average build times and success rates to pinpoint bottlenecks in development processes.
 - Container utilization: Analyze container activity across departments to ensure proper resource distribution and cost efficiency.
 
-For more information, see [Insights](/manuals/admin/insights.md).
+For more information, see [Insights](/manuals/accounts/organization/insights.md).
 
 ### Next steps
 
 Now that you've mastered user and access management in Docker, you can:
 
-- Review your [activity logs](/manuals/admin/activity-logs.md) regularly to maintain security awareness
-- Check your [Insights dashboard](/manuals/admin/insights.md) to identify opportunities for optimization
+- Review your [activity logs](/manuals/accounts/organization/activity-logs.md) regularly to maintain security awareness
+- Check your [Insights dashboard](/manuals/accounts/organization/insights.md) to identify opportunities for optimization
 - Explore [advanced security features](/manuals/enterprise/security/_index.md) to further enhance your Docker environment
 - Share best practices with your team to ensure consistent adoption of security policies

content/manuals/_index.md

@@ -79,22 +79,22 @@ params:
     icon: /icons/Scout.svg
     link: /scout/
   platform:
-  - title: Administration
-    description: Centralized observability for companies and organizations.
-    icon: shield-check
-    link: /admin/
+  - title: Accounts
+    description: Manage Docker individual and organization accounts.
+    icon: user-circle
+    link: /accounts/
   - title: Billing
     description: Manage billing and payment methods.
     icon: credit-card
     link: /billing/
-  - title: Accounts
-    description: Manage your Docker account.
-    icon: user-circle
-    link: /accounts/
   - title: Security
     description: Security guardrails for both administrators and developers.
     icon: lock-closed
     link: /security/
+  - title: FAQs
+    description: Frequently asked questions about Docker accounts, organizations, and companies.
+    icon: question-mark-circle
+    link: /faqs/
   - title: Subscription
     description: Commercial use licenses for Docker products.
     icon: credit-card

content/manuals/accounts/_index.md

@@ -1,63 +1,28 @@
 ---
-title: Docker accounts
+title: Accounts
 description: >
-  Learn what a Docker account is, how Docker IDs, emails, and sign-in methods
-  relate, and how individual accounts connect to organizations
-keywords: accounts, docker ID, username, email, Google, GitHub, sign-in,
-  authentication, account management, docker account, individual account,
-  organization account, account types, Docker Hub, SSO, deactivate account
+  Manage Docker individual accounts and organization administration, including
+  members, teams, and companies.
+keywords: accounts, admin, Docker ID, organization, company, Docker Home,
+  account management
 weight: 10
 params:
   sidebar:
     group: Platform
 grid:
-  - title: Create an account
-    description: Get started with Docker and create an account.
-    icon: finger-print
-    link: /accounts/create-account/
-  - title: Manage account
-    description: Learn how to manage the settings for your account.
-    icon: cog
-    link: /accounts/manage-account/
-  - title: Personal access tokens
-    description: Learn how to create and manage access tokens for your account.
-    icon: lock-closed
-    link: /security/access-tokens/
-  - title: Set up two-factor authentication
-    description: Add an extra layer of authentication to your Docker account.
-    link: /security/2fa/
-    icon: device-phone-mobile
-  - title: Organization overview
-    description: Learn how to create and manage Docker organizations.
+  - title: Docker individual accounts
+    description: Create and manage your Docker ID, email, and sign-in methods.
+    icon: user-circle
+    link: /accounts/individual/
+  - title: Organization accounts
+    description: Manage organizations, companies, members, and teams.
     icon: building-storefront
-    link: /admin/organization/
-  - title: Account FAQs
-    description: Explore frequently asked questions about Docker accounts.
-    icon: question-mark-circle
-    link: /accounts/general-faqs/
+    link: /accounts/organization/
 ---
 
-A Docker account is how Docker identifies you. Use it to access products like
-Docker Hub and Docker Desktop, manage settings, and join organizations.
-
-Docker has two primary account types: individual and organization. You create
-and administer organizations with your individual account. For organization
-accounts, see [Organizations](/manuals/admin/organization/_index.md). For
-organizations and companies, see [Administration](/manuals/admin/_index.md).
-
-## Docker ID, email, and sign-in
-
-When you create an account, you choose a Docker ID and a sign-in method.
-Docker also ties a verified email to the account.
-
-- Docker account: Associates your plans, Hub repositories, and account
-  settings.
-- Docker ID: A unique username that identifies you.
-- Email: How Docker contacts you for notifications and security-related
-  communications.
-- Sign-in method: Email and password,
-  [single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/_index.md),
-  Google, or GitHub.
+A Docker account identifies you and lets you access Docker products. Use an
+individual account for your Docker ID and personal settings. Use an
+organization account to manage members, teams, and company-wide settings.
 
 ## Next steps
 

content/manuals/accounts/individual/_index.md

@@ -0,0 +1,62 @@
+---
+title: Docker individual accounts
+linkTitle: Individual
+description: >
+  Learn what a Docker account is, how Docker IDs, emails, and sign-in methods
+  relate, and how individual accounts connect to organizations
+keywords: accounts, docker ID, username, email, Google, GitHub, sign-in,
+  authentication, account management, docker account, individual account,
+  organization account, account types, Docker Hub, SSO, deactivate account
+weight: 10
+grid:
+  - title: Create an account
+    description: Get started with Docker and create an account.
+    icon: finger-print
+    link: /accounts/individual/create-account/
+  - title: Manage account
+    description: Learn how to manage the settings for your account.
+    icon: cog
+    link: /accounts/individual/manage-account/
+  - title: Personal access tokens
+    description: Learn how to create and manage access tokens for your account.
+    icon: lock-closed
+    link: /security/access-tokens/
+  - title: Set up two-factor authentication
+    description: Add an extra layer of authentication to your Docker account.
+    link: /security/2fa/
+    icon: device-phone-mobile
+  - title: Organization accounts
+    description: Learn how to create and manage Docker organizations.
+    icon: building-storefront
+    link: /accounts/organization/
+  - title: Account FAQs
+    description: Explore frequently asked questions about Docker accounts.
+    icon: question-mark-circle
+    link: /faqs/general-faqs/
+---
+
+A Docker account is how Docker identifies you. Use it to access products like
+Docker Hub and Docker Desktop, manage settings, and join organizations.
+
+Docker has two primary account types: individual and organization. You create
+and administer organizations with your individual account. For organization
+accounts, including companies, see
+[Organization accounts](/manuals/accounts/organization/_index.md).
+
+## Docker ID, email, and sign-in
+
+When you create an account, you choose a Docker ID and a sign-in method.
+Docker also ties a verified email to the account.
+
+- Docker account: Associates your plans, Hub repositories, and account
+  settings.
+- Docker ID: A unique username that identifies you.
+- Email: How Docker contacts you for notifications and security-related
+  communications.
+- Sign-in method: Email and password,
+  [single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/_index.md),
+  Google, or GitHub.
+
+## Next steps
+
+{{< grid >}}

content/manuals/accounts/create-account.md → content/manuals/accounts/individual/create-account.md

@@ -8,6 +8,7 @@ keywords:
   create docker account, docker ID, sign up, sign in, email, Google, GitHub,
   verification, OTP, password, docker login, username requirements
 aliases:
+  - /accounts/create-account/
   - /docker-hub/accounts/
   - /docker-id/
 ---
@@ -85,5 +86,5 @@ basis:
 
 ## Next steps
 
-- [Manage a Docker account](/manuals/accounts/manage-account.md)
+- [Manage a Docker account](/manuals/accounts/individual/manage-account.md)
 - [Enable two-factor authentication](/manuals/security/2fa/_index.md)

content/manuals/accounts/deactivate-user-account.md → content/manuals/accounts/individual/deactivate-user-account.md

@@ -7,13 +7,15 @@ keywords:
   deactivate docker account, delete docker account, close docker account,
   disable docker account, account management, leave organization, privacy
   request, personal data
+aliases:
+  - /accounts/deactivate-user-account/
 ---
 
 Learn how to deactivate an individual Docker account, including the
 prerequisites required for deactivation.
 
 For information on deactivating an organization, see
-[Deactivate an organization](/manuals/admin/organization/deactivate-account.md).
+[Deactivate an organization](/manuals/accounts/organization/manage/deactivate-account.md).
 
 > [!WARNING]
 >

content/manuals/accounts/manage-account.md → content/manuals/accounts/individual/manage-account.md

@@ -8,6 +8,8 @@ keywords:
   manage docker account, account settings, update email, change password,
   Gravatar, two-factor authentication, personal access tokens, Google, GitHub,
   connected accounts, convert account, deactivate account, Docker Home
+aliases:
+  - /accounts/manage-account/
 ---
 
 You can manage your Docker account in Docker Home, including administrative
@@ -116,15 +118,15 @@ or GitHub. See Google or GitHub's documentation for more information:
 
 For information on converting your account into an organization, see
 [Convert an account into an
-organization](/manuals/admin/organization/setup/convert-account.md).
+organization](/manuals/accounts/organization/setup/convert-account.md).
 
 ## Deactivate your account
 
 For information on deactivating your account, see
-[Deactivate a Docker account](/manuals/accounts/deactivate-user-account.md).
+[Deactivate a Docker account](/manuals/accounts/individual/deactivate-user-account.md).
 
 ## Next steps
 
-- [Docker accounts overview](/manuals/accounts/_index.md)
-- [Create a Docker account](/manuals/accounts/create-account.md)
+- [Docker individual accounts overview](/manuals/accounts/individual/_index.md)
+- [Create a Docker account](/manuals/accounts/individual/create-account.md)
 - [Enable two-factor authentication](/manuals/security/2fa/_index.md)