accounts: update nav

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

@@ -41,5 +41,6 @@ Once you have completed all the previous steps, you can deactivate your account.
 1. Sign in to [Docker Home](https://app.docker.com/login).
 2. Select your avatar to open the drop-down menu.
 3. Select **Account settings**.
-4. In the **Account management** section, select **Deactivate account**.
-5. To confirm, select **Deactivate account**.
+4. Select **Deactivate**.
+5. Select **Deactivate account**.
+6. To confirm, select **Deactivate account**.

content/manuals/accounts/manage-account.md

@@ -17,7 +17,7 @@ You can centrally manage the settings for your Docker account using Docker Home.
 2. In Docker Home, select your avatar in the top-right corner to open the drop-down.
 3. Select **Account settings**.
 
-From the Account settings page, you can take any of the following actions.
+From the Account Center page, you can take any of the following actions.
 
 ### Update account information
 
@@ -35,7 +35,7 @@ Make your changes here, then select **Save** to save your settings.
 
 ### Update email address
 
-To update your email address, select the arrow icon.
+To update your email address, select **Email**.
 
 1. Enter your new email address.
 2. Enter your password to confirm the change.
@@ -47,22 +47,22 @@ Once you verify your email address, your account information will update.
 
 You can change your password by initiating a password reset via email.
 
-To change your password, select **Reset password**.
+To change your password, select **Password** and then **Reset password**.
 
 Follow the instructions in the password reset email.
 
 ## Manage security settings
 
-You can manage the security settings for your account in Docker Home.
-
+To update your two-factor authentication (2FA) settings, select **2FA**.
 For information on two-factor authentication (2FA) for your account, see [Enable two-factor authentication](../security/for-developers/2fa/_index.md) to get started.
 
+To manage personal access tokens, select **Personal access tokens**.
 For information on personal access tokens, see [Create and manage access tokens](../security/for-developers/access-tokens.md).
 
 ## Account management
 
-You can take administrative actions for your account in Docker Home.
-
+To convert your account into an organization, select **Convert**.
 For more information on converting your account, see [Convert an account into an organization](../admin/organization/convert-account.md).
 
+To deactivate your account, select **Deactivate**.
 For information on deactivating your account, see [Deactivating a user account](./deactivate-user-account.md).

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

@@ -60,10 +60,10 @@ Consider the following effects of converting your account:
 
 4. Select **Account settings**.
 
-5. In the **Account management** section, select **Convert account**.
+5. Select **Convert**.
 
 6. Review the warning displayed about converting a user account. This action cannot be undone and has considerable implications for your assets and the account.
 
-7. Enter a **Docker ID** to set an organization owner. This is the user account that will manage the organization, and the only way to access the organization settings after conversion. You cannot use the same Docker ID as the account you are trying to convert.
+7. Enter a **Username of new owner** to set an organization owner. This is the user account that will manage the organization, and the only way to access the organization settings after conversion. You cannot use the same Docker ID as the account you are trying to convert.
 
-8. Select **Confirm and purchase** to confirm. The new owner receives a notification email. Use that owner account to sign in and manage the new organization.
+8. Select **Confirm**. The new owner receives a notification email. Use that owner account to sign in and manage the new organization.

content/manuals/security/for-developers/2fa/_index.md

@@ -27,7 +27,7 @@ Authenticator with a registered YubiKey.
 
 1. Sign in to your [Docker account](https://app.docker.com/login).
 2. Select your avatar and then from the drop-down menu, select **Account settings**.
-3. Navigate to the **Security** section, then select **Two-factor authentication**.
+3. Select **2FA**.
 4. Enter your account password, then select **Confirm**.
 5. Save your recovery code and store it somewhere safe. You can use your recovery code to recover your account in the event you lose access to your authenticator app.
 6. Use a Time-based One-time password (TOTP) mobile app to scan the QR code or enter the text code.

content/manuals/security/for-developers/2fa/disable-2fa.md

@@ -16,6 +16,6 @@ weight: 30
 
 1. Sign in to your [Docker account](https://app.docker.com/login).
 2. Select your avatar and then from the drop-down menu, select **Account settings**.
-3. Navigate to the **Security** section, then select **Two-factor authentication**.
+3. Select **2FA**.
 4. Enter your password, then select **Confirm**.
 5. Select **Disable 2FA**.

content/manuals/security/for-developers/2fa/new-recovery-code.md

@@ -13,7 +13,7 @@ access to your Docker Hub account, you can generate a new recovery code.
 
 1. Sign in to your [Docker account](https://app.docker.com/login).
 2. Select your avatar and then from the drop-down menu, select **Account settings**.
-3. Navigate to the **Security** section, then select **Manage Two-Factor Authentication**.
+3. Select **2FA**.
 4. Enter your password, then select **Confirm**.
 5. Select **Generate new code**.
 

content/manuals/security/for-developers/access-tokens.md

@@ -29,7 +29,7 @@ Use the Docker Admin Console to create an access token.
 
 2. Select your avatar in the top-right corner and from the drop-down menu select **Account settings**.
 
-3. In the **Security** section, select **Personal access tokens**.
+3. Select **Personal access tokens**.
 
 4. Select **Generate new token**.
 
@@ -79,13 +79,17 @@ You can rename, activate, deactivate, or delete a token as needed. You can manag
 
 2. Select your avatar in the top-right corner and from the drop-down menu select **Account settings**.
 
-3. In the **Security** section, select **Personal access tokens**.
-   This page shows an overview of all your tokens, and lists if the token was generated manually or if it was [auto-generated](#auto-generated-tokens). You can also view the number
-   of tokens that are activated and deactivated in the toolbar.
+3. Select **Personal access tokens**.
 
-4. Select the actions menu on the far right of a token row, then select **Deactivate**, **Edit**, or **Delete** to modify the token.
+   This page shows an overview of all your
+   tokens, and lists if the token was generated manually or if it was
+   [auto-generated](#auto-generated-tokens). You can also view the scope of the
+   tokens, which tokens are activate and inactive, when they were created, when
+   they were last used, and their expiration date.
 
-5. After modifying the token, select **Save token**.
+4. Select the actions menu on the far right of a token row, then select **Deactivate** or **Activate**, **Edit**, or **Delete** to modify the token.
+
+5. After editing the token, select **Save token**.
 
 ## Auto-generated tokens