Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into use-key-vault-references-dotnet-core

Author: BobbySchmidt2

.openpublishing.redirection.json

@@ -62,7 +62,12 @@
     },
     {
       "source_path": "articles/machine-learning/data-science-virtual-machine/dsvm-tools-overview.md",
-      "redirect_url": "/azure/machine-learning/data-science-virtual-machine/overview#included",
+      "redirect_url": "/azure/machine-learning/data-science-virtual-machine/tools-included",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/machine-learning/data-science-virtual-machine/reference-windows-vm.md",
+      "redirect_url": "/azure/machine-learning/data-science-virtual-machine/tools-included",
       "redirect_document_id": false
     },
     {
@@ -1070,6 +1075,51 @@
       "redirect_url": "/azure/cognitive-services/face/overview",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/quickstarts/csharp.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/quickstarts/java.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/quickstarts/nodejs.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/quickstarts/python.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/languages.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/languages-reference.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/overview.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/reference.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/translator-speech/tutorial-translator-speech-csharp.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-migrate-from-translator-speech-api",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/machine-learning/service/how-to-deploy-to-aks.md",
       "redirect_url": "/azure/machine-learning/service/how-to-deploy-and-where",
@@ -1920,6 +1970,11 @@
       "redirect_url": "/azure/cosmos-db/sql-api-get-started",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/search/search-traffic-analytics.md",
+      "redirect_url": "/azure/search/search-monitor-usage",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/search/knowledge-store-howto.md",
       "redirect_url": "/azure/search/knowledge-store-create-rest",

articles/active-directory-b2c/active-directory-b2c-tutorials-spa-webapi.md

@@ -66,7 +66,7 @@ git clone https://github.com/Azure-Samples/active-directory-b2c-dotnetcore-webap
 
 ### Configure the web API
 
-1. Open the *B2C-WebApi/**appsettings.json*** file in Visual Studio or Visual Studio Code.
+1. Open the <em>B2C-WebApi/**appsettings.json**</em> file in Visual Studio or Visual Studio Code.
 1. Modify the `AzureAdB2C` block to reflect your tenant name, the application ID of the web API application, the name of your sign-up/sign-in policy, and the scopes you defined earlier. The block should look similar to the following example (with appropriate `Tenant` and `ClientId` values):
 
     ```json

articles/active-directory-b2c/active-directory-b2c-ui-customization-custom.md

@@ -114,7 +114,7 @@ Validate that you're ready by performing the following steps:
 
 To configure UI customization, you copy the **ContentDefinition** and its child elements from the base file to the extensions file.
 
-1. Open the base file of your policy. For example, *`SocialAndLocalAccounts/`**`TrustFrameworkBase.xml`***. This is one of the policy files included in the custom policy starter pack, which you should have obtained in the prerequisite, [Get started with custom policies](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started-custom).
+1. Open the base file of your policy. For example, <em>`SocialAndLocalAccounts/`**`TrustFrameworkBase.xml`**</em>. This is one of the policy files included in the custom policy starter pack, which you should have obtained in the prerequisite, [Get started with custom policies](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started-custom).
 1. Search for and copy the entire contents of the **ContentDefinitions** element.
 1. Open the extension file. For example, *TrustFrameworkExtensions.xml*. Search for the **BuildingBlocks** element. If the element doesn't exist, add it.
 1. Paste the entire contents of the **ContentDefinitions** element that you copied as a child of the **BuildingBlocks** element.

articles/active-directory/develop/TOC.yml

@@ -553,7 +553,7 @@
     - name: Authentication
       items:
       - name: Authentication basics
-        href: authentication-scenarios.md
+        href: v1-authentication-scenarios.md
       - name: OAuth 2.0 and OpenID Connect protocols
         items:
         - name: OpenID Connect

articles/active-directory/develop/access-tokens.md

@@ -112,8 +112,11 @@ Claims are present only if a value exists to fill it. So, your app shouldn't tak
 | `ver` | String, either `1.0` or `2.0` | Indicates the version of the access token. |
 
 
-> [!Groups overage claim]
+> [!NOTE]
+> **Groups overage claim**
+>
 > To ensure that the token size doesn’t exceed HTTP header size limits, Azure AD limits the number of object Ids that it includes in the groups claim. If a user is member of more groups than the overage limit (150 for SAML tokens, 200 for JWT tokens), then Azure AD does not emit the groups claim in the token. Instead, it includes an overage claim in the token that indicates to the application to query the Graph API to retrieve the user’s group membership.
+  ```csharp
   {
     ...
     "_claim_names": {
@@ -124,9 +127,11 @@ Claims are present only if a value exists to fill it. So, your app shouldn't tak
       "src1": {
           "endpoint":"[Graph Url to get this user's group membership from]"
           }
-      }    
+         }
+       }
     ...
-  }
+   }
+   ```
 > You can use the `BulkCreateGroups.ps1` provided in the [App Creation Scripts](https://github.com/Azure-Samples/active-directory-dotnet-webapp-groupclaims/blob/master/AppCreationScripts/) folder to help test overage scenarios.
 
 #### v1.0 basic claims

articles/active-directory/develop/active-directory-authentication-libraries.md

@@ -81,5 +81,5 @@ In this scenario, a developer has a web application running on a server that nee
 ## See Also
 
 - [The Azure Active Directory developer's guide](v1-overview.md)
-- [Authentication scenarios for Azure Active directory](authentication-scenarios.md)
+- [Authentication scenarios for Azure Active directory](v1-authentication-scenarios.md)
 - [Azure Active Directory code samples](sample-v1-code.md)

articles/active-directory/develop/active-directory-devhowto-adal-error-handling.md

@@ -51,7 +51,7 @@ Fundamentally, there are two cases of AcquireTokenSilent errors:
 | Case | Description |
 |------|-------------|
 | **Case 1**: Error is resolvable with an interactive sign-in | For errors caused by a lack of valid tokens, an interactive request is necessary. Specifically, cache lookup and an invalid/expired refresh token require an AcquireToken call to resolve.<br><br>In these cases, the end user needs to be prompted to sign in. The application can choose to do an interactive request immediately, after end-user interaction (such as hitting a sign-in button), or later. The choice depends on the desired behavior of the application.<br><br>See the code in the following section for this specific case and the errors that diagnose it.|
-| **Case 2**: Error is not resolvable with an interactive sign-in | For network and transient/temporary errors, or other failures, performing an interactive AcquireToken request does not resolve the issue. Unnecessary interactive sign-in prompts can also frustrate end users. ADAL automatically attempts a single retry for most errors on AcquireTokenSilent failures.<br><br>The client application can also attempt a retry at some later point, but when and how to do it is dependent on the application behavior and desired end-user experience. For example, the application can do an AcquireTokenSilent retry after a few minutes, or in response to some end-user action. An immediate retry will result in the application being throttled, and should not be attempted.<br><br>A subsequent retry failing with the same error does not mean the client should do an interactive request using AcquireToken, as it does not resolve the error.<br><br>See the code in the following section for this specific case and the errors that diagnose it. |
+| **Case 2**: Error is not resolvable with an interactive sign-in | For network and transient/temporary errors, or other failures, performing an interactive AcquireToken request does not resolve the issue. Unnecessary interactive sign-in prompts can also frustrate end users. ADAL automatically attempts a single retry for most errors on AcquireTokenSilent failures.<br><br>The client application can also attempt a retry at some later point, but when and how is dependent on the application behavior and desired end-user experience. For example, the application can do an AcquireTokenSilent retry after a few minutes, or in response to some end-user action. An immediate retry will result in the application being throttled, and should not be attempted.<br><br>A subsequent retry failing with the same error does not mean the client should do an interactive request using AcquireToken, as it does not resolve the error.<br><br>See the code in the following section for this specific case and the errors that diagnose it. |
 
 ### .NET
 
@@ -196,7 +196,7 @@ Error handling in native applications can be defined by two cases:
 
 |  |  |
 |------|-------------|
-| **Case 1**:<br>Non-Retryable Error (most cases) | 1. Do not attempt immediate retry. Present the end-user UI based on the specific error that invokes a retry ("Try to Sign in again", "Download Azure AD broker application", etc). |
+| **Case 1**:<br>Non-Retryable Error (most cases) | 1. Do not attempt immediate retry. Present the end-user UI based on the specific error that invokes a retry (for example, "Try to Sign in again" or "Download Azure AD broker application"). |
 | **Case 2**:<br>Retryable Error | 1. Perform a single retry as the end user may have entered a state that results in a success.<br><br>2. If retry fails, present the end-user UI based on the specific error that invokes a retry ("Try to Sign in again", "Download Azure AD broker app", etc.). |
 
 > [!IMPORTANT]
@@ -208,9 +208,9 @@ Error handling in native applications can be defined by two cases:
 The following guidance provides examples for error handling in conjunction with all non-silent AcquireToken(…) ADAL methods, *except*: 
 
 - AcquireTokenAsync(…, IClientAssertionCertification, …)
-- AcquireTokenAsync(…,ClientCredential, …)
-- AcquireTokenAsync(…,ClientAssertion, …)
-- AcquireTokenAsync(…,UserAssertion,…)   
+- AcquireTokenAsync(…, ClientCredential, …)
+- AcquireTokenAsync(…, ClientAssertion, …)
+- AcquireTokenAsync(…, UserAssertion,…)   
 
 Your code would be implemented as follows:
 
@@ -478,8 +478,8 @@ We've built a [complete sample](https://github.com/Azure-Samples/active-director
 
 ## Error and logging reference
 
-### Logging Personal Identifiable Information (PII) & Organizational Identifiable Information (OII)
-By default, ADAL logging does not capture or log any PII or OII. The library allows app developers to turn this on through a setter in the Logger class. By turning on PII or OII, the app takes responsibility for safely handling highly-sensitive data and complying with any regulatory requirements.
+### Logging Personal Identifiable Information & Organizational Identifiable Information 
+By default, ADAL logging does not capture or log any personal identifiable information or organizational identifiable information. The library allows app developers to turn this on through a setter in the Logger class. By logging personal identifiable information or organizational identifiable information, the app takes responsibility for safely handling highly sensitive data and complying with any regulatory requirements.
 
 ### .NET
 
@@ -587,7 +587,7 @@ Use the comments section that follows, to provide feedback and help us refine an
 <!--Reference style links -->
 
 [AAD-Auth-Libraries]: ./active-directory-authentication-libraries.md
-[AAD-Auth-Scenarios]:authentication-scenarios.md
+[AAD-Auth-Scenarios]:v1-authentication-scenarios.md
 [AAD-Dev-Guide]:azure-ad-developers-guide.md
 [AAD-Integrating-Apps]:quickstart-v1-integrate-apps-with-azure-ad.md
 [AZURE-portal]: https://portal.azure.com

articles/active-directory/develop/active-directory-graph-api-quickstart.md

@@ -83,7 +83,7 @@ For the purposes of this Quickstart guide, you can use the Fiddler Web Debugger
 
 In the example below, you use Fiddler Web Debugger to create a new security group ‘MyTestGroup’ in your Azure AD directory.
 
-**Obtain an access token**: To access Azure AD Graph, clients are required to successfully authenticate to Azure AD first. For more information, see [Authentication scenarios for Azure AD](authentication-scenarios.md).
+**Obtain an access token**: To access Azure AD Graph, clients are required to successfully authenticate to Azure AD first. For more information, see [Authentication scenarios for Azure AD](v1-authentication-scenarios.md).
 
 **Compose and run a query**: Complete the following steps:
 

articles/active-directory/develop/active-directory-how-to-integrate.md

@@ -33,7 +33,7 @@ There are several ways for your application to integrate with Azure AD. Take adv
 
 ### Support Azure AD as a way to sign in to your application
 
-**Reduce sign in friction and reduce support costs.** By using Azure AD to sign in to your application, your users won't have one more name and password to remember. As a developer, you'll have one less password to store and protect. Not having to handle forgotten password resets may be a significant savings alone. Azure AD powers sign in for some of the world's most popular cloud applications, including Office 365 and Microsoft Azure. With hundreds of millions users from millions of organizations, chances are your user is already signed in to Azure AD. Learn more about [adding support for Azure AD sign in](authentication-scenarios.md).
+**Reduce sign in friction and reduce support costs.** By using Azure AD to sign in to your application, your users won't have one more name and password to remember. As a developer, you'll have one less password to store and protect. Not having to handle forgotten password resets may be a significant savings alone. Azure AD powers sign in for some of the world's most popular cloud applications, including Office 365 and Microsoft Azure. With hundreds of millions users from millions of organizations, chances are your user is already signed in to Azure AD. Learn more about [adding support for Azure AD sign in](v1-authentication-scenarios.md).
 
 **Simplify sign up for your application.**  During sign up for your application, Azure AD can send essential information about a user so that you can pre-fill your sign up form or eliminate it completely. Users can sign up for your application using their Azure AD account via a familiar consent experience similar to those found in social media and mobile applications. Any user can sign up and sign in to an application that is integrated with Azure AD without requiring IT involvement. Learn more about [signing-up your application for Azure AD Account login](../../app-service/configure-authentication-provider-aad.md).
 
@@ -93,5 +93,5 @@ Integration with Azure AD comes with benefits that do not require you to write a
 
 [Get started writing code](v2-overview.md#getting-started).
 
-[Sign users in using Microsoft identity platform](authentication-scenarios.md)
+[Sign users in using Microsoft identity platform](v1-authentication-scenarios.md)
 

articles/active-directory/develop/app-types.md

@@ -78,4 +78,4 @@ Each scenario listed in this document includes a subsection that describes its p
 
 ## Next steps
 
-- Learn more about other Azure AD [authentication basics](authentication-scenarios.md)
+- Learn more about other Azure AD [authentication basics](v1-authentication-scenarios.md)