Merge pull request #218147 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit b5fc112ccf9c · 2022-11-14T09:55:26.000-08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory/develop/scopes-oidc.md b/articles/active-directory/develop/scopes-oidc.md
@@ -19,13 +19,13 @@ The Microsoft identity platform implements the [OAuth 2.0](active-directory-v2-p
 
 In this article, you'll learn about scopes and permissions in the identity platform.
 
-The following list shows are some examples of Microsoft web-hosted resources:
+The following list shows some examples of Microsoft web-hosted resources:
 
 - Microsoft Graph: `https://graph.microsoft.com`
 - Microsoft 365 Mail API: `https://outlook.office.com`
 - Azure Key Vault: `https://vault.azure.net`
 
-The same is true for any third-party resources that have integrated with the Microsoft identity platform. Any of these resources also can define a set of permissions that can be used to divide the functionality of that resource into smaller chunks. As an example, [Microsoft Graph](https://graph.microsoft.com) has defined permissions to do the following tasks, among others:
+The same is true for any third-party resources that have integrated with the Microsoft identity platform. Any of these resources can also define a set of permissions that can be used to divide the functionality of that resource into smaller chunks. As an example, [Microsoft Graph](https://graph.microsoft.com) has defined permissions to do the following tasks, among others:
 
 - Read a user's calendar
 - Write to a user's calendar
diff --git a/articles/active-directory/hybrid/how-to-connect-group-writeback-enable.md b/articles/active-directory/hybrid/how-to-connect-group-writeback-enable.md
@@ -52,6 +52,11 @@ Group writeback requires enabling both the original and new versions of the feat
    ``` PowerShell 
    Set-ADSyncScheduler -SyncCycleEnabled $true  
    ``` 
+6. Run a full sync cycle if group writeback was previously configured and will not be configured in the ⁠Azure AD Connect wizard:
+   ``` PowerShell 
+   Start-ADSyncSyncCycle -PolicyType Initial
+   ``` 
+
 
 ### Enable group writeback by using the Azure AD Connect wizard 
 If the original version of group writeback was not previously enabled, continue with the following steps: 
diff --git a/articles/app-service/app-service-undelete.md b/articles/app-service/app-service-undelete.md
@@ -74,6 +74,7 @@ Restore-AzDeletedWebApp -TargetResourceGroupName <my_rg> -Name <my_app> -TargetA
 
 > [!NOTE]
 > Deployment slots are not restored as part of your app. If you need to restore a staging slot, use the `-Slot <slot-name>`  flag.
+> The commandlet is restoring original slot to the target app's production slot.
 > By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content to target app. If you want to only restore content, you use the `-RestoreContentOnly` flag with this commandlet.
 
 >Restore only site content to the target app
@@ -95,7 +96,7 @@ The inputs for command are:
 - **Name**: Name for the app, should be globally unique.
 - **ResourceGroupName**: Original resource group for the deleted app 
 - **Slot**: Slot for the deleted app 
-- **RestoreContentOnly**: y default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content. If you want to only restore content, you use the `-RestoreContentOnly` flag with this commandlet.
+- **RestoreContentOnly**: By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content. If you want to only restore content, you can use the `-RestoreContentOnly` flag with this commandlet.
 
 > [!NOTE]
 > If the app was hosted on and then deleted from an App Service Environment, it can be restored only if the corresponding App Service Environment still exists.
diff --git a/articles/azure-monitor/logs/api/authentication-authorization.md b/articles/azure-monitor/logs/api/authentication-authorization.md
@@ -45,6 +45,19 @@ You can also use this flow to request a token to `https://api.loganalytics.io`.
     &client_secret=YOUR_CLIENT_SECRET
 ```
 
+##### Microsoft identity platform v2.0
+
+```
+    POST /YOUR_AAD_TENANT/oauth2/v2.0/token HTTP/1.1
+    Host: https://login.microsoftonline.com
+    Content-Type: application/x-www-form-urlencoded
+    
+    grant_type=client_credentials
+    &client_id=YOUR_CLIENT_ID
+    &scope=https://management.azure.com/.default
+    &client_secret=YOUR_CLIENT_SECRET
+```
+
 A successful request receives an access token:
 
 ```
diff --git a/articles/cloud-services/cloud-services-python-ptvs.md b/articles/cloud-services/cloud-services-python-ptvs.md
@@ -170,7 +170,7 @@ $is_python2 = $env:PYTHON2 -eq "on"
 $nl = [Environment]::NewLine
 
 if (-not $is_emulated){
-    Write-Output "Checking if python is installed...$nl"
+    Write-Output "Checking if Python is installed...$nl"
     if ($is_python2) {
         & "${env:SystemDrive}\Python27\python.exe"  -V | Out-Null
     }
diff --git a/articles/cognitive-services/Speech-Service/includes/release-notes/release-notes-sdk.md b/articles/cognitive-services/Speech-Service/includes/release-notes/release-notes-sdk.md
@@ -21,7 +21,7 @@ ms.author: eur
 - **Java**
     - Temporarily Published updated POM and Javadocs files to Maven Central to enable the docs pipeline to update online reference docs.
 - **Python**
-    - Fix regression where python speak_text(ssml) returns void.
+    - Fix regression where Python speak_text(ssml) returns void.
 
 
 ### Speech SDK 1.24.0: October 2022 release
diff --git a/articles/communication-services/quickstarts/rooms/includes/rooms-quickstart-python.md b/articles/communication-services/quickstarts/rooms/includes/rooms-quickstart-python.md
@@ -26,7 +26,7 @@ You can review and download the sample code for this quick start on [GitHub](htt
 
 ## Setting up
 
-### Create a new python application
+### Create a new Python application
 
 In a terminal or console window, create a new folder for your application and navigate to it.
 
diff --git a/articles/machine-learning/how-to-create-data-assets.md b/articles/machine-learning/how-to-create-data-assets.md
@@ -243,7 +243,7 @@ paths:
   - pattern: ./*.txt
 transformations:
   - read_delimited:
-      delimiter: ,
+      delimiter: ','
       encoding: ascii
       header: all_files_same_headers
 ```
diff --git a/articles/machine-learning/migrate-to-v2-resource-datastore.md b/articles/machine-learning/migrate-to-v2-resource-datastore.md
@@ -157,7 +157,7 @@ blob_datastore = Datastore.register_azure_blob_container(workspace=ws,
                          subscription_id=subscription_id, 
                          resource_group_name=resource_group)
     
-    datastore = ml_client.datastores.get(datastore_name='your datastore name')
+    datastore = ml_client.datastores.get(name='your datastore name')
     ```
 
 ## Mapping of key functionality in SDK v1 and SDK v2
diff --git a/articles/machine-learning/reference-yaml-mltable.md b/articles/machine-learning/reference-yaml-mltable.md
@@ -65,7 +65,7 @@ paths:
   - pattern: ./*.txt
 transformations:
   - read_delimited:
-      delimiter: ,
+      delimiter: ','
       encoding: ascii
       header: all_files_same_headers
   - columns: [Trip_Pickup_DateTime, Trip_Dropoff_DateTime]
diff --git a/articles/reliability/glossary.md b/articles/reliability/glossary.md
@@ -11,7 +11,7 @@ ms.reviewer: cynthn
 ms.custom: fasttrack-edit, mvc
 ---
 
-# Reliability erminology
+# Reliability terminology
 
 To better understand regions and availability zones in Azure, it helps to understand key terms or concepts.
 
diff --git a/includes/active-directory-service-limits-include.md b/includes/active-directory-service-limits-include.md
@@ -25,3 +25,4 @@ Here are the usage constraints and other service limits for the Azure AD service
 | Reports | A maximum of 1,000 rows can be viewed or downloaded in any report. Any additional data is truncated. |
 | Administrative units | <ul><li>An Azure AD resource can be a member of no more than 30 administrative units.</li><li>An Azure AD organization can have a maximum of 5,000 dynamic groups and dynamic administrative units combined.</li></ul> |
 | Azure AD roles and permissions | <ul><li>A maximum of 100 [Azure AD custom roles](/azure/active-directory//users-groups-roles/roles-custom-overview?context=azure%2factive-directory%2fusers-groups-roles%2fcontext%2fugr-context) can be created in an Azure AD organization.</li><li>A maximum of 150 Azure AD custom role assignments for a single principal at any scope.</li><li>A maximum of 100 Azure AD built-in role assignments for a single principal at non-tenant scope (such as an administrative unit or Azure AD object). There is no limit to Azure AD built-in role assignments at tenant scope.</li><li>A group can't be added as a [group owner](../articles/active-directory/fundamentals/users-default-permissions.md?context=azure%2factive-directory%2fusers-groups-roles%2fcontext%2fugr-context#object-ownership).</li><li>A user's ability to read other users' tenant information can be restricted only by the Azure AD organization-wide switch to disable all non-admin users' access to all tenant information (not recommended). For more information, see [To restrict the default permissions for member users](../articles/active-directory/fundamentals/users-default-permissions.md?context=azure%2factive-directory%2fusers-groups-roles%2fcontext%2fugr-context#restrict-member-users-default-permissions).</li><li>It might take up to 15 minutes or you might have to sign out and sign back in before admin role membership additions and revocations take effect.</li></ul> |
+|Conditional Access Policies|A maximum of 195 policies can be created in a single Azure AD organization (tenant).|

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ $is_python2 = $env:PYTHON2 -eq "on"`
`170`	`170`	`$nl = [Environment]::NewLine`
`171`	`171`
`172`	`172`	`if (-not $is_emulated){`
`173`		`- Write-Output "Checking if python is installed...$nl"`
	`173`	`+ Write-Output "Checking if Python is installed...$nl"`
`174`	`174`	`if ($is_python2) {`
`175`	`175`	`& "${env:SystemDrive}\Python27\python.exe" -V \| Out-Null`
`176`	`176`	`}`