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

Author: tamram

articles/active-directory-domain-services/faqs.md

@@ -87,6 +87,7 @@ Yes. Each Azure AD Domain Services managed domain includes two domain controller
 * [Can I modify or add DNS records in my managed domain?](#can-i-modify-or-add-dns-records-in-my-managed-domain)
 * [What is the password lifetime policy on a managed domain?](#what-is-the-password-lifetime-policy-on-a-managed-domain)
 * [Does Azure AD Domain Services provide AD account lockout protection?](#does-azure-ad-domain-services-provide-ad-account-lockout-protection)
+* [Can I configure Distributed File System (DFS) and replication within Azure AD Domain Services?](#can-i-configure-distributed-file-system-and-replication-within-azure-ad-domain-services)
 
 ### Can I connect to the domain controller for my managed domain using Remote Desktop?
 No. You don't have permissions to connect to domain controllers for the managed domain using Remote Desktop. Members of the *AAD DC Administrators* group can administer the managed domain using AD administration tools such as the Active Directory Administration Center (ADAC) or AD PowerShell. These tools are installed using the *Remote Server Administration Tools* feature on a Windows server joined to the managed domain. For more information, see [Create a management VM to configure and administer an Azure AD Domain Services managed domain](tutorial-create-management-vm.md).
@@ -115,6 +116,9 @@ The default password lifetime on an Azure AD Domain Services managed domain is 9
 ### Does Azure AD Domain Services provide AD account lockout protection?
 Yes. Five invalid password attempts within 2 minutes on the managed domain cause a user account to be locked out for 30 minutes. After 30 minutes, the user account is automatically unlocked. Invalid password attempts on the managed domain don't lock out the user account in Azure AD. The user account is locked out only within your Azure AD Domain Services managed domain. For more information, see [Password and account lockout policies on managed domains](password-policy.md).
 
+### Can I configure Distributed File System and replication within Azure AD Domain Services?
+No. Distributed File System (DFS) and replication aren't available when using Azure AD Domain Services.
+
 ## Billing and availability
 
 * [Is Azure AD Domain Services a paid service?](#is-azure-ad-domain-services-a-paid-service)

articles/app-service/troubleshoot-dotnet-visual-studio.md

@@ -629,7 +629,7 @@ For more information about remote debugging for App Service apps and WebJobs, se
 * [Introduction to Remote Debugging on Azure App Service part 3 - Multi-Instance environment and GIT](https://azure.microsoft.com/blog/2014/05/08/introduction-to-remote-debugging-on-azure-web-sites-part-3-multi-instance-environment-and-git/)
 * [WebJobs Debugging (video)](https://www.youtube.com/watch?v=ncQm9q5ZFZs&list=UU_SjTh-ZltPmTYzAybypB-g&index=1)
 
-If your app uses an Azure Web API or Mobile Services back-end and you need to debug that, see [Debugging .NET Backend in Visual Studio](https://blogs.msdn.com/b/azuremobile/archive/2014/03/14/debugging-net-backend-in-visual-studio.aspx).
+If your app uses an Azure Web API or Mobile Services back-end and you need to debug that, see [Debugging .NET Backend in Visual Studio](/archive/blogs/azuremobile/debugging-net-backend-in-visual-studio).
 
 ### Tracing in ASP.NET applications
 There are no thorough and up-to-date introductions to ASP.NET tracing available on the Internet. The best you can do is get started with old introductory materials written for Web Forms because MVC didn't exist yet, and supplement that with newer blog posts that focus on specific issues. Some good places to start are the following resources:
@@ -642,7 +642,7 @@ There are no thorough and up-to-date introductions to ASP.NET tracing available
   Information about trace listeners but doesn't mention the [WebPageTraceListener](/dotnet/api/system.web.webpagetracelistener).
 * [Walkthrough: Integrating ASP.NET Tracing with System.Diagnostics Tracing](/previous-versions/b0ectfxd(v=vs.140))<br/>
   This article is also old, but includes some additional information that the introductory article doesn't cover.
-* [Tracing in ASP.NET MVC Razor Views](https://blogs.msdn.com/b/webdev/archive/2013/07/16/tracing-in-asp-net-mvc-razor-views.aspx)<br/>
+* [Tracing in ASP.NET MVC Razor Views](https://devblogs.microsoft.com/aspnet/tracing-in-asp-net-mvc-razor-views/)<br/>
   Besides tracing in Razor views, the post also explains how to create an error filter in order to log all unhandled exceptions in an MVC application. For information about how to log all unhandled exceptions in a Web Forms application, see the Global.asax example in [Complete Example for Error Handlers](/previous-versions/bb397417(v=vs.140)) on MSDN. In either MVC or Web Forms, if you want to log certain exceptions but let the default framework handling take effect for them, you can catch and rethrow as in the following example:
 
     ```csharp

articles/azure-monitor/insights/service-map-scom.md

@@ -104,8 +104,10 @@ The Service Map folder has four nodes:
 
 You can edit or delete the configured workspace through the **Service Map Overview** pane (**Administration** pane > **Operations Management Suite** > **Service Map**).
 
->[!NOTE]
->[Operations Management Suite was a collection of services](https://docs.microsoft.com/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand) that included Log Analytics, which is now part of [Azure Monitor](https://github.com/MicrosoftDocs/azure-docs-pr/blob/master/articles/azure-monitor/overview.md).
+> [!NOTE]
+> [Operations Management Suite was a collection of services](../terminology.md#april-2018---retirement-of-operations-management-suite-brand)
+> that included Log Analytics, which is now part of
+> [Azure Monitor](../overview.md).
 
 You can configure only one Log Analytics workspace in this current release.
 

articles/azure-resource-manager/templates/deploy-to-tenant.md

@@ -14,6 +14,7 @@ As your organization matures, you may need to define and assign [policies](../..
 You can deploy the following resource types at the tenant level:
 
 * [deployments](/azure/templates/microsoft.resources/deployments) - for nested templates that deploy to management groups or subscriptions.
+* managementGroups
 * [policyAssignments](/azure/templates/microsoft.authorization/policyassignments)
 * [policyDefinitions](/azure/templates/microsoft.authorization/policydefinitions)
 * [policySetDefinitions](/azure/templates/microsoft.authorization/policysetdefinitions)
@@ -98,13 +99,13 @@ For tenant deployments, there are some important considerations when using templ
 * Use the [tenantResourceId()](template-functions-resource.md#tenantresourceid) function to get the resource ID for resources that are deployed at tenant level.
 
   For example, to get the resource ID for a policy definition, use:
-  
+
   ```json
   tenantResourceId('Microsoft.Authorization/policyDefinitions/', parameters('policyDefinition'))
   ```
-  
+
   The returned resource ID has the following format:
-  
+
   ```json
   /providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
   ```

articles/cdn/cdn-token-auth.md

@@ -14,7 +14,7 @@ ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: integration
 ms.date: 11/17/2017
-ms.author: mezha
+ms.author: mazha
 
 ---
 

articles/cognitive-services/containers/container-image-tags.md

@@ -101,6 +101,7 @@ This container image has the following tags available:
 | Image Tags            | Notes |
 |-----------------------|:------|
 | `latest`              |       |
+| `2.2.0-amd64-preview` |       |
 | `2.1.1-amd64-preview` |       |
 | `2.1.0-amd64-preview` |       |
 | `2.0.2-amd64-preview` |       |
@@ -126,6 +127,46 @@ This container image has the following tags available:
 | Image Tags                  | Notes                                    |
 |-----------------------------|:-----------------------------------------|
 | `latest`                    | Container image with the `en-US` locale. |
+| `2.2.0-amd64-ar-ae-preview` | Container image with the `ar-AE` locale. |
+| `2.2.0-amd64-ar-eg-preview` | Container image with the `ar-EG` locale. |
+| `2.2.0-amd64-ar-kw-preview` | Container image with the `ar-KW` locale. |
+| `2.2.0-amd64-ar-qa-preview` | Container image with the `ar-QA` locale. |
+| `2.2.0-amd64-ar-sa-preview` | Container image with the `ar-SA` locale. |
+| `2.2.0-amd64-ca-es-preview` | Container image with the `ca-ES` locale. |
+| `2.2.0-amd64-da-dk-preview` | Container image with the `da-DK` locale. |
+| `2.2.0-amd64-de-de-preview` | Container image with the `de-DE` locale. |
+| `2.2.0-amd64-en-au-preview` | Container image with the `en-AU` locale. |
+| `2.2.0-amd64-en-ca-preview` | Container image with the `en-CA` locale. |
+| `2.2.0-amd64-en-gb-preview` | Container image with the `en-GB` locale. |
+| `2.2.0-amd64-en-in-preview` | Container image with the `en-IN` locale. |
+| `2.2.0-amd64-en-nz-preview` | Container image with the `en-NZ` locale. |
+| `2.2.0-amd64-en-us-preview` | Container image with the `en-US` locale. |
+| `2.2.0-amd64-es-es-preview` | Container image with the `es-ES` locale. |
+| `2.2.0-amd64-es-mx-preview` | Container image with the `es-MX` locale. |
+| `2.2.0-amd64-fi-fi-preview` | Container image with the `fi-FI` locale. |
+| `2.2.0-amd64-fr-ca-preview` | Container image with the `fr-CA` locale. |
+| `2.2.0-amd64-fr-fr-preview` | Container image with the `fr-FR` locale. |
+| `2.2.0-amd64-gu-in-preview` | Container image with the `gu-IN` locale. |
+| `2.2.0-amd64-hi-in-preview` | Container image with the `hi-IN` locale. |
+| `2.2.0-amd64-it-it-preview` | Container image with the `it-IT` locale. |
+| `2.2.0-amd64-ja-jp-preview` | Container image with the `ja-JP` locale. |
+| `2.2.0-amd64-ko-kr-preview` | Container image with the `ko-KR` locale. |
+| `2.2.0-amd64-mr-in-preview` | Container image with the `mr-IN` locale. |
+| `2.2.0-amd64-nb-no-preview` | Container image with the `nb-NO` locale. |
+| `2.2.0-amd64-nl-nl-preview` | Container image with the `nl-NL` locale. |
+| `2.2.0-amd64-pl-pl-preview` | Container image with the `pl-PL` locale. |
+| `2.2.0-amd64-pt-br-preview` | Container image with the `pt-BR` locale. |
+| `2.2.0-amd64-pt-pt-preview` | Container image with the `pt-PT` locale. |
+| `2.2.0-amd64-ru-ru-preview` | Container image with the `ru-RU` locale. |
+| `2.2.0-amd64-sv-se-preview` | Container image with the `sv-SE` locale. |
+| `2.2.0-amd64-ta-in-preview` | Container image with the `ta-IN` locale. |
+| `2.2.0-amd64-te-in-preview` | Container image with the `te-IN` locale. |
+| `2.2.0-amd64-th-th-preview` | Container image with the `th-TH` locale. |
+| `2.2.0-amd64-tr-tr-preview` | Container image with the `tr-TR` locale. |
+| `2.2.0-amd64-zh-cn-preview` | Container image with the `zh-CN` locale. |
+| `2.2.0-amd64-zh-hk-preview` | Container image with the `zh-HK` locale. |
+| `2.2.0-amd64-zh-tw-preview` | Container image with the `zh-TW` locale. |
+| `2.1.1-amd64-en-us-preview` | Container image with the `en-US` locale. |
 | `2.1.1-amd64-ar-ae-preview` | Container image with the `ar-AE` locale. |
 | `2.1.1-amd64-ar-eg-preview` | Container image with the `ar-EG` locale. |
 | `2.1.1-amd64-ar-kw-preview` | Container image with the `ar-KW` locale. |

articles/container-instances/container-instances-quickstart-template.md

@@ -98,4 +98,4 @@ In this quickstart, you created an Azure container instance from a public Micros
 For a step-by-step tutorial that guides you through the process of creating a template, see:
 
 > [!div class="nextstepaction"]
-> [Tutorial: Create and deploy your first Azure Resource Manager template](/azure/azure-resource-manager/templates/template-tutorial-create-first-template)
+> [Tutorial: Create and deploy your first Azure Resource Manager template](../azure-resource-manager/templates/template-tutorial-create-first-template.md)

articles/container-instances/container-instances-update.md

@@ -7,7 +7,7 @@ ms.date: 04/17/2020
 
 # Update containers in Azure Container Instances
 
-During normal operation of your container instances, you may find it necessary to update the running containers in a [container group](container-instances-container-groups.md). For example, you might wish to update a property such as an image version, a DNS name, or an environment variable, or refresh a property in a container whose application has crashed.
+During normal operation of your container instances, you may find it necessary to update the running containers in a [container group](./container-instances-container-groups.md). For example, you might wish to update a property such as an image version, a DNS name, or an environment variable, or refresh a property in a container whose application has crashed.
 
 Update the containers in a running container group by redeploying an existing group with at least one modified property. When you update a container group, all running containers in the group are restarted in-place, usually on the same underlying container host.
 
@@ -23,7 +23,7 @@ To update an existing container group:
 * Set other properties with the values you provided previously. If you don't set a value for a property, it reverts to its default value.
 
 > [!TIP]
-> A [YAML file](container-instances-container-groups.md#deployment) helps maintain a container group's deployment configuration, and provides a starting point to deploy an updated group. If you used a different method to create the group, you can export the configuration to YAML by using [az container export][az-container-export], 
+> A [YAML file](./container-instances-container-groups.md#deployment) helps maintain a container group's deployment configuration, and provides a starting point to deploy an updated group. If you used a different method to create the group, you can export the configuration to YAML by using [az container export][az-container-export], 
 
 ### Example
 
@@ -75,7 +75,7 @@ When you delete a container group and recreate it, it's not "redeployed," but cr
 
 Mentioned several times in this article is the **container group**. Every container in Azure Container Instances is deployed in a container group, and container groups can contain more than one container.
 
-[Container groups in Azure Container Instances](container-instances-container-groups.md)
+[Container groups in Azure Container Instances](./container-instances-container-groups.md)
 
 [Deploy a multi-container group](container-instances-multi-container-group.md)
 

articles/container-registry/container-registry-task-run-template.md

@@ -134,7 +134,7 @@ For demonstration purposes, create a separate container registry as your base re
 
 ### Create new Dockerfile
 
-Create a Dockerfile that pulls the base image from your base registry. Perform the following steps in your local fork of the GitHub repo, for example, https://github.com/myGitHubID/acr-build-helloworld-node.git*.
+Create a Dockerfile that pulls the base image from your base registry. Perform the following steps in your local fork of the GitHub repo, for example, `https://github.com/myGitHubID/acr-build-helloworld-node.git`.
 
 1. In the GitHub UI, select **Create new file**.
 1. Name your file *Dockerfile-test* and paste the following contents. Substitute your registry name for *mybaseregistry*.

articles/cosmos-db/TOC.yml

@@ -972,10 +972,14 @@
           href: sql-api-query-metrics.md
         - name: Performance tips for .NET SDK
           href: performance-tips.md
-        - name: Performance tips for Java SDK
-          href: performance-tips-java.md
-        - name: Performance tips for Async Java SDK
-          href: performance-tips-async-java.md
+        - name: Performance tips for Java SDK v4
+          href: performance-tips-java-sdk-v4-sql.md  
+        - name: Performance tips for older Java SDKs
+          items:
+          - name: Async Java SDK v2
+            href: performance-tips-async-java.md          
+          - name: Sync Java SDK v2
+            href: performance-tips-java.md
         - name: Performance test - sample app
           href: performance-testing.md
       - name: Cost-effective reads and writes