Merge pull request #15088 from github/repo-sync

repo sync

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md

@@ -21,8 +21,12 @@ topics:
 shortTitle: Remove yourself
 ---
 {% data reusables.user_settings.access_settings %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+2. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "repo" aria-label="The repo icon" %} Repositories**.
+{% else %}
 2. In the left sidebar, click **Repositories**.
   ![Repositories tab](/assets/images/help/settings/settings-sidebar-repositories.png)
+{% endif %}
 3. Next to the repository you want to leave, click **Leave**.
   ![Leave button](/assets/images/help/repository/repo-leave.png)
 4. Read the warning carefully, then click "I understand, leave this repository."

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/integrating-jira-with-your-personal-projects.md

@@ -12,13 +12,12 @@ shortTitle: Integrate Jira with projects
 ---
 {% data reusables.user_settings.access_settings %}
 {% data reusables.user_settings.developer_settings %}
-3. In the left sidebar, click **{% data variables.product.prodname_oauth_apps %}**.
-![{% data variables.product.prodname_oauth_apps %} tab in the left sidebar](/assets/images/help/settings/developer-settings-oauth-apps.png)
-3. Click **Register a new application**.
-4. Under **Application name**, type "Jira".
-5. Under **Homepage URL**, type the full URL to your Jira instance.
-6. Under **Authorization callback URL**, type the full URL to your Jira instance.
-7. Click **Register application**.
+{% data reusables.user-settings.oauth_apps %}
+1. Click **Register a new application**.
+2. Under **Application name**, type "Jira".
+3. Under **Homepage URL**, type the full URL to your Jira instance.
+4. Under **Authorization callback URL**, type the full URL to your Jira instance.
+5. Click **Register application**.
 ![Register application button](/assets/images/help/oauth/register-application-button.png)
 8. Under **Developer applications**, note the "Client ID" and "Client Secret" values.
 ![Client ID and Client Secret](/assets/images/help/oauth/client-id-and-secret.png)

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-tab-size-rendering-preference.md

@@ -14,7 +14,6 @@ shortTitle: Managing your tab size
 If you feel that tabbed indentation in code rendered on {% data variables.product.product_name %} takes up too much, or too little space, you can change this in your settings.
 
 {% data reusables.user_settings.access_settings %}
-1. In the user settings sidebar, click **Appearance**.
-   !["Appearance" tab in user settings sidebar](/assets/images/help/settings/appearance-tab.png)
+1. In the left sidebar, click **{% octicon "paintbrush" aria-label="The paintbrush icon" %} Appearance**.
 2. Under "Tab size preference", select the drop-down menu and choose your preference.
    ![Tab size preference button](/assets/images/help/settings/tab-size-preference.png )

content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md

@@ -17,8 +17,12 @@ shortTitle: Deploy keys
 ---
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+3. In the "Security" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} Deploy keys**.
+{% else %}
 3. In the left sidebar, click **Deploy keys**.
 ![Deploy keys setting](/assets/images/help/settings/settings-sidebar-deploy-keys.png)
+{% endif %}
 4. On the Deploy keys page, take note of the deploy keys associated with your account. For those that you don't recognize, or that are out-of-date, click **Delete**. If there are valid deploy keys you'd like to keep, click **Approve**.
 	![Deploy key list](/assets/images/help/settings/settings-deploy-key-review.png)
 

content/communities/moderating-comments-and-conversations/limiting-interactions-for-your-user-account.md

@@ -27,7 +27,6 @@ You can also block users. For more information, see "[Blocking a user from your
 ## Limiting interactions for your user account
 
 {% data reusables.user_settings.access_settings %}
-1. In your user settings sidebar, under "Moderation settings", click **Interaction limits**.
-  !["Interaction limits" tab in the user settings sidebar](/assets/images/help/settings/settings-sidebar-interaction-limits.png)
+1. In the "Access" section of the sidebar, select **{% octicon "report" aria-label="The report icon" %} Moderation** then click **Interaction limits**.
 {% data reusables.community.set-interaction-limit %}
   ![Temporary interaction limit options](/assets/images/help/settings/user-account-temporary-interaction-limits-options.png)

