fix merge conflict

Author: stevestein

.openpublishing.redirection.json

@@ -4042,7 +4042,7 @@
     },
     {
       "source_path": "articles/azure-resource-manager/templates/template-tutorial-create-encrypted-storage-accounts.md",
-      "redirect_url": "articles/azure-resource-manager/templates/template-tutorial-use-template-reference",
+      "redirect_url": "/azure/azure-resource-manager/templates/template-tutorial-use-template-reference",
       "redirect_document_id": false
     },
     {
@@ -50419,21 +50419,21 @@
       "source_path": "articles/cognitive-services/speech-service/quickstart-voice-assistant-java-jre.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/voice-assistants?pivots=programming-language-java&tabs=jre"
     },
-	{
+    {
       "source_path": "articles/security/fundamentals/choose-ad-authn.md",
       "redirect_url": "/azure/active-directory/hybrid/choose-ad-authn",
-	  "redirect_document_id": true
+      "redirect_document_id": true
     },
-	{
-	  "source_path": "articles/azure-monitor/app/opencensus-go.md",
+    {
+      "source_path": "articles/azure-monitor/app/opencensus-go.md",
       "redirect_url": "/azure/azure-monitor/overview",
       "redirect_document_id": false
-	},
-	{
-	  "source_path": "articles/azure-monitor/app/opencensus-local-forwarder.md",
+    },
+    {
+      "source_path": "articles/azure-monitor/app/opencensus-local-forwarder.md",
       "redirect_url": "/azure/azure-monitor/overview",
       "redirect_document_id": false
-	},
+    },
     {
       "source_path": "articles/cognitive-services/Speech-Service/quickstart-voice-assistant-csharp-uwp.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/voice-assistants?pivots=programming-language-csharp&tabs=uwp"
@@ -50442,6 +50442,10 @@
       "source_path": "articles/load-balancer/use-existing-lb-vmss-cli.md",
       "redirect_url": "/azure/load-balancer/configure-vm-scale-set-cli"
     },
+    {
+      "source_path": "articles/cognitive-services/speech-service/how-to-custom-speech-test-data.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/how-to-custom-speech-test-and-train"
+    },
     {
       "source_path": "articles/sql-database/sql-database-paas-index.yml",
       "redirect_url": "/azure/sql-database/sql-database-technical-overview"

articles/active-directory-b2c/claim-resolver-overview.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 03/20/2020
+ms.date: 03/30/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -72,7 +72,7 @@ The following sections list available claim resolvers.
 | {OIDC:Prompt} | The `prompt` query string parameter. | login |
 | {OIDC:RedirectUri} |The `redirect_uri`  query string parameter. | https://jwt.ms |
 | {OIDC:Resource} |The `resource`  query string parameter. | N/A |
-| {OIDC:scope} |The `scope`  query string parameter. | openid |
+| {OIDC:Scope} |The `scope`  query string parameter. | openid |
 | {OIDC:Username}| The [resource owner password credentials flow](ropc-custom.md) user's username.| [email protected]| 
 
 ### Context
@@ -158,7 +158,7 @@ The following example shows a RESTful technical profile with this scenario:
   <InputClaims>
     <InputClaim ClaimTypeReferenceId="userLanguage" DefaultValue="{Culture:LCID}" AlwaysUseDefaultValue="true" />
     <InputClaim ClaimTypeReferenceId="policyName" DefaultValue="{Policy:PolicyId}" AlwaysUseDefaultValue="true" />
-    <InputClaim ClaimTypeReferenceId="scope" DefaultValue="{OIDC:scope}" AlwaysUseDefaultValue="true" />
+    <InputClaim ClaimTypeReferenceId="scope" DefaultValue="{OIDC:Scope}" AlwaysUseDefaultValue="true" />
     <InputClaim ClaimTypeReferenceId="clientId" DefaultValue="{OIDC:ClientId}" AlwaysUseDefaultValue="true" />
   </InputClaims>
   <UseTechnicalProfileForSessionManagement ReferenceId="SM-Noop" />
@@ -171,7 +171,7 @@ Using claim resolvers, you can prepopulate the sign-in name or direct sign-in to
 
 ### Dynamic UI customization
 
-Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints to dynamically render the page content. For example, this allows the ability to modify the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization.md). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
+Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints to dynamically render the page content. For example, this feature allows the ability to modify the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization.md#configure-dynamic-custom-page-content-uri). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
 
 The following example passes in the query string parameter named **campaignId** with a value of `Hawaii`, a **language** code of `en-US`, and **app** representing the client ID:
 

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

@@ -25,7 +25,7 @@ Complete the steps in [Get started with custom policies](custom-policy-get-start
 
 [!INCLUDE [active-directory-b2c-html-how-to](../../includes/active-directory-b2c-html-how-to.md)]
 
-## 4. Modify the extensions file
+### 4. Modify the extensions file
 
 To configure UI customization, copy the **ContentDefinition** and its child elements from the base file to the extensions file.
 
@@ -55,17 +55,17 @@ To configure UI customization, copy the **ContentDefinition** and its child elem
 
 1. Save the extensions file.
 
-## 5. Upload and test your updated custom policy
+### 5. Upload and test your updated custom policy
 
-### 5.1 Upload the custom policy
+#### 5.1 Upload the custom policy
 
 1. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your tenant.
 1. Search for and select **Azure AD B2C**.
 1. Under **Policies**, select **Identity Experience Framework**.
 1. Select **Upload custom policy**.
 1. Upload the extensions file that you previously changed.
 
-### 5.2 Test the custom policy by using **Run now**
+#### 5.2 Test the custom policy by using **Run now**
 
 1. Select the policy that you uploaded, and then select **Run now**.
 1. You should be able to sign up by using an email address.

articles/active-directory-b2c/predicates.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 02/24/2020
+ms.date: 03/30/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -41,7 +41,7 @@ The **Predicate** element contains the following attributes:
 | Attribute | Required | Description |
 | --------- | -------- | ----------- |
 | Id | Yes | An identifier that's used for the predicate. Other elements can use this identifier in the policy. |
-| Method | Yes | The method type to use for validation. Possible values: **IsLengthRange**, **MatchesRegex**, **IncludesCharacters**, or **IsDateRange**. The **IsLengthRange** value checks whether the length of a string claim value is within the range of minimum and maximum parameters specified. The **MatchesRegex** value checks whether a string claim value matches a regular expression. The **IncludesCharacters** value checks whether a string claim value contains a character set. The **IsDateRange** value checks whether a date claim value is between a range of minimum and maximum parameters specified. |
+| Method | Yes | The method type to use for validation. Possible values: [IsLengthRange](#islengthrange), [MatchesRegex](#matchesregex), [IncludesCharacters](#includescharacters), or [IsDateRange](#isdaterange).  |
 | HelpText | No | An error message for users if the check fails. This string can be localized using the [language customization](localization.md) |
 
 The **Predicate** element contains the following elements:
@@ -63,7 +63,19 @@ The **Parameter** element contains the following attributes:
 | ------- | ----------- | ----------- |
 | Id | 1:1 | The identifier of the parameter. |
 
-The following example shows a `IsLengthRange` method with the parameters `Minimum` and `Maximum` that specify the length range of the string:
+### Predicate methods
+
+#### IsLengthRange
+
+The IsLengthRange method checks whether the length of a string claim value is within the range of minimum and maximum parameters specified. The predicate element supports the following parameters:
+
+| Parameter | Required | Description |
+| ------- | ----------- | ----------- |
+| Maximum | Yes | The maximum number of characters that can be entered. |
+| Minimum | Yes | The minimum number of characters that must be entered. |
+
+
+The following example shows a IsLengthRange method with the parameters `Minimum` and `Maximum` that specify the length range of the string:
 
 ```XML
 <Predicate Id="IsLengthBetween8And64" Method="IsLengthRange" HelpText="The password must be between 8 and 64 characters.">
@@ -74,6 +86,14 @@ The following example shows a `IsLengthRange` method with the parameters `Minimu
 </Predicate>
 ```
 
+#### MatchesRegex
+
+The MatchesRegex method checks whether a string claim value matches a regular expression. The predicate element supports the following parameters:
+
+| Parameter | Required | Description |
+| ------- | ----------- | ----------- |
+| RegularExpression | Yes | The regular expression pattern to match. |
+
 The following example shows a `MatchesRegex` method with the parameter `RegularExpression` that specifies a regular expression:
 
 ```XML
@@ -84,6 +104,14 @@ The following example shows a `MatchesRegex` method with the parameter `RegularE
 </Predicate>
 ```
 
+#### IncludesCharacters
+
+The IncludesCharacters method checks whether a string claim value contains a character set. The predicate element supports the following parameters:
+
+| Parameter | Required | Description |
+| ------- | ----------- | ----------- |
+| CharacterSet | Yes | The set of characters that can be entered. For example, lowercase characters  `a-z`, uppercase characters `A-Z`, digits `0-9`, or a list of symbols, such as `@#$%^&amp;*\-_+=[]{}|\\:',?/~"();!`. |
+
 The following example shows a `IncludesCharacters` method with the parameter `CharacterSet` that specifies the set of characters:
 
 ```XML
@@ -94,7 +122,16 @@ The following example shows a `IncludesCharacters` method with the parameter `Ch
 </Predicate>
 ```
 
-The following example shows a `IsDateRange` method with the parameters `Minimum` and `Maximum` that specify the date range with a format of `yyyy-MM-dd` and `Today`.
+#### IsDateRange
+
+The IsDateRange method checks whether a date claim value is between a range of minimum and maximum parameters specified. The predicate element supports the following parameters:
+
+| Parameter | Required | Description |
+| ------- | ----------- | ----------- |
+| Maximum | Yes | The largest possible date that can be entered. The format of the date follows `yyyy-mm-dd` convention, or `Today`. |
+| Minimum | Yes | The smallest possible date that can be entered. The format of the date follows `yyyy-mm-dd` convention, or `Today`.|
+
+The following example shows a `IsDateRange` method with the parameters `Minimum` and `Maximum` that specify the date range with a format of `yyyy-mm-dd` and `Today`.
 
 ```XML
 <Predicate Id="DateRange" Method="IsDateRange" HelpText="The date must be between 1970-01-01 and today.">
@@ -384,3 +421,7 @@ In your claim type, add **PredicateValidationReference** element and specify the
   <PredicateValidationReference Id="CustomDateRange" />
 </ClaimType>
  ```
+
+## Next steps
+
+- Learn how to [Configure password complexity using custom policies in Azure Active Directory B2C](custom-policy-password-complexity.md) using predicate validations.

articles/active-directory-b2c/secure-rest-api.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/27/2020
+ms.date: 03/30/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -182,6 +182,8 @@ The following is an example of a RESTful technical profile configured with an HT
 
 ## OAuth2 bearer authentication 
 
+[!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
+
 Bearer token authentication is defined in [OAuth2.0 Authorization Framework: Bearer Token Usage (RFC 6750)](https://www.rfc-editor.org/rfc/rfc6750.txt). In bearer token authentication, Azure AD B2C sends an HTTP request with a token in the authorization header.
 
 ```http
@@ -193,6 +195,7 @@ A bearer token is an opaque string. It can be a JWT access token or any string t
 - **Bearer token**. To be able to send the bearer token in the Restful technical profile, your policy needs to first acquire the bearer token and then use it in the RESTful technical profile.  
 - **Static bearer token**. Use this approach when your REST API issues a long-term access token. To use a static bearer token, create a policy key and make a reference from the RESTful technical profile to your policy key. 
 
+
 ## Using OAuth2 Bearer  
 
 The following steps demonstrate how to use client credentials to obtain a bearer token and pass it into the Authorization header of the REST API calls.  

articles/azure-monitor/insights/vminsights-log-search.md

@@ -261,7 +261,7 @@ let Today = now(); VMComputer | extend DaysSinceBoot = Today - BootTime | summar
 ### Summary of Azure VMs by image, location, and SKU
 
 ```kusto
-VMComputer | where AzureLocation != "" | summarize by ComputerName, AzureImageOffering, AzureLocation, AzureImageSku
+VMComputer | where AzureLocation != "" | summarize by Computer, AzureImageOffering, AzureLocation, AzureImageSku
 ```
 
 ### List the physical memory capacity of all managed computers
@@ -279,7 +279,7 @@ VMComputer | summarize arg_max(TimeGenerated, *) by _ResourceId | project Comput
 ### Find all processes with "sql" in the command line
 
 ```kusto
-VMComputer | where CommandLine contains_cs "sql" | summarize arg_max(TimeGenerated, *) by _ResourceId
+VMProcess | where CommandLine contains_cs "sql" | summarize arg_max(TimeGenerated, *) by _ResourceId
 ```
 
 ### Find a machine (most recent record) by resource name
@@ -303,7 +303,7 @@ VMProcess | where Machine == "m-559dbcd8-3130-454d-8d1d-f624e57961bc" | summariz
 ### List all computers running SQL Server
 
 ```kusto
-VMComputer | where AzureResourceName in ((search in (VMProcess) "\*sql\*" | distinct Machine)) | distinct Computer
+VMComputer | where AzureResourceName in ((search in (VMProcess) "*sql*" | distinct Machine)) | distinct Computer
 ```
 
 ### List all unique product versions of curl in my datacenter
@@ -315,7 +315,7 @@ VMProcess | where ExecutableName == "curl" | distinct ProductVersion
 ### Create a computer group of all computers running CentOS
 
 ```kusto
-VMComputer | where OperatingSystemFullName contains_cs "CentOS" | distinct ComputerName
+VMComputer | where OperatingSystemFullName contains_cs "CentOS" | distinct Computer
 ```
 
 ### Bytes sent and received trends

articles/azure-monitor/platform/alerts-metric-create-templates.md

@@ -1513,6 +1513,10 @@ This section will describe Azure Resource Manager templates for three scenarios
 - Monitoring all virtual machines (in one Azure region) in a subscription.
 - Monitoring a list of virtual machines (in one Azure region) in a subscription.
 
+> [!NOTE]
+>
+> In a metric alert rule that monitors multiple resources, only one condition is allowed.
+
 ### Static threshold alert on all virtual machines in one or more resource groups
 
 This template will create a static threshold metric alert rule that monitors Percentage CPU for all virtual machines (in one Azure region) in one or more resource groups.

articles/azure-monitor/platform/alerts-metric-overview.md

@@ -137,6 +137,10 @@ You can specify the scope of monitoring by a single metric alert rule in one of
 
 Creating metric alert rules that monitor multiple resources is like [creating any other metric alert](alerts-metric.md) that monitors a single resource. Only difference is that you would select all the resources you want to monitor. You can also create these rules through [Azure Resource Manager templates](../../azure-monitor/platform/alerts-metric-create-templates.md#template-for-a-metric-alert-that-monitors-multiple-resources). You will receive individual notifications for each monitored resource.
 
+> [!NOTE]
+>
+> In a metric alert rule that monitors multiple resources, only one condition is allowed.
+
 ## Typical latency
 
 For metric alerts, typically you will get notified in under 5 minutes if you set the alert rule frequency to be 1 min. In cases of heavy load for notification systems, you might see a longer latency.

articles/azure-resource-manager/templates/toc.yml

@@ -68,7 +68,7 @@
   - name: Advanced
     items:
     - name: Utilize template reference
-      href: template-tutorial-create-encrypted-storage-accounts.md
+      href: template-tutorial-use-template-reference.md
     - name: Create multiple instances
       displayName: iteration,copy
       href: template-tutorial-create-multiple-instances.md

articles/backup/azure-file-share-backup-overview.md

@@ -39,6 +39,15 @@ Azure file share backup is a native, cloud based backup solution that protects y
 
 7. The backup and restore job monitoring data is pushed to the Azure Backup Monitoring service. This allows you to monitor cloud backups for your file shares in a single dashboard. In addition, you can also configure alerts or email notifications when backup health is affected. Emails are sent via the Azure email service.
 
+## Backup costs
+
+Azure File share backup is a snapshot-based solution and storage charges incurred for snapshots are billed along with Azure Files Usage as per the pricing details mentioned [here](https://azure.microsoft.com/pricing/details/storage/files/).
+
+However, the protected instance fee for leveraging the backup solution is according to the pricing model described under the [Backup For Azure Files](https://azure.microsoft.com/pricing/details/backup/) section. Currently, the actual price has been updated only for West Central US. For other regions, exact prices will be updated soon with some regional variations, but using the same pricing model.
+
+>[!NOTE]
+>During preview, there is no "Protected Instance fee" and you will be charged only for snapshots according to the pricing mentioned [here](https://azure.microsoft.com/pricing/details/storage/files/).
+
 ## Next steps
 
 * Learn how to [Back up Azure file shares](backup-afs.md)