Admin IA refresh

content/guides/admin-set-up/finalize-plans-and-setup.md

@@ -20,7 +20,7 @@ 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/orgs.md) or creating a
+into one organization](/manuals/admin/organization/setup/orgs.md) or creating a
 [Docker company](/manuals/admin/company/_index.md) to manage multiple
 organizations.
 

content/guides/admin-user-management/_index.md

@@ -13,7 +13,7 @@ params:
     - title: Single sign-on
       url: /security/for-admins/single-sign-on/
     - title: Onboard your organization
-      url: /admin/organization/onboard/
+      url: /admin/organization/setup/onboard/
     - title: Roles and permissions
       url: /security/for-admins/roles-and-permissions/
     - title: Insights

content/guides/admin-user-management/onboard.md

@@ -25,7 +25,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/members.md).
+For detailed information, see [Manage organization members](/manuals/admin/organization/manage/members.md).
 
 ## Future-proof user management
 

content/guides/admin-user-management/setup.md

@@ -11,7 +11,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/onboard.md).
+For steps on how you can do this, see [step 1 of onboarding your organization](/manuals/admin/organization/setup/onboard.md).
 
 ## Assign roles strategically
 
@@ -33,7 +33,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-a-team.md).
+For more information, see [Create and manage a team](/manuals/admin/organization/manage/manage-a-team.md).
 
 ### Example scenarios
 

content/manuals/accounts/manage-account.md

