Merge branch 'main' into main

Author: nguyenalex836

.github/workflows/azure-preview-env-deploy.yml

@@ -74,7 +74,7 @@ jobs:
 
     steps:
       - name: 'Az CLI login'
-        uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # pin @v1.4.6
+        uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # pin @v1.6.1
         with:
           creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }}
 

.github/workflows/azure-preview-env-destroy.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: 'Az CLI login'
-        uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # pin @v1.4.6
+        uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # pin @v1.6.1
         with:
           creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }}
 

.github/workflows/azure-prod-build-deploy.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: 'Az CLI login'
-        uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # pin @v1.4.6
+        uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # pin @v1.6.1
         with:
           creds: ${{ secrets.PROD_AZURE_CREDENTIALS }}
 

.github/workflows/azure-staging-build-deploy.yml

@@ -45,7 +45,7 @@ jobs:
 
     steps:
       - name: 'Az CLI login'
-        uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # pin @v1.4.6
+        uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # pin @v1.6.1
         with:
           creds: ${{ secrets.PROD_AZURE_CREDENTIALS }}
 

.github/workflows/main-preview-docker-cache.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: 'Az CLI login'
-        uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # pin @v1.4.6
+        uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # pin @v1.6.1
         with:
           creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }}
 

content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md

@@ -126,7 +126,11 @@ If you need help determining if modifying the `MaxValRange` is the right approac
 
 {% endnote %}
 
-To enable LDAP Sync, in your LDAP settings, select **Synchronize Emails**, **Synchronize SSH Keys**, or **Synchronize GPG Keys**.
+To enable LDAP Sync, in your LDAP settings, select **Synchronization**.
+
+To pick a synchronization interval for all users and all teams, click the dropdown menus. Then select **every 1 hour**, **every 4 hours**, or **every 24 hours**.
+
+To automatically synchronize certain attributes from LDAP, under "Synchronize User Emails, SSH & GPG Keys," click **Synchronize Emails**, **Synchronize SSH Keys**, and/or **Synchronize GPG Keys**.
 
 After you enable LDAP sync, a synchronization job will run at the specified time interval to perform the following operations on each user account: