Enterprise bug fix hour for week of January 15, 2024 (#48770)

Author: mattpollard

content/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md

@@ -13,18 +13,16 @@ shortTitle: Set up an Advanced Security trial
 
 ## About trials of {% data variables.product.prodname_GH_advanced_security %}
 
-{% data variables.product.prodname_GH_advanced_security %} provides features that help you improve and maintain the security and quality of code. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
-
-{% note %}
-
-**Note:** You need an enterprise account to set up a trial to evaluate the features that come with {% data variables.product.prodname_GH_advanced_security %}, such as {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_secret_scanning %}, and dependency review. For more information about enterprise accounts, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)."
-
-{% endnote %}
+{% data variables.product.prodname_GH_advanced_security %} provides features that help you improve and maintain the security and quality of code, such as {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_secret_scanning %}, and dependency review. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
 
 During a trial, you can add any number of committers and enable {% data variables.product.prodname_GH_advanced_security %} for any number of organizations. You can set up a trial if you pay for {% data variables.product.prodname_ghe_cloud %} by credit card or PayPal, or if you are already taking part in a free trial of {% data variables.product.prodname_ghe_cloud %}.
 
 The standard length of the trial is 30 days. If you're taking part in a free trial of {% data variables.product.prodname_ghe_cloud %}, the trial of {% data variables.product.prodname_GH_advanced_security %} will last for the time you have remaining on your trial of {% data variables.product.prodname_ghe_cloud %}.
 
+## Prerequisites
+
+To set up a trial of {% data variables.product.prodname_GH_advanced_security %}, you must be an owner of an enterprise account. For more information, see "[AUTOTITLE](/admin/overview/about-enterprise-accounts)" and "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owners)."
+
 ## Setting up your trial of {% data variables.product.prodname_GH_advanced_security %}
 
 {% data reusables.enterprise-accounts.access-enterprise %}

content/rest/enterprise-admin/scim.md

@@ -9,12 +9,12 @@ topics:
 autogenerated: rest
 ---
 
+{% data reusables.scim.ghec-open-scim-beta-note %}
+
 ## About SCIM
 
 {% ifversion ghec %}
 
-{% data reusables.scim.ghec-open-scim-beta-note %}
-
 {% data reusables.enterprise_user_management.about-scim-provisioning %} If you don't use a partner IdP with an existing integration, you can integrate using the following API endpoints. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/provisioning-user-accounts-for-enterprise-managed-users/provisioning-users-with-scim-using-the-rest-api)."
 
 ### Base URL

content/rest/scim/index.md

@@ -1,7 +1,7 @@
 ---
 title: SCIM
 intro: >-
-  Use the REST API to control and manage your GitHub organization members access
+  Use the REST API to control and manage your GitHub organization members' access
   with SCIM.
 versions:
   ghec: '*'
@@ -12,4 +12,6 @@ children:
 autogenerated: rest
 ---
 
+{% data reusables.scim.organization-rest-api-ghec-deployment-option %}
+
 <!-- Content after this section is automatically generated -->

content/rest/scim/scim.md

@@ -1,7 +1,7 @@
 ---
 title: SCIM
 intro: >-
-  Use the REST API to control and manage your GitHub organization members access
+  Use the REST API to control and manage your GitHub organization members' access
   with SCIM.
 versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   ghec: '*'
@@ -12,6 +12,8 @@ redirect_from:
 autogenerated: rest
 ---
 
+{% data reusables.scim.organization-rest-api-ghec-deployment-option %}
+
 ## About SCIM
 
 ### SCIM Provisioning for Organizations

data/release-notes/enterprise-server/3-11/2.yml

@@ -3,14 +3,6 @@ sections:
   bugs:
     - When an instance is upgraded with a hotpatch, the instance may lose network connectivity after a reboot.
   known_issues:
-    - |
-      An upgrade to GitHub Enterprise Server 3.11 may fail, hanging on the "Reloading system services" screen. The following error will appear in `/var/log/syslog`.
-
-      ```text
-      agent: Error starting agent: error="Failed to start Consul server: Failed to start Raft: failed to load any existing snapshots"
-      ```
-
-      To address this issue, [contact GitHub Support](https://support.github.com/contact).
     - |
       Custom firewall rules are removed during the upgrade process.
     - |

data/reusables/scim/ghec-open-scim-beta-note.md

@@ -5,6 +5,7 @@
 **Notes**:
 
 - Support for provisioning users with {% data variables.product.company_short %}'s public SCIM schema is in private beta and subject to change. To request access to the beta, contact your account manager on {% data variables.contact.contact_enterprise_sales %}.
+- This operation allows you to provision user accounts for your enterprise on {% data variables.product.prodname_ghe_cloud %} using SCIM. The operation is only available for use with {% data variables.product.prodname_emus %}. If you don't use {% data variables.product.prodname_emus %} and want to provision access to your organizations using SCIM, see "[AUTOTITLE](/rest/scim/scim)."
 - {% data variables.product.company_short %} recommends that you test provisioning in an environment that's isolated from the production data on your IdP and {% data variables.location.product_location %}.
 
 {% endnote %}

data/reusables/scim/organization-rest-api-ghec-deployment-option.md

@@ -0,0 +1,5 @@
+{% note %}
+
+**Note**: This operation allows you to provision access to an organization on {% data variables.product.prodname_ghe_cloud %} using SCIM. The operation is not available for use with {% data variables.product.prodname_emus %}. For more information about provisioning {% data variables.enterprise.prodname_managed_users %} using SCIM, see "[AUTOTITLE](/rest/enterprise-admin/scim)."
+
+{% endnote %}