Merge pull request #3344 from ably/DX-1074-setting-pages-updates

docs(account): update settings pages for new dashboard UX (DX-1074)

Author: matt423

src/images/content/screenshots/dash/account.png

@@ -6,39 +6,34 @@ redirect_from:
   - /docs/account/2fa
 ---
 
-Two-factor authentication (2FA) is an authentication process requiring users to utilize two different forms of verification. 2FA for your Ably account requires your password and a security token sent to your mobile phone.
+Two-factor authentication (2FA) is an authentication process requiring users to utilize two different forms of verification. 2FA for your Ably account requires your password and a time-based one-time password (TOTP) from an authenticator app.
 
 Access your [security settings](https://ably.com/users/settings/security) to configure two-factor authentication for your Ably account.
 
 ## Enable 2FA <a id="enable"/>
 
 To enable 2FA for your own user login:
 
-1. Log in to your account and select [Profile Settings](https://ably.com/users/edit) in your account.
-2. Toggle **Enable Two-Factor Authentication** under the **Two-factor authentication** section.
-    * Re-enter your password as prompted.
-3. Select your **Country**.
-4. Enter your **Phone number**
-5. Click **Next** to receive an SMS with a security token.
-6. Enter the security token and click **Verify security code**.
-7. Scan the QR code into an authenticator app such as Authy, or Google Authenticator.
-8. Store your recovery codes in a safe location.
+1. Log in to your [account](https://ably.com/accounts/any) and go to [Security](https://ably.com/users/settings/security).
+2. Click **Enable** on the **Two-factor authentication** card.
+3. Enter your password in the dialog to confirm.
+4. Scan the QR code into an authenticator app such as Google Authenticator or 1Password.
+5. Enter the generated code to verify.
+6. Store your recovery codes in a safe location.
 
 ### Disable 2FA <a id="disable"/>
 
 To disable 2FA for your own user login:
 
-1. Log in to your account and select [Profile Settings](https://ably.com/users/edit) in your account.
-2. Click the **Disable Two-Factor Authentication** button.
-    * Re-enter your password as prompted.
+1. Log in to your [account](https://ably.com/accounts/any) and go to [Security](https://ably.com/users/settings/security).
+2. Click **Disable** on the **Two-factor authentication** card.
+3. Enter your password in the dialog to confirm.
 
-### Change phone number <a id="phone"/>
+### SMS 2FA <a id="sms"/>
 
-Disable and re-enable 2FA in order to update your phone number.
-
-### SMS and TOTP 2FA <a id="sms"/>
-
-Disable and re-enable 2FA in order to switch between SMS 2FA and TOTP (time-based one-time password) 2FA.
+<Aside data-type='note'>
+SMS-based 2FA is deprecated. Users who previously enabled SMS 2FA remain supported, but new setups use TOTP.
+</Aside>
 
 ## Enforce 2FA for all users <a id="enforce"/>
 
@@ -50,14 +45,14 @@ The account owner must already have 2FA enabled for their own login before they
 
 To enforce 2FA for all users:
 
-1. Log in to your account and select [Profile Settings](https://ably.com/users/edit) in your account.
+1. Log in to your [account](https://ably.com/accounts/any) and go to the account [Security](https://ably.com/accounts/any/security) page.
 2. Toggle **Require Two-Factor Authentication for all account users** under the **Authentication Settings** section.
 3. **Save** the authentication settings.
 
 ### Remove 2FA requirement of all users <a id="remove"/>
 
 To remove the requirement for all users to authenticate with 2FA:
 
-1. Log in to your account and select [Profile Settings](https://ably.com/users/edit) in your account.
+1. Log in to your [account](https://ably.com/accounts/any) and go to the account [Security](https://ably.com/accounts/any/security) page.
 2. Toggle **Require Two-Factor Authentication for all account users** under the **Authentication Settings** section.
 3. **Save** the authentication settings.

src/pages/docs/platform/account/2fa.mdx

@@ -31,3 +31,15 @@ View detailed [reports](https://ably.com/accounts/any/apps/any/reports) about yo
 ## Team <a id="team"/>
 
 [Manage the users](https://ably.com/accounts/any/account_users) that have access to your account. The account owner role has full permissions to manage the account, including adding and removing users, and managing their [roles](/docs/platform/account/team).
+
+## Profile settings <a id="personal"/>
+
+Click the user avatar in the top-right of the Ably dashboard to access your profile settings:
+
+![Ably user menu](../../../../images/content/screenshots/dash/account.png)
+
+Your profile settings are organized into three sections:
+
+* [Profile](https://ably.com/users/settings/profile): view and edit your name and email address, or delete your profile.
+* [Security](https://ably.com/users/settings/security): manage your password, [two-factor authentication (2FA)](/docs/platform/account/2fa), and connected login providers (Google, GitHub).
+* [Emails and notifications](https://ably.com/users/settings/emails_and_notifications): customize Ably email preferences (product updates, news, educational emails) and set up notifications for account usage.

src/pages/docs/platform/account/index.mdx

@@ -77,10 +77,10 @@ You must be an account owner or admin to remove users:
 ## Delete your profile or leave an account <a id="leave"/>
 
 1. Log in to your [account](https://ably.com/accounts/any).
-2. Go to [My Settings](https://ably.com/users/edit).
+2. Go to [Profile settings](https://ably.com/users/settings/profile).
 3. [Disconnect SSO provider](#sso) if you use SSO to log in.
-4. Scroll to "Want to delete your profile?"
-5. Click "Start" to remove yourself from this account.
+4. Scroll to the **Delete profile** section.
+5. Click **Delete profile** to remove yourself from this account.
 
 <Aside data-type='important'>
 Account owners: Deleting your profile will delete the entire account and all data. You must first [transfer ownership](https://faqs.ably.com/can-i-change-my-ably-account-owner) to another user before deleting your profile.
@@ -110,10 +110,13 @@ If you use an SSO login you'll see a "Contact us" link instead of a "Start" butt
 
 If you use SSO to log in, you must set a password and disconnect your SSO provider before closing your account:
 
-1. Log in to your [account](https://ably.com/accounts/any).
-2. Navigate to Account then [My Settings](https://ably.com/users/edit).
-3. In the Password section, click "Change your password".
-4. Click "Update my personal settings" to save the changes.
-5. Scroll to the Login provider section.
-6. Click "remove connection" next to the SSO provider you want to disconnect.
-7. Return to the instructions above to [close your account](#close).
+1. Log in to your [account](https://ably.com/accounts/any) using your current SSO method.
+2. Go to [Security](https://ably.com/users/settings/security).
+3. In the **Password** card, click **Create password** and enter a new password in the dialog.
+4. Scroll to the **Login provider** card.
+5. Click **Disconnect** next to the SSO provider you want to disconnect and confirm in the dialog.
+6. Return to the instructions above to [close your account](#close).
+
+<Aside data-type='note'>
+You cannot disconnect your last remaining SSO provider unless a password is set on your account.
+</Aside>