Merge branch 'main' into repo-sync

data/glossaries/external.yml

@@ -211,7 +211,7 @@
 - term: email notifications
   description: Notifications sent to a user's email address.
 - term: enterprise account
-  description: Enterprise accounts allow you to centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations. {% data reusables.gated-features.enterprise-accounts %}
+  description: Enterprise accounts allow you to centrally manage policy and billing for multiple organizations. {% data reusables.gated-features.enterprise-accounts %}
 - term: Explorer
   description: >-
     An instance of GraphiQL, which is a "graphical interactive in-browser GraphQL

data/reusables/classroom/assignments-to-prevent-submission.md

@@ -1 +1 @@
-To prevent acceptance or submission of an assignment by students, deselect **Enable assignment invitation URL**. To edit the assignment, click {% octicon "pencil" aria-label="The pencil icon" %} **Edit assignment**.
+To prevent acceptance or submission of an assignment by students, you can change the "Assignment Status" within the "Edit assignment" view. When an assignment is Active, students will be able to accept it using the invitation link. When it is Inactive, this link will no longer be valid.

data/reusables/codespaces/codespaces-machine-type-availability.md

@@ -0,0 +1,5 @@
+   {% note %}
+
+   **Note**: Your choice of available machine types may be limited by a policy configured for your organization, or by a minimum machine type specification for your repository. For more information, see "[Restricting access to machine types](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)" and "[Setting a minimum specification for codespace machines](/codespaces/setting-up-your-project-for-codespaces/setting-a-minimum-specification-for-codespace-machines)."
+
+   {% endnote %}

data/reusables/codespaces/creating-a-codespace-in-vscode.md

@@ -15,4 +15,6 @@ After you connect your account on {% data variables.product.product_location %}
 
 5. Click the machine type you want to develop in.
 
-   ![Instance types for a new {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/choose-sku-vscode.png)
+   ![Instance types for a new {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/choose-sku-vscode.png)
+
+   {% data reusables.codespaces.codespaces-machine-type-availability %}

data/reusables/gated-features/enterprise-accounts.md

@@ -1 +1 @@
-Enterprise accounts are available with {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[About enterprise accounts]({% ifversion fpt or ghec %}/enterprise-cloud@latest{% endif %}/admin/overview/about-enterprise-accounts)."
+Enterprise accounts are available with {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[About enterprise accounts]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/overview/about-enterprise-accounts){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}

data/reusables/identity-and-permissions/team-sync-okta-requirements.md

@@ -2,4 +2,4 @@ Before you enable team synchronization for Okta, you or your IdP administrator m
 
 - Configure the SAML, SSO, and SCIM integration for your organization using Okta. For more information, see "[Configuring SAML single sign-on and SCIM using Okta](/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta)."
 - Provide the tenant URL for your Okta instance.
-- Generate a valid SSWS token with read-only admin permissions for your Okta installation as a service user. For more information, see [Create the token](https://developer.okta.com/docs/guides/create-an-api-token/create-the-token/) and [Service users](https://help.okta.com/en/prod/Content/Topics/Adv_Server_Access/docs/service-users.htm) in Okta's documentation.
+- Generate a valid SSWS token with read-only admin permissions for your Okta installation as a service user. For more information, see [Create the token](https://developer.okta.com/docs/guides/create-an-api-token/create-the-token/) and [Service users](https://help.okta.com/asa/en-us/Content/Topics/Adv_Server_Access/docs/service-users.htm) in Okta's documentation.

data/reusables/organizations/internal-repos-enterprise.md

@@ -1,7 +0,0 @@
-{% ifversion fpt or ghec %}
-{% note %}
-
-**Note:** Internal repositories are available for organizations that are part of an enterprise account. For more information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)."
-
-{% endnote %}
-{% endif %}

data/reusables/webhooks/webhooks-rest-api-links.md

@@ -1,5 +1,5 @@
 The webhook REST APIs enable you to manage repository, organization, and app webhooks.{% ifversion fpt or ghes > 3.2 or ghae or ghec %} You can use this API to list webhook deliveries for a webhook, or get and redeliver an individual delivery for a webhook, which can be integrated into an external app or service.{% endif %} You can also use the REST API to change the configuration of the webhook. For example, you can modify the payload URL, content type, SSL verification, and secret. For more information, see:
 
-- [Repository Webhooks REST API](/rest/reference/repos#webhooks)
+- [Repository Webhooks REST API](/rest/reference/webhooks#repository-webhooks)
 - [Organization Webhooks REST API](/rest/reference/orgs#webhooks)
 - [{% data variables.product.prodname_github_app %} Webhooks REST API](/rest/reference/apps#webhooks)

data/ui.yml

@@ -32,7 +32,9 @@ search:
   placeholder: Search topics, products...
   loading: Loading
   no_results: No results found
+  search_results_for: Search results for
   no_content: No content
+  matches_displayed: Matches displayed
 homepage:
   explore_by_product: Explore by product
   version_picker: Version
@@ -66,6 +68,7 @@ survey:
   required: Required
   email_placeholder: email@example.com
   email_label: If we can contact you with more questions, please enter your email address
+  email_validation: Please enter a valid email address
   send: Send
   feedback: Thank you! We received your feedback.
   not_support: If you need a reply, please contact support instead.