@@ -40,9 +40,9 @@ To update your email address:
 
 1. Sign in to your [Docker account](https://app.docker.com/login).
 1. Go to **Settings**, then choose **Email**.
-1. Enter your new email address and confirm your identity with your password. Select **Verify email**. 
+1. Enter your new email address and confirm your identity with your password. Select **Verify email**.
 1. Go to the new Docker email and copy the 6-digit verification code.
-1. Paste the verification code to complete updating your email. 
+1. Paste the verification code to complete updating your email.
 
 Your verification session expires after 15 minutes.
 
@@ -60,7 +60,7 @@ You can change your password by initiating a password reset via email. To change
 1. Select your avatar in the top-right corner and select **Account settings**.
 1. Select **Password**, then **Reset password**.
 1. Docker will send you a password reset email with instructions to reset
-your password.
+   your password.
 
 ## Manage two-factor authentication
 
@@ -102,7 +102,7 @@ or GitHub. See Google or GitHub's documentation for more information:
 ## Convert your account
 
 For information on converting your account into an organization, see
-[Convert an account into an organization](../admin/organization/convert-account.md).
+[Convert an account into an organization](../admin/organization/setup/convert-account.md).
 
 ## Deactivate your account
 

content/manuals/admin/_index.md

@@ -18,7 +18,7 @@ grid:
   - title: Onboard your organization
     description: Learn how to onboard and secure your organization.
     icon: explore
-    link: /admin/organization/onboard
+    link: /admin/organization/setup/onboard
   - title: Company FAQ
     description: Discover common questions and answers about companies.
     icon: help

content/manuals/admin/company/_index.md

@@ -1,5 +1,6 @@
 ---
-title: Company administration overview
+title: Company overview
+linkTitle: Company
 weight: 20
 description: Learn how to manage multiple organizations using companies, including managing users, owners, and security.
 keywords: company, multiple organizations, manage companies, admin console, Docker Business settings

content/manuals/admin/company/new-company.md

@@ -1,5 +1,6 @@
 ---
 title: Create a company
+linkTitle: Create
 description: Learn how to create a company to centrally manage multiple organizations.
 keywords: company, hub, organization, company owner, Admin Console, company management, Docker Business, create company, Docker Admin Console
 aliases:

content/manuals/admin/company/organizations.md

@@ -1,5 +1,6 @@
 ---
 title: Manage company organizations
+linkTitle: Manage organizations
 description: Learn how to manage organizations in a company.
 keywords: company, multiple organizations, manage organizations, Docker Admin Console, organization settings, add organization, company management
 ---

content/manuals/admin/company/owners.md

@@ -1,5 +1,6 @@
 ---
 title: Manage company owners
+linkTitle: Manage owners
 description: Learn how to add and remove company owners.
 keywords: company, owners, add company owner, remove company owner, company manageemnt, company owner permissions
 aliases:

content/manuals/admin/company/users.md

@@ -1,5 +1,6 @@
 ---
 title: Manage company members
+linkTitle: Manage users
 description: Learn how to manage company members in the Docker Admin Console.
 keywords: company, company members, members, admin, Admin Console, member management, organization management, company management, bulk invite, resend invites
 ---
@@ -141,4 +142,4 @@ see the [Bulk create invites](https://docs.docker.com/reference/api/hub/latest/#
 ## Manage members on a team
 
 Use Docker Hub to add a member to a team or remove a member from a team. For
-more details, see [Manage members](../organization/members.md#manage-members-on-a-team).
+more details, see [Manage members](../organization/manage/members.md#manage-members-on-a-team).

content/manuals/admin/faqs/_index.md

@@ -1,7 +1,7 @@
 ---
 build:
   render: never
-linkTitle: FAQ
-title: Account and admin FAQ
+linkTitle: FAQs
+title: Account and admin FAQs
 weight: 30
 ---

content/manuals/admin/faqs/company-faqs.md

@@ -37,7 +37,7 @@ When you first create a company, your account is both a company owner and an
 organization owner. In that case, your account will occupy a seat as long as
 you remain an organization owner.
 
-To avoid occupying a seat, [assign another user as the organization owner](/manuals/admin/organization/members.md#update-a-member-role) and remove yourself from the organization.
+To avoid occupying a seat, [assign another user as the organization owner](/manuals/admin/organization/manage/members.md#update-a-member-role) and remove yourself from the organization.
 You'll retain full administrative access as a company owner without using a
 subscription seat.
 

content/manuals/admin/faqs/organization-faqs.md

@@ -17,7 +17,7 @@ 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.
 
-For more information, see [Identify your Docker users and their Docker accounts](../../admin/organization/onboard.md#step-one-identify-your-docker-users).
+For more information, see [Identify your Docker users and their Docker accounts](../../admin/organization/setup/onboard.md#step-one-identify-your-docker-users).
 
 ### Do users need to authenticate with Docker before an owner can add them to an organization?
 
@@ -49,7 +49,7 @@ For prerequisites and instructions, see
 Yes. A user invited to an organization will take up one of the provisioned
 seats, even if that user hasn’t accepted their invitation yet.
 
-To manage invites, see [Manage organization members](/manuals/admin/organization/members.md).
+To manage invites, see [Manage organization members](/manuals/admin/organization/manage/members.md).
 
 ### Do organization owners take a seat?
 

content/manuals/admin/organization/Setup/_index.md

@@ -0,0 +1,6 @@
+---
+build:
+  render: never
+title: Setup
+weight: 10
+---

content/manuals/admin/organization/convert-account.md → content/manuals/admin/organization/Setup/convert-account.md

@@ -1,10 +1,12 @@
 ---
 description: Convert your Docker Hub user account into an organization
+linkTitle: Convert account
 title: Convert an account into an organization
 keywords: docker hub, hub, organization, convert account, migrate account
-weight: 35
+weight: 40
 aliases:
-- /docker-hub/convert-account/
+  - /docker-hub/convert-account/
+  - /admin/organization/convert-account/
 ---
 
 {{< summary-bar feature_name="Admin orgs" >}}
@@ -13,7 +15,7 @@ Learn how to convert an existing user account into an organization. This is
 useful if you need multiple users to access your account and the repositories
 it’s connected to. Converting it to an organization gives you better control
 over permissions for these users through
-[teams](/manuals/admin/organization/manage-a-team.md) and
+[teams](/manuals/admin/organization/manage/manage-a-team.md) and
 [roles](/manuals/enterprise/security/roles-and-permissions.md).
 
 When you convert a user account to an organization, the account is migrated to
@@ -25,54 +27,54 @@ Before you convert a user account to an organization, ensure that you meet the f
 
 - The user account that you want to convert must not be a member of a company or any teams or organizations. You must remove the account from all teams, organizations, or the company.
 
-    To do this:
-    1. Navigate to **My Hub** and then select the organization you need to leave.
-    1. Find your username in the **Members** tab.
-    1. Select the **More options** menu and then select **Leave organization**.
+  To do this:
+  1. Navigate to **My Hub** and then select the organization you need to leave.
+  1. Find your username in the **Members** tab.
+  1. Select the **More options** menu and then select **Leave organization**.
 
-    If the user account is the sole owner of any organization or company, assign another user the owner role and then remove yourself from the organization or company.
+  If the user account is the sole owner of any organization or company, assign another user the owner role and then remove yourself from the organization or company.
 
--  You must have a separate Docker ID ready to assign as the owner of the organization during conversion.
+- You must have a separate Docker ID ready to assign as the owner of the organization during conversion.
 
-    If you want to convert your user account into an organization account and you don't have any other user accounts, you need to create a new user account to assign it as the owner of the new organization. With the owner role assigned, this user account has full administrative access to configure and manage the organization. You can assign more users the owner role after the conversion.
+  If you want to convert your user account into an organization account and you don't have any other user accounts, you need to create a new user account to assign it as the owner of the new organization. With the owner role assigned, this user account has full administrative access to configure and manage the organization. You can assign more users the owner role after the conversion.
 
 ## What happens when you convert your account
 
 The following happens when you convert your account into
 an organization:
 
 - This process removes the email address for the account. Notifications are
-instead sent to organization owners. You'll be able to reuse the
-removed email address for another account after converting.
+  instead sent to organization owners. You'll be able to reuse the
+  removed email address for another account after converting.
 - The current subscription will automatically cancel and your new subscription
-will start.
+  will start.
 - Repository namespaces and names won't change, but converting your account
-removes any repository collaborators. Once you convert the account, you'll need
-to add repository collaborators as team members.
+  removes any repository collaborators. Once you convert the account, you'll need
+  to add repository collaborators as team members.
 - Existing automated builds appear as if they were set up by the first owner
-added to the organization.
+  added to the organization.
 - The user account that you add as the first owner will have full
-administrative access to configure and manage the organization.
+  administrative access to configure and manage the organization.
 - To transfer a user's personal access tokens (PATs) to your converted
-organization, you must designate the user as an organization owner. This will
-ensure any PATs associated with the user's account are transferred to the
-organization owner.
+  organization, you must designate the user as an organization owner. This will
+  ensure any PATs associated with the user's account are transferred to the
+  organization owner.
 
 ## Convert an account into an organization
 
 > [!IMPORTANT]
 >
 > Converting an account into an organization is permanent. Back up any data
- or settings you want to retain.
+> or settings you want to retain.
 
 1. Sign in to [Docker Home](https://app.docker.com/).
 1. Select your avatar in the top-right corner to open the drop-down.
 1. From **Account settings**, select **Convert**.
 1. Review the warning displayed about converting a user account. This action
-cannot be undone and has considerable implications for your assets and the
-account.
+   cannot be undone and has considerable implications for your assets and the
+   account.
 1. Enter a **Username of new owner** to set an organization owner. The new
-Docker ID you specify becomes the organization’s owner. You cannot use the
-same Docker ID as the account you are trying to convert.
+   Docker ID you specify becomes the organization’s owner. You cannot use the
+   same Docker ID as the account you are trying to convert.
 1. Select **Confirm**. The new owner receives a notification email. Use that
-owner account to sign in and manage the new organization.
+   owner account to sign in and manage the new organization.

content/manuals/admin/organization/general-settings.md → content/manuals/admin/organization/Setup/general-settings.md

@@ -1,8 +1,10 @@
 ---
-title: Organization information
-weight: 60
+title: Configure settings
+weight: 30
 description: Learn how to manage settings for organizations using Docker Admin Console.
 keywords: organization, settings, Admin Console, manage, Docker organization, Gravatar, SCIM, SSO setup, domain management, organization settings
+aliases:
+  - /admin/organization/general-settings/
 ---
 
 Learn how to update your organization information using the Admin Console.

content/manuals/admin/organization/onboard.md → content/manuals/admin/organization/Setup/onboard.md

@@ -1,5 +1,6 @@
 ---
 title: Onboard your organization
+linkTitle: Onboard
 weight: 20
 description: Get started onboarding your Docker Team or Business organization.
 keywords: business, team, organizations, get started, onboarding, Admin Console, organization management,
@@ -9,6 +10,7 @@ aliases:
   - /docker-hub/onboard/
   - /docker-hub/onboard-team/
   - /docker-hub/onboard-business/
+  - /admin/organization/onboard/
 ---
 
 {{< summary-bar feature_name="Admin orgs" >}}
@@ -38,17 +40,17 @@ Before you start onboarding your organization, ensure you:
   > When purchasing a self-serve subscription, the on-screen instructions
   > guide you through creating an organization. If you have purchased a
   > subscription through Docker Sales and you have not yet created an
-  > organization, see [Create an organization](/manuals/admin/organization/orgs.md).
+  > organization, see [Create an organization](/manuals/admin/organization/setup/orgs.md).
 
 - Familiarize yourself with Docker concepts and terminology in
-  the [administration overview](../_index.md).
+  the [administration overview](../../_index.md).
 
 ## Onboard with guided setup
 
 The Admin Console has a guided setup to help you
 onboard your organization. The guided setup's steps consist of basic onboarding
 tasks. If you want to onboard outside of the guided setup,
-see [Recommended onboarding steps](/manuals/admin/organization/onboard.md#recommended-onboarding-steps).
+see [Recommended onboarding steps](/manuals/admin/organization/setup/onboard.md#recommended-onboarding-steps).
 
 To onboard using the guided setup,
 navigate to the [Admin Console](https://app.docker.com) and
@@ -102,7 +104,7 @@ When you create an organization, you are the only owner. It is optional to
 add additional owners.
 
 To add an owner, invite a user and assign them the owner role. For more
-details, see [Invite members](/manuals/admin/organization/members.md) and
+details, see [Invite members](/manuals/admin/organization/manage/members.md) and
 [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).
 
 ### Step three: Invite members
@@ -113,7 +115,7 @@ receive increased pull limits and other organization wide benefits when
 they are signed in.
 
 To add a member, invite a user and assign them the member role.
-For more details, see [Invite members](/manuals/admin/organization/members.md) and
+For more details, see [Invite members](/manuals/admin/organization/manage/members.md) and
 [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).
 
 ### Step four: Manage user access with SSO and SCIM
@@ -168,7 +170,7 @@ security posture:
 
 ## What's next
 
-- [Manage Docker products](./manage-products.md) to configure access and view usage.
+- [Manage Docker products](../manage/manage-products.md) to configure access and view usage.
 - Configure [Hardened Docker Desktop](/manuals/enterprise/security/hardened-desktop/_index.md) to improve your organization’s security posture for containerized development.
 - [Manage your domains](/manuals/enterprise/security/domain-management.md) to ensure that all Docker users in your domain are part of your organization.