Merged main into live

Author: mijacobs

docs/organizations/accounts/faq-user-and-permissions-management.yml

@@ -12,7 +12,7 @@ metadata:
   ms.topic: faq
   ms.author: chcomley
   author: chcomley
-  ms.date: 07/21/2025
+  ms.date: 07/28/2025
   monikerRange: '<= azure-devops'
 title: User and permissions management FAQs
 summary: |
@@ -143,6 +143,28 @@ sections:
           The following example shows that the license isn't detected anymore:
           ![Screenshot shows GitHub Enterprise no longer listed as user's access level in Organization settings, Users page.](media/faq/github-enterprise-no-license.png)
       
+      - question: |
+          Q: How do I restore Basic access to users who no longer have a GitHub Enterprise license?
+        answer: |
+          A: Do the following steps to restore Basic access to users who no longer have a GitHub Enterprise license:
+          1. Select ![gear icon](../../media/icons/gear-icon.png) **Organization settings**.
+          2. Select **Users**.
+          3. Select the **Access level** filter and choose **GitHub Enterprise (Invalid)**.
+              
+              ![Screenshot showing GitHub Enterprise Invalid access level checked for user type.](media/faq/access-level-filter-github-enterprise-invalid.png)
+          
+          4. Check the box for **All**.
+              
+              ![Screenshot showing checked box for All.](media/faq/all-checkbox-selected.png)
+          
+          5. Select **Manage** and **Change access level**.
+              
+              ![Screenshot showing Manage and Change access level selections.](media/faq/manage-change-access-level.png)
+          
+          6. Select **Basic** and **Save**.
+              
+              ![Screenshot showing Basic access level selected.](media/faq/basic-access-level-save.png)
+      
       - question: |
           Q: Are users using GitHub Enterprise Server detected as having GitHub Enterprise?
         answer: |

docs/organizations/accounts/media/faq/access-level-filter-github-enterprise-invalid.png

@@ -8,7 +8,7 @@ ms.topic: troubleshooting
 ms.author: chcomley
 author: chcomley
 monikerRange: '<= azure-devops'
-ms.date: 02/10/2025
+ms.date: 07/28/2025
 ms.custom: sfi-image-nochange
 --- 
 
@@ -77,6 +77,7 @@ Users can lose access for the following reasons:
 |**Reason for loss of access**  |**Troubleshooting action**|
 |---------|---------|
 |The user's Visual Studio subscription expired.     | This user can [work as a Stakeholder](../../organizations/security/get-started-stakeholder.md), or you can give the user Basic access until the user renews their subscription. After the user signs in, Azure DevOps restores access automatically.        |
+|The GitHub Enterprise license expired or got removed.    | See the [FAQs/GitHub Enterprise section](../accounts/faq-user-and-permissions-management.yml#github-enterprise).       |
 |The Azure subscription used for billing is no longer active.  |  All purchases made with this subscription are affected, including Visual Studio subscriptions. To fix this issue, visit the [Azure account portal](https://portal.azure.com).       |
 |The Azure subscription used for billing was removed from your organization.    | Learn more about [linking your organization](../billing/set-up-billing-for-your-organization-vs.md#set-up-billing)        |