diff --git a/content/apps/github-marketplace/selling-your-app-on-github-marketplace/pricing-plans-for-github-marketplace-apps.md b/content/apps/github-marketplace/selling-your-app-on-github-marketplace/pricing-plans-for-github-marketplace-apps.md index 9d0258b9e2..88709a5ef3 100644 --- a/content/apps/github-marketplace/selling-your-app-on-github-marketplace/pricing-plans-for-github-marketplace-apps.md +++ b/content/apps/github-marketplace/selling-your-app-on-github-marketplace/pricing-plans-for-github-marketplace-apps.md @@ -19,7 +19,7 @@ shortTitle: Pricing plans for apps {% data variables.product.prodname_marketplace %} pricing plans can be free, flat rate, or per-unit. Prices are set, displayed, and processed in US dollars. Paid plans are restricted to apps published by verified publishers. For more information about becoming a verified publisher, see "[AUTOTITLE](/apps/github-marketplace/github-marketplace-overview/applying-for-publisher-verification-for-your-organization)." -Customers purchase your app using a payment method attached to their account on {% data variables.location.product_location %}, without having to leave {% data variables.product.prodname_dotcom_the_website %}. You don't have to write code to perform billing transactions, but you will have to handle events from the {% data variables.product.prodname_marketplace %} API. For more information, see "[AUTOTITLE](/apps/github-marketplace/using-the-github-marketplace-api-in-your-app)." +Customers purchase your app using a payment method attached to their account on {% data variables.product.prodname_dotcom %}. You don't have to write code to perform billing transactions, but you will have to handle events from the {% data variables.product.prodname_marketplace %} API. For more information, see "[AUTOTITLE](/apps/github-marketplace/using-the-github-marketplace-api-in-your-app)." If the app you're listing on {% data variables.product.prodname_marketplace %} has multiple plan options, you can set up corresponding pricing plans. For example, if your app has two plan options, an open source plan and a pro plan, you can set up a free pricing plan for your open source plan and a flat pricing plan for your pro plan. Each {% data variables.product.prodname_marketplace %} listing must have an annual and a monthly price for every plan that's listed. diff --git a/content/apps/using-github-apps/reviewing-and-modifying-installed-github-apps.md b/content/apps/using-github-apps/reviewing-and-modifying-installed-github-apps.md index c72ce0e35a..069bdc3fbd 100644 --- a/content/apps/using-github-apps/reviewing-and-modifying-installed-github-apps.md +++ b/content/apps/using-github-apps/reviewing-and-modifying-installed-github-apps.md @@ -21,7 +21,7 @@ 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 - For a {% data variables.product.prodname_github_app %} installed on an organization: - 1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Your organizations**. + 1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, 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**. diff --git a/content/authentication/authenticating-with-a-passkey/index.md b/content/authentication/authenticating-with-a-passkey/index.md index e5980512f7..50822db84e 100644 --- a/content/authentication/authenticating-with-a-passkey/index.md +++ b/content/authentication/authenticating-with-a-passkey/index.md @@ -1,6 +1,6 @@ --- title: Authenticating with a passkey -intro: 'You can add passkeys to your personal account on {% data variables.product.prodname_dotcom_the_website %} so that you can sign in safely and easily, without requiring a password and two-factor authentication. You can also use passkeys when performing a sensitive action (sudo mode), or to authenticate a password reset.' +intro: 'You can add passkeys to your account so that you can sign in safely and easily, without requiring a password and two-factor authentication. You can also use passkeys when performing a sensitive action (sudo mode), or to authenticate a password reset.' versions: feature: passkeys children: diff --git a/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md b/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md index 022c6c3de5..7b6e602a67 100644 --- a/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md +++ b/data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md @@ -1,5 +1,5 @@ -1. Navigate to {% data variables.product.prodname_dotcom_the_website %}. +1. Navigate to {% data variables.product.prodname_ghe_cloud %}. -1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**. +1. In the top-right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your enterprises**. 1. In the list of enterprises, click the enterprise you want to view. diff --git a/data/reusables/enterprise-accounts/access-enterprise.md b/data/reusables/enterprise-accounts/access-enterprise.md index 281297cf90..72a76cb9c4 100644 --- a/data/reusables/enterprise-accounts/access-enterprise.md +++ b/data/reusables/enterprise-accounts/access-enterprise.md @@ -1,5 +1,5 @@ {%- ifversion ghec %} -1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**. +1. In the top-right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your enterprises**. 1. In the list of enterprises, click the enterprise you want to view. diff --git a/data/reusables/enterprise-accounts/emu-only-emails-within-the-enterprise-can-conflict.md b/data/reusables/enterprise-accounts/emu-only-emails-within-the-enterprise-can-conflict.md index fc9b61015f..b4b9d0fb14 100644 --- a/data/reusables/enterprise-accounts/emu-only-emails-within-the-enterprise-can-conflict.md +++ b/data/reusables/enterprise-accounts/emu-only-emails-within-the-enterprise-can-conflict.md @@ -1,5 +1,5 @@ {% note %} -**Note:** Because {% data variables.product.prodname_dotcom %} adds an underscore and short code to the normalized identifier provided by your IdP when creating each username, conflicts can only occur within each {% data variables.enterprise.prodname_emu_enterprise %}. {% data variables.enterprise.prodname_managed_users_caps %} can share IdP identifiers or email addresses with other user accounts on {% data variables.product.prodname_dotcom_the_website %} that are outside the enterprise. +**Note:** Because {% data variables.product.prodname_dotcom %} adds an underscore and short code to the normalized identifier provided by your IdP when creating each username, conflicts can only occur within each {% data variables.enterprise.prodname_emu_enterprise %}. {% data variables.enterprise.prodname_managed_users_caps %} can share IdP identifiers or email addresses with other user accounts on {% data variables.product.prodname_dotcom %} that are outside the enterprise. {% endnote %} diff --git a/data/reusables/enterprise-licensing/verified-domains-license-sync.md b/data/reusables/enterprise-licensing/verified-domains-license-sync.md index b318d3f5ae..57f2185c4a 100644 --- a/data/reusables/enterprise-licensing/verified-domains-license-sync.md +++ b/data/reusables/enterprise-licensing/verified-domains-license-sync.md @@ -1,5 +1 @@ -{% note %} - -**Note:** If you synchronize license usage and your enterprise account on {% data variables.product.prodname_dotcom_the_website %} does not use {% data variables.product.prodname_emus %}, we highly recommend enabling verified domains for your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. For privacy reasons, your consumed license report only includes the email address associated with a user account on {% data variables.product.prodname_dotcom_the_website %} if the address is hosted by a verified domain. If one person is erroneously consuming multiple licenses, having access to the email address that is being used for deduplication makes troubleshooting much easier. For more information, see {% ifversion ghec or ghes %}"[AUTOTITLE](/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)" and {% endif %}"[AUTOTITLE](/enterprise-cloud@latest/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} - -{% endnote %} +> [!NOTE] To make troubleshooting easier, if you synchronize license usage and do not use {% data variables.product.prodname_emus %}, we highly recommend enabling verified domains for your enterprise account on {% data variables.product.prodname_ghe_cloud %}. See "[AUTOTITLE](/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} diff --git a/data/reusables/enterprise-licensing/view-consumed-licenses.md b/data/reusables/enterprise-licensing/view-consumed-licenses.md index 7c8be3228f..8e761a485b 100644 --- a/data/reusables/enterprise-licensing/view-consumed-licenses.md +++ b/data/reusables/enterprise-licensing/view-consumed-licenses.md @@ -1 +1 @@ -After you synchronize license usage, you can see a report of consumed licenses across all your environments in the enterprise settings on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)." +After you synchronize license usage, you can see a report of consumed licenses across all your environments in the enterprise settings on {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)." diff --git a/data/reusables/enterprise-managed/assigning-users.md b/data/reusables/enterprise-managed/assigning-users.md index 844865b27a..8b61074a4a 100644 --- a/data/reusables/enterprise-managed/assigning-users.md +++ b/data/reusables/enterprise-managed/assigning-users.md @@ -1 +1 @@ -After you have configured authentication and provisioning, you will be able to provision new users on {% data variables.product.prodname_dotcom_the_website %} by assigning users or groups to the {% data variables.product.prodname_emu_idp_application %} application. +After you have configured authentication and provisioning, you will be able to provision new users on {% data variables.product.prodname_dotcom %} by assigning users or groups to the {% data variables.product.prodname_emu_idp_application %} application. diff --git a/data/reusables/enterprise-migration-tool/configuring-ip-allow-lists.md b/data/reusables/enterprise-migration-tool/configuring-ip-allow-lists.md index a4b00ff498..620ae52398 100644 --- a/data/reusables/enterprise-migration-tool/configuring-ip-allow-lists.md +++ b/data/reusables/enterprise-migration-tool/configuring-ip-allow-lists.md @@ -1,6 +1,6 @@ -If the source or destination of your migration uses an IP allow list (either {% data variables.product.company_short %}'s IP allow list feature or your identity provider's (IdP) IP allow list restrictions, such as Azure CAP), you need to configure IP allow lists on {% data variables.product.prodname_dotcom_the_website %}. +If the source or destination of your migration uses an IP allow list (either {% data variables.product.company_short %}'s IP allow list feature or your identity provider's (IdP) IP allow list restrictions, such as Azure CAP), you need to configure IP allow lists on {% data variables.product.prodname_dotcom %}. - If you use {% data variables.product.company_short %}'s IP allow list feature, you must add the {% data variables.product.prodname_dotcom %} IP ranges below to the allow list for the source and/or destination organizations. -- If you use your IdP's IP allow list to restrict access to your enterprise on {% data variables.product.prodname_dotcom_the_website %}, you should disable these restrictions in your enterprise account settings until after your migration is complete. +- If you use your IdP's IP allow list to restrict access to your enterprise on {% data variables.product.prodname_dotcom %}, you should disable these restrictions in your enterprise account settings until after your migration is complete. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization)" and "[AUTOTITLE](/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list)." diff --git a/data/reusables/gated-features/secret-scanning.md b/data/reusables/gated-features/secret-scanning.md index c252367745..cae5fed2d7 100644 --- a/data/reusables/gated-features/secret-scanning.md +++ b/data/reusables/gated-features/secret-scanning.md @@ -1,5 +1,5 @@ {%- ifversion fpt or ghec %} -{% data variables.secret-scanning.partner_alerts_caps %} runs automatically on public repositories and public npm packages to notify service providers about leaked secrets on {% data variables.product.prodname_dotcom_the_website %}. +{% data variables.secret-scanning.partner_alerts_caps %} runs automatically on public repositories and public npm packages to notify service providers about leaked secrets on {% data variables.product.prodname_dotcom %}. {% data variables.secret-scanning.user_alerts_caps %} are available for {% ifversion ghec %}user-owned {% endif %}public repositories for free. Organizations using {% data variables.product.prodname_ghe_cloud %} with a license for {% data variables.product.prodname_GH_advanced_security %} can also enable {% data variables.secret-scanning.user_alerts %} on their private and internal repositories. {% data reusables.secret-scanning.secret-scanning-user-owned-repos-beta %} diff --git a/data/reusables/github-connect/authorize-connection.md b/data/reusables/github-connect/authorize-connection.md index c7b94f48f5..50a4ed71f2 100644 --- a/data/reusables/github-connect/authorize-connection.md +++ b/data/reusables/github-connect/authorize-connection.md @@ -1 +1 @@ -1. Review the resources that {% data variables.product.product_name %} will access from your {% data variables.product.prodname_dotcom_the_website %} account, then click **Authorize**. +1. Review the resources that {% data variables.product.product_name %} will access from your {% data variables.product.prodname_dotcom %} account, then click **Authorize**. diff --git a/data/reusables/package_registry/package-settings-from-user-level.md b/data/reusables/package_registry/package-settings-from-user-level.md index aa47c7b2ec..06cc5155fc 100644 --- a/data/reusables/package_registry/package-settings-from-user-level.md +++ b/data/reusables/package_registry/package-settings-from-user-level.md @@ -1,5 +1,5 @@ 1. On {% data variables.product.prodname_dotcom %}, navigate to the main page of your personal account. -1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Your profile**. +1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your profile**. {% ifversion global-nav-update %} diff --git a/data/reusables/passkeys/about-passkeys.md b/data/reusables/passkeys/about-passkeys.md index fc0745bcba..b314834225 100644 --- a/data/reusables/passkeys/about-passkeys.md +++ b/data/reusables/passkeys/about-passkeys.md @@ -1 +1 @@ -Passkeys allow you to sign in securely to {% data variables.product.prodname_dotcom_the_website %}, without having to input your password. If you use two-factor authentication (2FA), passkeys satisfy both password and 2FA requirements, so you can complete your sign in with a single step. You can also use passkeys for sudo mode and resetting your password. +Passkeys allow you to sign in securely to {% data variables.product.prodname_dotcom %}, without having to input your password. If you use two-factor authentication (2FA), passkeys satisfy both password and 2FA requirements, so you can complete your sign in with a single step. You can also use passkeys for sudo mode and resetting your password. diff --git a/data/reusables/profile/access_org.md b/data/reusables/profile/access_org.md index d7dff08b07..b3163294d7 100644 --- a/data/reusables/profile/access_org.md +++ b/data/reusables/profile/access_org.md @@ -1,4 +1,4 @@ -1. In the upper-right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, select your profile photo, then click{% ifversion fpt or ghec %} {% octicon "organization" aria-hidden="true" %}{% endif %} **Your organizations**. +1. In the upper-right corner of {% data variables.product.prodname_dotcom %}, select your profile photo, then click{% ifversion fpt or ghec %} {% octicon "organization" aria-hidden="true" %}{% endif %} **Your organizations**. {% ifversion global-nav-update %} diff --git a/data/reusables/profile/access_profile.md b/data/reusables/profile/access_profile.md index 5cbbd19316..8706cf3903 100644 --- a/data/reusables/profile/access_profile.md +++ b/data/reusables/profile/access_profile.md @@ -1,4 +1,4 @@ -1. In the top right corner of {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_name %}{% endif %}, click your profile photo, then click **Your profile**. +1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your profile**. {% ifversion global-nav-update %} diff --git a/data/reusables/saml/authentication-loop.md b/data/reusables/saml/authentication-loop.md index 14d6a364d1..27e8226931 100644 --- a/data/reusables/saml/authentication-loop.md +++ b/data/reusables/saml/authentication-loop.md @@ -2,6 +2,6 @@ If users are repeatedly redirected to the SAML authentication prompt in a loop, you may need to increase the SAML session duration in your IdP settings. -The `SessionNotOnOrAfter` value sent in a SAML response determines when a user will be redirected back to the IdP to authenticate. If a SAML session duration is configured for 2 hours or less, {% data variables.product.prodname_dotcom_the_website %} will refresh a SAML session 5 minutes before it expires. If your session duration is configured as 5 minutes or less, users can get stuck in a SAML authentication loop. +The `SessionNotOnOrAfter` value sent in a SAML response determines when a user will be redirected back to the IdP to authenticate. If a SAML session duration is configured for 2 hours or less, {% data variables.product.prodname_dotcom %} will refresh a SAML session 5 minutes before it expires. If your session duration is configured as 5 minutes or less, users can get stuck in a SAML authentication loop. To fix this problem, we recommend configuring a minimum SAML session duration of 4 hours. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference#session-duration-and-timeout)." diff --git a/data/reusables/saml/you-must-periodically-authenticate.md b/data/reusables/saml/you-must-periodically-authenticate.md index 0a9fb4ffce..5aa3092a7c 100644 --- a/data/reusables/saml/you-must-periodically-authenticate.md +++ b/data/reusables/saml/you-must-periodically-authenticate.md @@ -1 +1 @@ -You must periodically authenticate with your SAML IdP to authenticate and gain access to {% ifversion fpt or ghec %}the organization's resources on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. The duration of this login period is specified by your IdP and is generally 24 hours. This periodic login requirement limits the length of access and requires you to re-identify yourself to continue. {% ifversion fpt or ghec %}You can view and manage your active SAML sessions in your security settings. For more information, see "[AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/viewing-and-managing-your-active-saml-sessions)."{% endif %} +You must periodically authenticate with your SAML IdP to authenticate and gain access to the organization's resources on {% data variables.product.prodname_dotcom %}. The duration of this login period is specified by your IdP and is generally 24 hours. This periodic login requirement limits the length of access and requires you to re-identify yourself to continue. You can view and manage your active SAML sessions in your security settings. For more information, see "[AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/viewing-and-managing-your-active-saml-sessions)." diff --git a/data/reusables/scim/after-you-configure-saml.md b/data/reusables/scim/after-you-configure-saml.md index 9188e57d54..3578b52e67 100644 --- a/data/reusables/scim/after-you-configure-saml.md +++ b/data/reusables/scim/after-you-configure-saml.md @@ -1,3 +1,3 @@ By default, your IdP does not communicate with {% data variables.product.product_name %} automatically when you assign or unassign the application. {% data variables.product.product_name %} {% ifversion fpt or ghec %}provisions access to your resources on {% else %}creates a user account {% endif %}using SAML Just-in-Time (JIT) provisioning the first time someone navigates to {% ifversion fpt or ghec %}your resources on {% endif %} {% data variables.product.product_name %} and signs in by authenticating through your IdP. You may need to manually notify users when you grant access to {% data variables.product.product_name %}, and you must manually {% ifversion fpt or ghec %}deprovision access {% else %}deactivate the user account on {% endif %}{% data variables.product.product_name %} during offboarding. -Alternatively, instead of SAML JIT provisioning, you can use SCIM to {% ifversion ghec %}provision or deprovision{% elsif scim-for-ghes %}create or suspend{% endif %} {% ifversion fpt or ghec %}access to organizations owned by your enterprise on {% data variables.product.prodname_dotcom_the_website %} {% else %}user accounts and grant or deny access to {% data variables.location.product_location %} {% endif %}automatically after you assign or unassign the application on your IdP.{% ifversion scim-for-ghes %} SCIM for {% data variables.product.product_name %} is currently in private beta and is subject to change.{% endif %} +Alternatively, instead of SAML JIT provisioning, you can use SCIM to {% ifversion ghec %}provision or deprovision{% elsif scim-for-ghes %}create or suspend{% endif %} {% ifversion fpt or ghec %}access to organizations owned by your enterprise on {% data variables.product.prodname_dotcom %} {% else %}user accounts and grant or deny access to {% data variables.location.product_location %} {% endif %}automatically after you assign or unassign the application on your IdP.{% ifversion scim-for-ghes %} SCIM for {% data variables.product.product_name %} is currently in private beta and is subject to change.{% endif %} diff --git a/data/reusables/search/classic-search-code-search-note.md b/data/reusables/search/classic-search-code-search-note.md index 93e9da5652..7cbee4ea66 100644 --- a/data/reusables/search/classic-search-code-search-note.md +++ b/data/reusables/search/classic-search-code-search-note.md @@ -1 +1 @@ -This article refers to the classic {% data variables.product.prodname_dotcom %} search experience. If you are participating in the new code search and code view beta and have enabled the new functionality, the syntax for searching code and the {% data variables.product.prodname_dotcom_the_website %} search interface will differ. However, the search syntax for non-code search types will stay the same. +This article refers to the classic {% data variables.product.prodname_dotcom %} search experience. If you are participating in the new code search and code view beta and have enabled the new functionality, the syntax for searching code and the search interface will differ. However, the search syntax for non-code search types will stay the same. diff --git a/data/reusables/support/enterprise-comment-on-support-tickets.md b/data/reusables/support/enterprise-comment-on-support-tickets.md index fc7eb6d135..a21632b1d4 100644 --- a/data/reusables/support/enterprise-comment-on-support-tickets.md +++ b/data/reusables/support/enterprise-comment-on-support-tickets.md @@ -1,6 +1,6 @@ To comment on a ticket associated with your enterprise account that was opened by another user, one of two conditions must be met: - An email address associated with your {% data variables.product.prodname_dotcom %} account is copied on the ticket -- Your enterprise on {% data variables.product.prodname_dotcom_the_website %} has a verified domain and the person who opened the ticket selected their verified-domain email +- Your enterprise on {% data variables.product.prodname_ghe_cloud %} has a verified domain and the person who opened the ticket selected their verified-domain email For more information about verifying a domain, see "[AUTOTITLE](/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)" and "[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)."