Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into freshness62

Author: dagiro

articles/active-directory/authentication/concept-registration-mfa-sspr-combined.md

@@ -22,7 +22,7 @@ Before combined registration, users registered authentication methods for Azure
 This article outlines what combined security registration is. To get started with combined security registration, see the following article:
 
 > [!div class="nextstepaction"]
-> [Enable combined security regiration](howto-registration-mfa-sspr-combined.md)
+> [Enable combined security registration](howto-registration-mfa-sspr-combined.md)
 
 ![My Profile showing registered Security info for a user](media/concept-registration-mfa-sspr-combined/combined-security-info-defualts-registered.png)
 

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/active-directory/users-groups-roles/TOC.yml

@@ -18,7 +18,7 @@
     href: groups-quickstart-naming-policy.md
 - name: Tutorials
   items:
-  - name: Create a dynamically populated group    
+  - name: Create a dynamic group    
     href: groups-dynamic-tutorial.md
 - name: Concepts
   expanded: true
@@ -74,8 +74,6 @@
       href: domains-manage.md
     - name: Delete a directory    
       href: directory-delete-howto.md
-    - name: Administrative units
-      href: directory-administrative-units.md
     - name: Multiple directories    
       href: licensing-directory-independence.md
     - name: Self-service signup    
@@ -86,52 +84,54 @@
       href: /azure/active-directory/connect/active-directory-aadconnect?context=azure/active-directory/users-groups-roles/context/ugr-context
   - name: Manage groups
     items: 
-    - name: Search group and member lists (preview)    
-      href: groups-members-owners-search.md
+    - name: Manage access with Azure AD groups
+      href: /azure/active-directory/fundamentals/active-directory-manage-groups?context=azure/active-directory/users-groups-roles/context/ugr-context  
     - name: Create a group (Azure portal)    
       href: /azure/active-directory/fundamentals/active-directory-groups-create-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context
-    - name: Assign sensitivity labels (preview)
-      href: groups-assign-sensitivity-labels.md
     - name: Manage groups PowerShell for Graph (v2)   
       href: groups-settings-v2-cmdlets.md
-    - name: Manage groups PowerShell MSOnline    
+    - name: Manage groups with PowerShell MSOnline    
       href: groups-settings-cmdlets.md
+    - name: Search group and member lists (preview)    
+      href: groups-members-owners-search.md
     - name: Add or remove group members    
       href: /azure/active-directory/fundamentals/active-directory-groups-members-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context
+    - name: Dynamic groups    
+      items: 
+      - name: Create a dynamic group    
+        href: groups-create-rule.md
+      - name: Dynamic group rule syntax
+        href: groups-dynamic-membership.md
+      - name: Validate a membership rule
+        href: groups-dynamic-rule-validation.md
+      - name: Change group membership type  
+        href: groups-change-type.md
     - name: Bulk add members (preview)
       href: groups-bulk-import-members.md
     - name: Bulk remove members (preview)
       href: groups-bulk-remove-members.md
     - name: Bulk download member list (preview)
       href: groups-bulk-download-members.md
-    - name: Manage group owners
-      href: /azure/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners?context=azure/active-directory/users-groups-roles/context/ugr-context
     - name: Bulk download groups list (preview)
       href: groups-bulk-download.md
+    - name: Restore deleted groups   
+      href: groups-restore-deleted.md
+    - name: Manage group settings
+      href: /azure/active-directory/fundamentals/active-directory-groups-settings-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context 
+    - name: Manage group owners
+      href: /azure/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners?context=azure/active-directory/users-groups-roles/context/ugr-context
     - name: Manage groups in groups
       href: /azure/active-directory/fundamentals/active-directory-groups-membership-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context
     - name: Add group access to SaaS apps
       href: groups-saasapps.md
-    - name: Groups naming reference
+    - name: Set group naming policy
       href: groups-naming-policy.md
-    - name: Groups expiration reference    
+    - name: Set group expiration policy    
       href: groups-lifecycle.md
-    - name: Restore deleted groups   
-      href: groups-restore-deleted.md
-    - name: Manage group settings
-      href: /azure/active-directory/fundamentals/active-directory-groups-settings-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context 
     - name: Set up group self-service    
       href: groups-self-service-management.md
-    - name: Dynamic groups    
-      items: 
-      - name: Create a dynamic group    
-        href: groups-create-rule.md
-      - name: Dynamic group rule syntax
-        href: groups-dynamic-membership.md
-      - name: Validate a membership rule
-        href: groups-dynamic-rule-validation.md
-      - name: Change group membership type  
-        href: groups-change-type.md
+    - name: Assign sensitivity labels (preview)
+      href: groups-assign-sensitivity-labels.md
   - name: Assign licenses
     items:
     - name: Assign licenses to a group    

articles/active-directory/users-groups-roles/roles-admin-units-add-manage-users.md

@@ -46,11 +46,11 @@ You can assign users to administrative units in two ways.
 
 ### PowerShell
 
-    $administrative unitObj = Get-AzureADAdministrativeUnit -Filter "displayname eq 'Test administrative unit 2'"
+    $administrativeunitObj = Get-AzureADAdministrativeUnit -Filter "displayname eq 'Test administrative unit 2'"
     $UserObj = Get-AzureADUser -Filter "UserPrincipalName eq '[email protected]'"
-    Add-AzureADAdministrativeUnitMember -ObjectId $administrative unitObj.ObjectId -RefObjectId $UserObj.ObjectId
+    Add-AzureADAdministrativeUnitMember -ObjectId $administrativeunitObj.ObjectId -RefObjectId $UserObj.ObjectId
 
-In the above example, the cmdlet Add-AzureADAdministrativeUnitMember is used to add the user to the administrative unit. The object ID of the Administrative Unit where user is to be added and the object ID of the user who is to be added are taken as argument. The highlighted section may be changed as required for the specific environment.
+In the above example, the cmdlet Add-AzureADAdministrativeUnitMember is used to add the user to the administrative unit. The object ID of the administrative unit where user is to be added and the object ID of the user who is to be added are taken as argument. The highlighted section may be changed as required for the specific environment.
 
 ### Microsoft Graph
 

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**.

articles/cosmos-db/spark-connector.md

@@ -105,7 +105,7 @@ val writeConfig = Config(Map(
   "Masterkey" -> "YOUR-KEY-HERE",
   "Database" -> "DepartureDelays",
   "Collection" -> "flights_fromsea",
-  "Upsert" : "true"
+  "Upsert" -> "true"
 ))
 
 // Write to Cosmos DB from the flights DataFrame

articles/event-grid/resize-images-on-storage-blob-upload-event.md

@@ -97,7 +97,7 @@ In the following command, provide your own unique function app name. The functio
     ```azurecli-interactive
     az functionapp create --name $functionapp --storage-account $functionstorage \
       --resource-group $resourceGroupName --consumption-plan-location southeastasia \
-      --functions_version 2
+      --functions-version 2
     ```
 
 Now configure the function app to connect to the Blob storage account you created in the [previous tutorial][previous-tutorial].