content/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages.md

@@ -23,8 +23,7 @@ It's also possible to verify a domain for your organization{% ifversion ghec %}
 ## Verifying a domain for your user site
 
 {% data reusables.user_settings.access_settings %}
-1. In the left sidebar, click **Pages**.
-![Pages option in the settings menu](/assets/images/help/settings/user-settings-pages.png)
+1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "browser" aria-label="The pages icon" %} Pages**.
 {% data reusables.pages.settings-verify-domain-setup %}
 1. Wait for your DNS configuration to change, this may be immediate or take up to 24 hours. You can confirm the change to your DNS configuration by running the `dig` command on the command line. In the command below, replace `USERNAME` with your username and `example.com` with the domain you're verifying. If your DNS configuration has updated, you should see your new TXT record in the output.
   ```
@@ -38,8 +37,7 @@ Organization owners can verify custom domains for their organization.
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-1. In the left sidebar, click **Pages**.
-![Pages option in the settings menu](/assets/images/help/settings/org-settings-pages.png)
+1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "browser" aria-label="The browser icon" %} Pages**.
 {% data reusables.pages.settings-verify-domain-setup %}
 1. Wait for your DNS configuration to change, this may be immediate or take up to 24 hours. You can confirm the change to your DNS configuration by running the `dig` command on the command line. In the command below, replace `ORGANIZATION` with the name of your organization and `example.com` with the domain you're verifying. If your DNS configuration has updated, you should see your new TXT record in the output.
   ```

data/reusables/organizations/billing-settings.md

@@ -1,4 +1,4 @@
 {% data reusables.user_settings.access_settings %}
-2. In the settings sidebar, click **{% octicon "organization" aria-label="The organization icon" %} Organizations**.
+1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-label="The organization icon" %} Organizations**.
 {% data reusables.profile.org_settings %}
-1. If you're an organization owner, in the left sidebar, click **{% octicon "credit-card" aria-label="The credit card icon" %} Billing and plans**.
+1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit-card icon" %} Billing and plans**.

data/reusables/organizations/oauth_app_access.md

@@ -1,4 +1 @@
-{% ifversion fpt or ghec %}
-  1. In the Settings sidebar, click **Third-party access**.
-  ![{% data variables.product.prodname_oauth_app %} access tab in the left sidebar](/assets/images/help/settings/settings-sidebar-third-party-access.png)
-{% endif %}
+1. In the "Integrations" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} Third-party access**.

data/reusables/organizations/teams_sidebar.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Access" section of the sidebar, click **{% octicon "comment-discussion" aria-label="The comment-discussion icon" %} Team discussions**.
+{% else %}
 1. In the Settings sidebar, click **Teams**.
   ![Teams tab in the organization settings sidebar](/assets/images/help/settings/settings-sidebar-team-settings.png)
+{% endif %}

data/reusables/repositories/sidebar-notifications.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Integrations" section of the sidebar, click **{% octicon "mail" aria-label="The mail icon" %} Email notifications**.
+{% else %}
 1. Click **Notifications**.
 ![Notifications button in sidebar](/assets/images/help/settings/notifications_menu.png)
+{% endif %}

data/reusables/user-settings/oauth_apps.md

@@ -1,2 +1,2 @@
-1. In the left sidebar, click **OAuth Apps**.
+1. In the left sidebar, click **{% data variables.product.prodname_oauth_apps %}**.
 ![OAuth Apps section](/assets/images/help/settings/developer-settings-oauth-apps.png)

data/reusables/user_settings/access_applications.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Integrations" section of the sidebar, click **{% octicon "apps" aria-label="The apps icon" %} Applications**.
+{% else %}
 1. In the left sidebar, click **Applications**.
 ![Applications tab](/assets/images/help/settings/settings-applications.png)
+{% endif %}

data/reusables/user_settings/accessibility_settings.md

@@ -1,2 +1 @@
-1. In the navigation on the left hand side, click the **Accessibility** link.
-![Screenshot of the user settings navigation. The Accessibility link is highlighted.](/assets/images/help/settings/accessibility-tab.png)
+1. In the left sidebar, click **{% octicon "accessibility" aria-label="The accessibility icon" %} Accessibility**.

