Merge pull request #5739 from github/lee-dohm-old-fixes-new-branch

New companion to 5538

Author: lee-dohm

assets/images/help/organizations/settings-button.png

@@ -57,7 +57,7 @@ In your organization's repositories, blocked users also cannot:
 1. To block an organization member, first [remove the user](/articles/removing-a-member-from-your-organization) from the organization.
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.block_users %}
 6. Under "Block a user", type the username of the user you'd like to block.
 ![Username field](/assets/images/help/organizations/org-block-username-field.png)

assets/images/help/profile/your-organizations.png

@@ -31,7 +31,7 @@ If you selected a specific amount of time to block the user, they will be automa
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.block_users %}
 5. Under "Blocked users", next to the user you'd like to unblock, click **Unblock**.
 ![Unblock user button](/assets/images/help/organizations/org-unblock-user-button.png)

content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md

@@ -12,7 +12,7 @@ topics:
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.block_users %}
 5. Under "Blocked users", review the list of users who are blocked from your organization.
   ![List of blocked users](/assets/images/help/settings/list-of-blocked-users-for-org.png)

content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md

@@ -24,13 +24,13 @@ Members of the organization are not affected by any of the limit types.
 
 When you enable organization-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)."
 
-Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization)." 
+Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization)."
 
 ### Limiting interactions in your organization
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 1. In the organization settings sidebar, click **Moderation settings**.
   !["Moderation settings" in the organization settings sidebar](/assets/images/help/organizations/org-settings-moderation-settings.png)
 1. Under "Moderation settings", click **Interaction limits**.

content/communities/maintaining-your-safety-on-github/viewing-users-who-are-blocked-from-your-organization.md

@@ -13,16 +13,16 @@ Once your organization has been verified, you can publish paid plans for your ap
 
 To offer paid plans for your app, the app must be owned by an organization and you must have owner permissions in the organization. If your app is currently owned by a user account, you'll need to transfer the ownership of the app to an organization. For more information, see "[Transferring ownership of a GitHub App](/developers/apps/transferring-ownership-of-a-github-app)" or "[Transferring ownership of an OAuth App](/developers/apps/transferring-ownership-of-an-oauth-app)."
 
-### Requesting publisher verification 
+### Requesting publisher verification
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 1. In the left sidebar, click **Developer settings**.
   ![Developer settings option in the organization settings sidebar](/assets/images/marketplace/developer-settings-in-org-settings.png)
 1. Under "Developer settings", click **Publisher Verification**.
   ![Publisher verification option in the organization settings sidebar](/assets/images/marketplace/publisher-verification-settings-option.png)
-1. Under "Publisher Verification", complete the information in the checklist: 
+1. Under "Publisher Verification", complete the information in the checklist:
    - Ensure that your basic profile information is present and accurate. Also, make sure that you've included the best email address for support and updates from {% data variables.product.company_short %}.
    - Ensure that Two-factor authentication is enabled for your organization. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)."
    - Submit a verified domain and ensure that a "Verified" badge displays on your organization's profile page. For related information, see "[Verifying your organization's domain](/organizations/managing-organization-settings/verifying-your-organizations-domain)."

content/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization.md

@@ -33,7 +33,7 @@ Restoring a repository will not restore release attachments or team permissions.
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.deleted-repos %}
 {% data reusables.user_settings.restore-repo %}
 {% data reusables.user_settings.restore-confirmation %}

content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md

@@ -39,9 +39,9 @@ When you enable access and security for a repository owned by your organization,
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.click-codespaces %}
-5. To approve of the [pre-release program terms of service](/github/site-policy/github-pre-release-program) on behalf of your organization and enable {% data variables.product.prodname_codespaces %}, under "User permissions", select **Selected users**, then type the username for each person to grant access to. Repeat for all users who you want to have access to your organization's codespaces.  
+5. To approve of the [pre-release program terms of service](/github/site-policy/github-pre-release-program) on behalf of your organization and enable {% data variables.product.prodname_codespaces %}, under "User permissions", select **Selected users**, then type the username for each person to grant access to. Repeat for all users who you want to have access to your organization's codespaces.
   ![Radio button for "Selected users"](/assets/images/help/organizations/select-selected-users-radio-button.png)
 1. Under "Access and security", select the setting you want for your organization.
   ![Radio buttons to manage trusted repositories](/assets/images/help/settings/codespaces-access-and-security-radio-buttons.png)

content/github/administering-a-repository/restoring-a-deleted-repository.md

@@ -58,7 +58,7 @@ Downgrading to {% data variables.product.prodname_free_team %} for organizations
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.billing_plans %}
 5. Under "{% data variables.product.prodname_ghe_cloud %} Free Trial", click **Buy Enterprise** or **Downgrade to Team**.
   ![Buy Enterprise and Downgrade to Team buttons](/assets/images/help/organizations/finish-trial-buttons.png)