Merge branch 'main' into patch-1

Author: Sharra-writes

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md

@@ -149,7 +149,7 @@ If you select the "Busy" option, when people @mention your username, assign you
 
 ![Screenshot of a draft comment. "@octocat" is written in the text field, and "The Octocat (busy)" is suggested.](/assets/images/help/profile/username-with-limited-availability-text.png)
 
-1. In the top right corner of {% data variables.product.prodname_dotcom %}, select your profile photo, then click **{% octicon "smiley" aria-hidden="true" aria-label="smiley" %} Set status** or, if you already have a status set, click your current status.
+1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile picture, then click **{% octicon "smiley" aria-hidden="true" aria-label="smiley" %} Set status** or, if you already have a status set, click your current status.
 
    ![Screenshot of the dropdown menu under @octocat's profile picture. A smiley icon and "Set status" are outlined in dark orange.](/assets/images/help/profile/set-status-on-profile-global-nav-update.png)
 

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/setting-your-profile-to-private.md

@@ -29,7 +29,7 @@ When your profile is private, the following content is hidden from your profile
 * Your pronouns
 
 > [!NOTE]
-> When your profile is private, some optional fields are still publicly visible, such as the README, biography, and profile photo.
+> When your profile is private, some optional fields are still publicly visible, such as the README, biography, and profile picture.
 
 ## Changes to reporting on your activities
 

content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sharing-contributions-from-github-enterprise-server.md

@@ -40,7 +40,7 @@ To share contributions from {% data variables.product.prodname_ghe_server %}, vi
 {% elsif ghes %}
 
 1. Sign in to both your user account on {% data variables.product.prodname_ghe_cloud %} **and** your user account on {% data variables.product.prodname_ghe_cloud %} ({% data variables.product.prodname_dotcom_the_website %}{% ifversion ghecom-github-connect %} or {% data variables.enterprise.data_residency_site %}{% endif %}).
-1. On {% data variables.product.prodname_ghe_server %}, in the upper-right corner of any page, click your profile photo, then click **Settings**.
+1. On {% data variables.product.prodname_ghe_server %}, in the upper-right corner of any page, click your profile picture, then click **Settings**.
 
    ![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings-global-nav-update.png)
 

content/admin/backing-up-and-restoring-your-instance/backup-service-for-github-enterprise-server/configuring-the-backup-service.md

@@ -21,7 +21,7 @@ Before configuring the backup service, ensure you have:
 
 To ensure reliable and performant backups, your storage must meet the following requirements:
 
-* **Capacity:** Allocate at least five times the amount of storage used by your primary {% data variables.product.github %} appliance disk. This accounts for historical snapshots and future growth.
+* **Capacity:** Allocate at least five times the amount of storage used by your primary {% data variables.product.github %} appliance data disk. This accounts for historical snapshots and future growth.
 * **Filesystem support:** The backup service uses hard links for efficient storage, and your {% data variables.product.github %} instance uses symbolic links. The backup target must support both symbolic and hard links, and it must use a case-sensitive filesystem to prevent conflicts.
 
   You can test whether your filesystem supports hardlinking symbolic links by running:

content/admin/configuring-settings/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md

@@ -23,6 +23,9 @@ redirect_from:
 
 By default, authorized users can access your enterprise's resources from any IP address. You can restrict access to your enterprise's private resources by configuring a list that allows or denies access from specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
 
+> [!NOTE]
+> If your enterprise uses {% data variables.product.prodname_emus %}, enabling the IP allow list does not restrict user provisioning actions performed through SAML/SCIM, OpenID Connect (OIDC) with Entra ID, or via REST API endpoints. For more information, see [AUTOTITLE](/admin/managing-iam/provisioning-user-accounts-with-scim).
+
 If your enterprise uses {% data variables.product.prodname_emus %} with Microsoft Entra ID (previously known as Azure AD) and OIDC, you can choose whether to use {% data variables.product.company_short %}'s IP allow list feature or to use the allow list restrictions for your identity provider (IdP). If your enterprise does not use {% data variables.product.prodname_emus %} with Azure and OIDC, you can use {% data variables.product.company_short %}'s allow list feature.
 
 {% data reusables.identity-and-permissions.ip-allow-lists-which-resources-are-protected %}
@@ -56,8 +59,8 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.security %}
-1. If you're using {% data variables.product.prodname_emus %} with OIDC, under "IP allow list", select the **IP allow list configuration** dropdown menu and click **GitHub**.
-1. Under "IP allow list", select **Enable IP allow list**.
+1. If you're using {% data variables.product.prodname_emus %} with OIDC, under "IP allow list," select the **IP allow list configuration** dropdown menu and click **GitHub**.
+1. Under "IP allow list," select **Enable IP allow list**.
 1. Click **Save**.
 
 ### Adding an allowed IP address
