Merge pull request #189694 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 2abe02851630 · 2022-02-25T10:04:31.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-domain-services/tutorial-create-replica-set.md b/articles/active-directory-domain-services/tutorial-create-replica-set.md
@@ -111,6 +111,7 @@ To delete a replica set, complete the following steps:
 1. Choose your managed domain, such as *aaddscontoso.com*.
 1. On the left-hand side, select **Replica sets**. From the list of replica sets, select the **...** context menu next to the replica set you want to delete.
 1. Select **Delete** from the context menu, then confirm you want to delete the replica set.
+1. In the Azure ADDS management VM, access the DNS console and manually delete DNS records for the domain controllers from the deleted replica set.
 
 > [!NOTE]
 > Replica set deletion may be a time-consuming operation.
diff --git a/articles/active-directory/develop/scenario-web-app-sign-user-app-configuration.md b/articles/active-directory/develop/scenario-web-app-sign-user-app-configuration.md
@@ -307,9 +307,6 @@ In the code above:
 
 You can find more details about how Microsoft.Identity.Web enables you to create web apps in <https://aka.ms/ms-id-web/webapp>
 
-> [!WARNING]
-> Currently, Microsoft.Identity.Web does not support the scenario of **Individual User Accounts** (storing user accounts in-app) when using Azure AD as and external login provider. For details, see: [AzureAD/microsoft-identity-web#133](https://github.com/AzureAD/microsoft-identity-web/issues/133)
-
 # [ASP.NET](#tab/aspnet)
 
 The code related to authentication in an ASP.NET web app and web APIs is located in the [App_Start/Startup.Auth.cs](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/a2da310539aa613b77da1f9e1c17585311ab22b7/WebApp/App_Start/Startup.Auth.cs#L17-L61) file.
diff --git a/articles/marketplace/azure-vm-image-test.md b/articles/marketplace/azure-vm-image-test.md
@@ -43,7 +43,7 @@ The Certification Test Tool for Azure Certified runs on a local Windows machine
 1. Download and install the most recent [Certification Test Tool for Azure Certified](https://www.microsoft.com/download/details.aspx?id=44299).
 2. Open the certification tool, then select **Start New Test**.
 3. From the Test Information screen, enter a **Test Name** for the test run.
-4. Select the Platform for your VM, either **Windows Server** or **Linux**. Your platform choice affects the remaining options.
+4. Select the Platform for your VM, either **Windows Server** (allow port 5986 for Windows) or **Linux** (allow port 22 for Linux). Your platform choice affects the remaining options.
 5. If your VM is using this database service, select the **Test for Azure SQL Database** check box.
 
 #### Connect the certification tool to a VM image
@@ -96,7 +96,7 @@ $accessToken = $response.access_token
 
 :::image type="content" source="media/vm/generate-access-token.png" lightbox="media/vm/generate-access-token.png" alt-text="Shows a screen example for generating an access token in PowerShell.":::
 
-This example shows a PowerShell call to the API:
+This example shows a PowerShell call to the API (allow port 22 during VM creation):
 
 ```POWERSHELL
 $accesstoken = "token"
@@ -167,7 +167,7 @@ Call the API in PowerShell:
 2. The method is Post and content type is JSON, as shown in the following code example and sample screen.
 3. Create the body parameters in JSON format.
 
-This code sample shows a PowerShell call to the API:
+This code sample shows a PowerShell call to the API (allow port 5986 during VM creation):
 
 ```PowerShell
 $accesstoken = "Get token for your Client AAD App"
diff --git a/articles/marketplace/marketplace-apis-guide.md b/articles/marketplace/marketplace-apis-guide.md
@@ -19,7 +19,7 @@ The activities below are not sequential. The activity you use is dependent on yo
 
 | <center>Activity | ISV sales activities | Corresponding Marketplace API | Corresponding Marketplace UI |
 | --- | --- | --- | --- |
-| <center>**1. Product Marketing**<br><img src="media/api-guide/icon-product-marketing.png" alt="The icon for product marketing"> | Create product messaging, positioning, promotion, pricing | Create product messaging, positioning, promotion, pricing<br>[Partner Ingestion API](https://apidocs.microsoft.com/services/partneringestion/)<br>[Azure Apps Onboarding API](azure-app-apis.md)</ul> | Create product messaging, positioning, promotion, pricing<br>Partner Center (PC) → Offer Creation |
+| <center>**1. Product Marketing**<br><img src="media/api-guide/icon-product-marketing.png" alt="The icon for product marketing"> | Create product messaging, positioning, promotion, pricing | Create product messaging, positioning, promotion, pricing<br>[Partner Ingestion API](https://ingestionapi-swagger.azureedge.net)<br>[Azure Apps Onboarding API](azure-app-apis.md)</ul> | Create product messaging, positioning, promotion, pricing<br>Partner Center (PC) → Offer Creation |
 | <center>**2. Demand Generation**<br><img src="media/api-guide/icon-demand-generation.png" alt="The icon for demand generation"> | Product Promotion<br>Lead nurturing<br>Eval, trial & PoC | Product Promotion<br>Lead nurturing<br>Eval, trial & PoC<br>[Lead CRM Connector for D365, SFDC and Marketo](partner-center-portal/commercial-marketplace-get-customer-leads.md)<br>[Co-Sell Connector for SalesForce CRM](/partner-center/connector-salesforce)<br>[Co-Sell Connector for Dynamics 365 CRM](/partner-center/connector-dynamics) | Product Promotion<br>Lead nurturing<br>Eval, trial & PoC<br>Azure Marketplace and AppSource<br>PC Marketplace Insights<br>PC Co-Sell Opportunities |
 | <center>**3. Negotiation and Quote Creation**<br><img src="media/api-guide/icon-negotiation-quote-creation.png" alt="The icon for negotiation and quote creation"> | T&Cs<br>Pricing<br>Discount approvals<br>Final quote | T&Cs<br>Pricing<br>Discount approvals<br>Final quote<br>[CPP API for VM's](cloud-partner-portal-api-overview.md)<br>[Microsoft Graph for AAD API](../active-directory/reports-monitoring/concept-reporting-api.md)<br>[Partner Center '7' API Family](https://apidocs.microsoft.com/services/partnercenter) | T&Cs<br>Pricing<br>Discount approvals<br>Final quote<br>PC → Plans (public or private) |
 | <center>**4. Sale**<br><img src="media/api-guide/icon-sale.png" alt="The icon for sale"> | Contract signing<br>Revenue Recognition<br>Invoicing<br>Billing | Contract signing<br>Revenue Recognition<br>Invoicing<br>Billing<br>[SaaS fulfillment API v.2](partner-center-portal/pc-saas-fulfillment-apis.md)<br>[Reporting APIs](https://partneranalytics-api.azureedge.net/partneranalytics-api/Programmatic%20Access%20to%20Commercial%20Marketplace%20Analytics%20Data_v1.pdf) | Contract signing<br>Revenue Recognition<br>Invoicing<br>Billing<br>Azure portal / Admin Center<br>PC Marketplace Rewards<br>PC Payouts Reports<br>PC Marketplace Analytics<br>PC Co-Sell Closing |
@@ -29,4 +29,4 @@ The activities below are not sequential. The activity you use is dependent on yo
 
 ## Next steps
 
-- Visit the links above for each API as needed.
+- Visit the links above for each API as needed.
diff --git a/articles/marketplace/submission-api-onboard.md b/articles/marketplace/submission-api-onboard.md
@@ -63,7 +63,7 @@ For the tenant_id value in the POST URI and the client_id and client_secret para
 
 ### Step 3: Use the Partner Center submission API
 
-After you have an Azure AD access token, call methods in the Partner Center submission API. To create or update submissions, you typically call multiple methods in the Partner Center submission API in a specific order. For information about each scenario and the syntax of each method, see the [Ingestion API](https://apidocs.microsoft.com/services/partneringestion/) swagger.
+After you have an Azure AD access token, call methods in the Partner Center submission API. To create or update submissions, you typically call multiple methods in the Partner Center submission API in a specific order. For information about each scenario and the syntax of each method, see the [Ingestion API](https://ingestionapi-swagger.azureedge.net/#/) Swagger.
 
 ## Next steps
 
diff --git a/articles/site-recovery/vmware-azure-disaster-recovery-powershell.md b/articles/site-recovery/vmware-azure-disaster-recovery-powershell.md
@@ -313,7 +313,7 @@ Errors           : {}
 
 ## Create storage accounts for replication
 
-**To write to managed disk, use [Powershell Az.RecoveryServices module 2.0.0](https://www.powershellgallery.com/packages/Az.RecoveryServices/2.0.0-preview) onwards.** It only requires creation of a log storage account. It is recommended to use a standard account type and LRS redundancy since it is used to store only temporary logs. Ensure that the storage account is created in the same Azure region as the vault.
+**To write to managed disk, use [PowerShell Az.RecoveryServices module 2.0.0](https://www.powershellgallery.com/packages/Az.RecoveryServices/2.0.0-preview) onwards.** It only requires creation of a log storage account. It is recommended to use a standard account type and LRS redundancy since it is used to store only temporary logs. Ensure that the storage account is created in the same Azure region as the vault.
 
 If you are using a version of Az.RecoveryServices module older than 2.0.0, use the following steps to create storage accounts. These storage accounts are used later to replicate virtual machines. Ensure that the storage accounts are created in the same Azure region as the vault. You can skip this step if you plan to use an existing storage account for replication.
 
diff --git a/articles/storage/common/storage-network-security.md b/articles/storage/common/storage-network-security.md
@@ -132,7 +132,7 @@ To apply a virtual network rule to a storage account, the user must have the app
 Storage account and the virtual networks granted access may be in different subscriptions, including subscriptions that are a part of a different Azure AD tenant.
 
 > [!NOTE]
-> Configuration of rules that grant access to subnets in virtual networks that are a part of a different Azure Active Directory tenant are currently only supported through Powershell, CLI and REST APIs. Such rules cannot be configured through the Azure portal, though they may be viewed in the portal.
+> Configuration of rules that grant access to subnets in virtual networks that are a part of a different Azure Active Directory tenant are currently only supported through PowerShell, CLI and REST APIs. Such rules cannot be configured through the Azure portal, though they may be viewed in the portal.
 
 ### Available virtual network regions
 
@@ -238,7 +238,7 @@ You can manage virtual network rules for storage accounts through the Azure port
     > [!NOTE]
     > If a service endpoint for Azure Storage wasn't previously configured for the selected virtual network and subnets, you can configure it as part of this operation.
     >
-    > Presently, only virtual networks belonging to the same Azure Active Directory tenant are shown for selection during rule creation. To grant access to a subnet in a virtual network belonging to another tenant, please use , Powershell, CLI or REST APIs.
+    > Presently, only virtual networks belonging to the same Azure Active Directory tenant are shown for selection during rule creation. To grant access to a subnet in a virtual network belonging to another tenant, please use , PowerShell, CLI or REST APIs.
     > 
     > Even if you registered the `AllowGlobalTagsForStorageOnly` feature, subnets in regions other than the region of the storage account or its paired region aren't shown for selection. If you want to enable access to your storage account from a virtual network/subnet in a different region, use the instructions in the PowerShell or Azure CLI tabs.
 
diff --git a/articles/storage/files/storage-troubleshoot-windows-file-connection-problems.md b/articles/storage/files/storage-troubleshoot-windows-file-connection-problems.md
@@ -121,7 +121,7 @@ By Setting up a VPN to your specific Storage Account, the traffic will go throug
 #### Solution 3 — Unblock port 445 with help of your ISP/IT Admin
 Work with your IT department or ISP to open port 445 outbound to [Azure IP ranges](https://www.microsoft.com/download/details.aspx?id=41653).
 
-#### Solution 4 — Use REST API-based tools like Storage Explorer/Powershell
+#### Solution 4 — Use REST API-based tools like Storage Explorer/PowerShell
 Azure Files also supports REST in addition to SMB. REST access works over port 443 (standard tcp). There are various tools that are written using REST API that enable rich UI experience. [Storage Explorer](../../vs-azure-tools-storage-manage-with-storage-explorer.md?tabs=windows) is one of them. [Download and Install Storage Explorer](https://azure.microsoft.com/features/storage-explorer/) and connect to your file share backed by Azure Files. You can also use [PowerShell](./storage-how-to-use-files-portal.md) which also user REST API.
 
 ### Cause 2: NTLMv1 is enabled
diff --git a/articles/storsimple/storsimple-8000-automation-azurerm-runbook.md b/articles/storsimple/storsimple-8000-automation-azurerm-runbook.md
@@ -58,7 +58,7 @@ To create an automation module for the StorSimple 8000 series device management,
         wget https://raw.githubusercontent.com/anoobbacker/storsimpledevicemgmttools/master/Monitor-Backups.ps1 -Out Monitor-Backups.ps1
     ```
 
-5. Create an Azure Automation Runbook Module for StorSimple 8000 Series device management. On the Windows Powershell window, type the following commands:
+5. Create an Azure Automation Runbook Module for StorSimple 8000 Series device management. On the Windows PowerShell window, type the following commands:
 
     ```powershell
         # set path variables
diff --git a/articles/storsimple/storsimple-data-manager-dotnet-jobs.md b/articles/storsimple/storsimple-data-manager-dotnet-jobs.md
@@ -28,7 +28,7 @@ Before you begin, ensure that you have:
 
     - Visual Studio 2012, 2013, 2015, or 2017.
 
-    - Azure Powershell. [Download Azure Powershell](/powershell/azure/).
+    - Azure PowerShell. [Download Azure PowerShell](/powershell/azure/).
 *	A correctly configured job definition in StorSimple Data Manager within a resource group.
 *	All the required dlls. Download these dlls from the [GitHub repository](https://github.com/Azure-Samples/storsimple-dotnet-data-manager-get-started/tree/master/Data_Manager_Job_Run/dlls).
 *	[`Get-ConfigurationParams.ps1`](https://github.com/Azure-Samples/storsimple-dotnet-data-manager-get-started/blob/master/Data_Manager_Job_Run/Get-ConfigurationParams.ps1) script from the GitHub repository.
diff --git a/articles/stream-analytics/stream-analytics-cicd-api.md b/articles/stream-analytics/stream-analytics-cicd-api.md
@@ -30,7 +30,7 @@ wget -q -O- --{ <method> } -data="<request body>" --header=Content-Type:applicat
  
 ### Windows
 
-For Windows, use Powershell: 
+For Windows, use PowerShell: 
 
 ```powershell 
 $user = "<username>" 
diff --git a/articles/traffic-manager/traffic-manager-subnet-override-powershell.md b/articles/traffic-manager/traffic-manager-subnet-override-powershell.md
@@ -11,7 +11,7 @@ ms.date: 09/18/2019
 ms.author: allensu
 ---
 
-# Traffic Manager subnet override using Azure Powershell
+# Traffic Manager subnet override using Azure PowerShell
 
 Traffic Manager subnet override allows you to alter the routing method of a profile.  The addition of an override will direct traffic based upon the end user's IP address with a predefined IP range to endpoint mapping. 
 
diff --git a/articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-powershell-2019.md b/articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-powershell-2019.md
@@ -13,7 +13,7 @@ manager: femila
 > [!IMPORTANT]
 > This content applies to Azure Virtual Desktop (classic), which doesn't support Azure Resource Manager Azure Virtual Desktop objects. If you're trying to manage Azure Resource Manager Azure Virtual Desktop objects, see [this article](../troubleshoot-powershell.md).
 
-Use this article to resolve errors and issues when using PowerShell with Azure Virtual Desktop. For more information on Remote Desktop Services PowerShell, see [Azure Virtual Desktop Powershell](/powershell/windows-virtual-desktop/overview).
+Use this article to resolve errors and issues when using PowerShell with Azure Virtual Desktop. For more information on Remote Desktop Services PowerShell, see [Azure Virtual Desktop PowerShell](/powershell/windows-virtual-desktop/overview).
 
 ## Provide feedback
 
diff --git a/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-instance-ids.md b/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-instance-ids.md
@@ -23,15 +23,15 @@ Each VM in a scale set gets an instance ID that uniquely identifies it. This ins
 
 REST API: `POST https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimage?api-version={apiVersion}` (for more information, see the [REST API documentation](/rest/api/compute/virtualmachinescalesetvms/reimage))
 
-Powershell: `Set-AzVmssVM -ResourceGroupName {resourceGroupName} -VMScaleSetName {vmScaleSetName} -InstanceId {instanceId} -Reimage` (for more information, see the [Powershell documentation](/powershell/module/az.compute/set-azvmssvm))
+PowerShell: `Set-AzVmssVM -ResourceGroupName {resourceGroupName} -VMScaleSetName {vmScaleSetName} -InstanceId {instanceId} -Reimage` (for more information, see the [PowerShell documentation](/powershell/module/az.compute/set-azvmssvm))
 
 CLI: `az vmss reimage -g {resourceGroupName} -n {vmScaleSetName} --instance-id {instanceId}` (for more information, see the [CLI documentation](/cli/azure/vmss)).
 
 You can get the list of instance IDs by listing all instances in a scale set:
 
 REST API: `GET https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualMachines?api-version={apiVersion}` (for more information, see the [REST API documentation](/rest/api/compute/virtualmachinescalesetvms/list))
 
-Powershell: `Get-AzVmssVM -ResourceGroupName {resourceGroupName} -VMScaleSetName {vmScaleSetName}` (for more information, see the [Powershell documentation](/powershell/module/az.compute/get-azvmssvm))
+PowerShell: `Get-AzVmssVM -ResourceGroupName {resourceGroupName} -VMScaleSetName {vmScaleSetName}` (for more information, see the [PowerShell documentation](/powershell/module/az.compute/get-azvmssvm))
 
 CLI: `az vmss list-instances -g {resourceGroupName} -n {vmScaleSetName}` (for more information, see the [CLI documentation](/cli/azure/vmss)).
 
diff --git a/articles/virtual-machines/ephemeral-os-disks.md b/articles/virtual-machines/ephemeral-os-disks.md
@@ -252,7 +252,7 @@ A: No, ephemeral OS disk can only be used during VM and scale set creation.
 
 A: No, you can't have a mix of ephemeral and persistent OS disk instances within the same scale set. 
 
-**Q: Can the ephemeral OS disk be created using Powershell or CLI?**
+**Q: Can the ephemeral OS disk be created using PowerShell or CLI?**
 
 A: Yes, you can create VMs with Ephemeral OS Disk using REST, Templates, PowerShell, and CLI.
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ To apply a virtual network rule to a storage account, the user must have the app`
`132`	`132`	`Storage account and the virtual networks granted access may be in different subscriptions, including subscriptions that are a part of a different Azure AD tenant.`
`133`	`133`
`134`	`134`	`> [!NOTE]`
`135`		`-> Configuration of rules that grant access to subnets in virtual networks that are a part of a different Azure Active Directory tenant are currently only supported through Powershell, CLI and REST APIs. Such rules cannot be configured through the Azure portal, though they may be viewed in the portal.`
	`135`	`+> Configuration of rules that grant access to subnets in virtual networks that are a part of a different Azure Active Directory tenant are currently only supported through PowerShell, CLI and REST APIs. Such rules cannot be configured through the Azure portal, though they may be viewed in the portal.`
`136`	`136`
`137`	`137`	`### Available virtual network regions`
`138`	`138`
`@@ -238,7 +238,7 @@ You can manage virtual network rules for storage accounts through the Azure port`
`238`	`238`	`> [!NOTE]`
`239`	`239`	`> If a service endpoint for Azure Storage wasn't previously configured for the selected virtual network and subnets, you can configure it as part of this operation.`
`240`	`240`	`>`
`241`		`- > Presently, only virtual networks belonging to the same Azure Active Directory tenant are shown for selection during rule creation. To grant access to a subnet in a virtual network belonging to another tenant, please use , Powershell, CLI or REST APIs.`
	`241`	`+ > Presently, only virtual networks belonging to the same Azure Active Directory tenant are shown for selection during rule creation. To grant access to a subnet in a virtual network belonging to another tenant, please use , PowerShell, CLI or REST APIs.`
`242`	`242`	`>`
`243`	`243`	> Even if you registered the `AllowGlobalTagsForStorageOnly` feature, subnets in regions other than the region of the storage account or its paired region aren't shown for selection. If you want to enable access to your storage account from a virtual network/subnet in a different region, use the instructions in the PowerShell or Azure CLI tabs.
`244`	`244`