Merge pull request #111562 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)

Author: rmca14

articles/active-directory/hybrid/index.yml

@@ -54,7 +54,7 @@ landingContent:
             url: whatis-phs.md
           - text: What is passthrough authentication?
             url: how-to-connect-pta.md
-          - text: What is federtation?
+          - text: What is federation?
             url: whatis-fed.md
           - text: What is single sign-on?
             url: how-to-connect-sso.md
@@ -100,4 +100,4 @@ landingContent:
 
 
 
-     
+     

articles/active-directory/saas-apps/highground-tutorial.md

@@ -81,15 +81,15 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 1. On the **Basic SAML Configuration** section, if you wish to configure the application in **IDP** initiated mode, enter the values for the following fields:
 
     a. In the **Identifier** text box, type a URL using the following pattern:
-    `https://<SUBDOMAIN>.highground.com/`
+    `https://app.highground.com/`
 
     b. In the **Reply URL** text box, type a URL using the following pattern:
-    `https://<SUBDOMAIN>.highground.com/svc/SSONoAuth/<companyName>`
+    `https://app.highground.com/svc/SSONoAuth/SAML?groupid=<company-guid>`
 
 1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
 
     In the **Sign-on URL** text box, type a URL using the following pattern:
-    `https://app.highground.com/#/login/<companyName>`
+    `https://app.highground.com/#/login/<company-slug>`
 
 	> [!NOTE]
 	> These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. Contact [HighGround Client support team](https://youearnedit.freshdesk.com/support/home) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.

articles/azure-government/documentation-government-services-database.md

@@ -47,9 +47,9 @@ For details on this service and how to use it, see [Azure SQL Server Stretch Dat
 For details on this service and how to use it, see [Azure Cosmos DB documentation](../cosmos-db/index.yml).
 
 ### Variations
-Azure Cosmos DB is generally available in Azure Government with parity to the public version. One exception is the **Add Azure Cognitive Search** function currently, which isn't available in Cosmos DB for Azure Government.
+Azure Cosmos DB is generally available in Azure Government with parity to the public version.
 
-Also, the URLs for accessing Cosmos DB in Azure Government are different:
+The URLs for accessing Cosmos DB in Azure Government are different:
 
 | Service Type | Azure Public | Azure Government |
 | --- | --- | --- |
@@ -90,7 +90,7 @@ The following information identifies the Azure Government boundary for Azure Cac
 For details on this service and how to use it, see [Azure Database for PostgreSQL documentation](../postgresql/index.yml).
 
 ### Variations
-Advanced Threat Protection, Query Performance Insights and Performance Recommendations for Azure Database for PostgreSQL are **not** available in Azure Government.
+Advanced Threat Protection and Private endpoint connections for Azure Database for PostgreSQL are **not** available in Azure Government.
 
 The URLs for accessing and managing Azure Database for PostgreSQL in Azure Government are different:
 
@@ -109,8 +109,6 @@ The following information identifies the Azure Government boundary for Azure Dat
 For details on this service and how to use it, see [Azure Database for MariaDB documentation](../mariadb/index.yml).
 
 ### Variations
-Query Performance Insights and Performance Recommendations for Azure Database for MariaDB are **not** available in Azure Government.
-
 The URLs for accessing and managing Azure Database for MariaDB in Azure Government are different:
 
 | Service Type | Azure Public | Azure Government |
@@ -128,7 +126,7 @@ The following information identifies the Azure Government boundary for Azure Dat
 For details on this service and how to use it, see [Azure Database for MySQL documentation](../mysql/index.yml).
 
 ### Variations
-Advanced Threat Protection, Query Performance Insights and Performance Recommendations for Azure Database for MySQL are **not** available in Azure Government.
+Advanced Threat Protection and Private endpoint connections for Azure Database for MySQL are **not** available in Azure Government.
 
 The URLs for accessing and managing Azure Database for MySQL in Azure Government are different:
 

articles/azure-resource-manager/templates/define-resource-dependency.md

@@ -12,7 +12,7 @@ Resource Manager evaluates the dependencies between resources, and deploys them
 
 ## dependsOn
 
-Within your template, the dependsOn element enables you to define one resource as a dependent on one or more resources. Its value is a comma-separated list of resource names. The list can include resources that are [conditionally deployed](conditional-resource-deployment.md). When a conditional resource isn't deployed, Azure Resource Manager automatically removes it from the required dependencies.
+Within your template, the dependsOn element enables you to define one resource as a dependent on one or more resources. Its value is a JSON array of strings, each of which is a resource name. The array can include resources that are [conditionally deployed](conditional-resource-deployment.md). When a conditional resource isn't deployed, Azure Resource Manager automatically removes it from the required dependencies.
 
 The following example shows a virtual machine scale set that depends on a load balancer, virtual network, and a loop that creates multiple storage accounts. These other resources aren't shown in the following example, but they would need to exist elsewhere in the template.
 

articles/backup/backup-azure-manage-mars.md

@@ -84,7 +84,7 @@ There are two ways to stop protecting Files and Folders backup:
 
 - **Stop protection and retain backup data**.
   - This option will stop all future backup jobs from protection.
-  - Azure Backup service will retain the recovery points that have been backed up based on the retention policy.
+  - Azure Backup service will retain all existing recovery points indefinitely. Recovery points will not be checked for expiration until protection is resumed.
   - You'll be able to restore the backed-up data for unexpired recovery points.
   - If you decide to resume protection, then you can use the *Re-enable backup schedule* option. After that, data would be retained based on the new retention policy.
 - **Stop protection and delete backup data**.