@@ -119,7 +122,7 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.security %}
-1. Under "IP allow list", select the **IP allow list configuration** dropdown menu and click **Identity Provider**.
+1. Under "IP allow list," select the **IP allow list configuration** dropdown menu and click **Identity Provider**.
 1. Optionally, to allow installed {% data variables.product.company_short %} and {% data variables.product.prodname_oauth_apps %} to access your enterprise from any IP address, select **Skip IdP check for applications**.
 1. Click **Save**.
 

content/apps/using-github-apps/authorizing-github-apps.md

@@ -40,7 +40,7 @@ Once you authorize a {% data variables.product.prodname_github_app %}, the app c
 
 The {% data variables.product.prodname_github_app %} can only do things that both you and the app have permission to do. For example, if you have write access to a repository but the {% data variables.product.prodname_github_app %} only has read access, then the app can only read the contents of the repository even when it is acting on your behalf. Similarly, if you have access to repositories `A` and `B`, and the {% data variables.product.prodname_github_app %} has access to repositories `B` and `C`, then the app can only access repository `B` when acting on your behalf. For more information about the permissions granted to a {% data variables.product.prodname_github_app %}, see [Difference between authorization and installation](#difference-between-authorization-and-installation).
 
-When an app acts on your behalf, it will attribute the activity to you in conjunction with the app. For example, if the app posts a comment on your behalf, the {% data variables.product.company_short %} UI will show your avatar photo along with the app's identicon badge as the author of the issue.
+When an app acts on your behalf, it will attribute the activity to you in conjunction with the app. For example, if the app posts a comment on your behalf, the {% data variables.product.company_short %} UI will show your profile picture along with the app's identicon badge as the author of the issue.
 
 ![Screenshot of a comment that has a user avatar with an overlaid app identicon badge. The avatar is highlighted with an orange outline.](/assets/images/help/apps/github-app-acting-on-your-behalf.png)
 

content/apps/using-github-apps/reviewing-and-modifying-installed-github-apps.md

@@ -21,21 +21,21 @@ In addition to reviewing {% data variables.product.prodname_github_apps %} that
 ## Navigating to the {% data variables.product.prodname_github_app %} you want to review or modify
 
 {% ifversion enterprise-installed-apps %}* For a {% data variables.product.prodname_github_app %} installed on an enterprise:
-   1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your enterprises**.
+   1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile picture, then click **Your enterprises**.
    1. Next to your enterprise name, click **Settings**.
    1. In the top navigation bar, click **Settings**.
    1. In the side bar, click **GitHub Apps**. A list of the {% data variables.product.prodname_github_apps %} owned by your enterprise will be displayed.
    1. Switch to the **Installed Apps** tab to see a list of the apps installed on your enterprise.
    1. Next to the {% data variables.product.prodname_github_app %} you want to review or modify, click **Configure**.{% endif %}
 
 * For a {% data variables.product.prodname_github_app %} installed on an organization:
-   1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your organizations**.
+   1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile picture, then click **Your organizations**.
    1. Next to your organization name, click **Settings**.
    1. In the side bar, under "Third-party Access," click **GitHub Apps**. A list of the {% data variables.product.prodname_github_apps %} installed on your organization will be displayed.
    1. Next to the {% data variables.product.prodname_github_app %} you want to review or modify, click **Configure**.
 
 * For a {% data variables.product.prodname_github_app %} installed on your personal account:
-   1. In the upper-right corner of any page, click your profile photo, then click **Settings**.
+   1. In the upper-right corner of any page, click your profile picture, then click **Settings**.
    1. Under "Integrations," click **Applications**.
    1. Click **Installed GitHub Apps**. A list of the {% data variables.product.prodname_github_apps %} installed on your personal account will be displayed.
    1. Next to the {% data variables.product.prodname_github_app %} you want to review or modify, click **Configure**.

content/authentication/authenticating-with-single-sign-on/authenticating-with-a-managed-user-account.md

@@ -3,6 +3,8 @@ title: 'Authenticating with {% data variables.product.prodname_emus %}'
 shortTitle: Authenticate as a managed user
 intro: 'Learn how to authenticate to access an {% data variables.enterprise.prodname_emu_enterprise %} on {% data variables.product.prodname_dotcom %}.'
 product: '{% data reusables.gated-features.emus %}'
+redirect_from:
+  - /authentication/authenticating-with-saml-single-sign-on/authenticating-with-a-managed-user-account
 versions:
   ghec: '*'
 topics:

content/authentication/keeping-your-account-and-data-secure/switching-between-accounts.md

@@ -22,7 +22,7 @@ Your SSO sessions will persist when you switch away from an account and return.
 
 When you add a new account to the account switcher, both the account you are currently signed in to and the account you have added will become available in the account switcher. You will be signed in to the new account immediately.
 
-1. In the upper-right corner of any page, click your profile photo to open the menu.
+1. In the upper-right corner of any page, click your profile picture to open the menu.
 1. If you have previously added an account to the account switcher, click **{% octicon "arrow-switch" aria-hidden="true" aria-label="arrow-switch" %} Switch account** to open the menu.
 1. In the menu, click **{% octicon "person-add" aria-hidden="true" aria-label="person-add" %} Add account**.
 1. Sign in to the account you want to add to the account switcher.
@@ -34,7 +34,7 @@ When you have added accounts to the account switcher, you can quickly change bet
 > [!NOTE]
 > The "{% octicon "arrow-switch" aria-hidden="true" aria-label="arrow-switch" %} Switch account" option will not be available if all sessions have expired. You can instead click on **{% octicon "arrow-switch" aria-hidden="true" aria-label="arrow-switch" %} See all accounts** in the menu to reauthenticate.
 
-1. In the upper-right corner of any page, click your profile photo to open the menu.
+1. In the upper-right corner of any page, click your profile picture to open the menu.
 1. In the menu, click **{% octicon "arrow-switch" aria-hidden="true" aria-label="arrow-switch" %} Switch account**.
 1. In the submenu, click on the account that you want to switch to.
 
@@ -44,7 +44,7 @@ When you have added accounts to the account switcher, you can quickly change bet
 
 You can either remove individual accounts or all accounts from the account switcher.
 
-1. In the upper-right corner of any page, click your profile photo to open the menu.
+1. In the upper-right corner of any page, click your profile picture to open the menu.
 1. In the menu, click **Sign out**.
 1. Choose which accounts to sign out of and remove from the account switcher.
     * To remove the account you are currently signed in to from the account switcher and sign out, click **Sign out** next to your username.

content/billing/managing-your-billing/about-the-new-billing-platform.md

@@ -80,7 +80,7 @@ With the new billing platform, you can:
 
 {% ifversion fpt %}
 
-1. In the upper-right corner of any page on {% data variables.product.prodname_dotcom %}, select your profile photo.
+1. In the upper-right corner of any page on {% data variables.product.prodname_dotcom %}, click your profile picture.
 
    * For **personal accounts**, click **Settings**.
    * For **organizations**, click **Your organizations**, then next to the organization, click **Settings**.