data/reusables/user_settings/account_settings.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-next %}
+1. In the left sidebar, click **{% octicon "gear" aria-label="The gear icon" %} Account**.
+{% else %}
 1. In the left sidebar, click **Account**.
 ![Account settings menu option](/assets/images/help/settings/settings-sidebar-account-settings.png)
+{% endif %}

data/reusables/user_settings/appearance-settings.md

@@ -1,3 +1,7 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the left sidebar, click **{% octicon "paintbrush" aria-label="The paintbrush icon" %} Appearance**.
+{% else %}
 1. In the user settings sidebar, click **Appearance**.
 
-   !["Appearance" tab in user settings sidebar](/assets/images/help/settings/appearance-tab.png)
+   !["Appearance" tab in user settings sidebar](/assets/images/help/settings/appearance-tab.png)
+{% endif %}

data/reusables/user_settings/billing_plans.md

@@ -1,2 +1 @@
-1. In your user settings sidebar, click **Billing & plans**.
-![Billing & plans settings](/assets/images/help/settings/settings-sidebar-billing-plans.png)
+1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit-card icon" %} Billing and plans**.

data/reusables/user_settings/blocked_users.md

@@ -1,2 +1 @@
-1. In your user settings sidebar, click **Blocked users** under **Moderation settings**.
-![Blocked users tab](/assets/images/help/settings/settings-sidebar-blocked-users.png)
+1. In the "Access" section of the sidebar, select **{% octicon "report" aria-label="The report icon" %} Moderation** then click **Blocked users**.

data/reusables/user_settings/codespaces-tab.md

@@ -1,2 +1 @@
-1. In the left sidebar, click **Codespaces**.
-![Codespaces tab in the user settings sidebar](/assets/images/help/settings/codespaces-tab.png)
+1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "codespaces" aria-label="The codespaces icon" %} Codespaces**.

data/reusables/user_settings/developer_settings.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the left sidebar, click **{% octicon "code" aria-label="The code icon" %} Developer settings**.
+{% else %} 
 1. In the left sidebar, click **Developer settings**.
 ![Developer settings](/assets/images/help/settings/developer-settings.png)
+{% endif %}

data/reusables/user_settings/emails.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Access" section of the sidebar, click **{% octicon "mail" aria-label="The mail icon" %} Emails**.
+{% else %}
 1. In the left sidebar, click **Emails**.
 ![Emails tab](/assets/images/help/settings/settings-sidebar-emails.png)
+{% endif %}

data/reusables/user_settings/organizations.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-label="The organization icon" %} Organizations**.
+{% else %}
 1. In your user settings sidebar, click **Organizations**.
 ![User settings for organizations](/assets/images/help/settings/settings-user-orgs.png)
+{% endif %}

data/reusables/user_settings/repo-tab.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "repo" aria-label="The repo icon" %} Repositories**.
+{% else %}
 1. In the left sidebar, click **Repositories**.
   ![Repositories tab](/assets/images/help/settings/repos-tab.png)
+{% endif %}

data/reusables/user_settings/saved_replies.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "reply" aria-label="The reply icon" %} Saved replies**.
+{% else %}
 1. In the left sidebar, click **Saved replies**.
 ![Saved replies tab](/assets/images/help/settings/saved-replies-tab.png)
+{% endif %}

data/reusables/user_settings/security-analysis.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Code security and analysis**.
+{% else %}
 1. In the left sidebar, click **Security & analysis**.
 ![Security and analysis settings](/assets/images/help/settings/settings-sidebar-security-analysis.png)
+{% endif %}

data/reusables/user_settings/security.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Access" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Password and authentication**.
+{% else %}
 1. In the left sidebar, click **Account security**.
 ![User account security settings](/assets/images/help/settings/settings-sidebar-account-security.png)
+{% endif %}

data/reusables/user_settings/ssh.md

@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Access" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} SSH and GPG keys**.
+{% else %}
 1. In the user settings sidebar, click **SSH and GPG keys**.
 ![Authentication keys](/assets/images/help/settings/settings-sidebar-ssh-keys.png)
+{% endif %}