Skip to content

Commit c28c2f1

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-ignite-disk-bursting
2 parents dbb9ae0 + fe9f77b commit c28c2f1

File tree

81 files changed

+1674
-924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1674
-924
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,11 @@
377377
"url": "https://github.com/microsoft/immersive-reader-sdk",
378378
"branch": "master",
379379
"branch_mapping": {}
380+
},
381+
{
382+
"path_to_root": "azure-cosmosdb-java-v2",
383+
"url": "https://github.com/Azure/azure-cosmosdb-java",
384+
"branch": "master"
380385
}
381386
],
382387
"branch_target_mapping": {

articles/active-directory-b2c/predicates.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 09/10/2018
11+
ms.date: 10/28/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -27,6 +27,8 @@ The following diagram shows the relationship between the elements:
2727

2828
The **Predicate** element defines a basic validation to check the value of a claim type and returns `true` or `false`. The validation is done by using a specified **Method** element and a set of **Parameter** elements relevant to the method. For example, a predicate can check whether the length of a string claim value is within the range of minimum and maximum parameters specified, or whether a string claim value contains a character set. The **UserHelpText** element provides an error message for users if the check fails. The value of **UserHelpText** element can be localized using [language customization](localization.md).
2929

30+
The **Predicates** element must appear directly following the **ClaimsSchema** element within the [BuildingBlocks](buildingblocks.md) element.
31+
3032
The **Predicates** element contains the following element:
3133

3234
| Element | Occurrences | Description |
@@ -108,6 +110,8 @@ The following example shows a `IsDateRange` method with the parameters `Minimum`
108110

109111
While the predicates define the validation to check against a claim type, the **PredicateValidations** group a set of predicates to form a user input validation that can be applied to a claim type. Each **PredicateValidation** element contains a set of **PredicateGroup** elements that contain a set of **PredicateReference** elements that points to a **Predicate**. To pass the validation, the value of the claim should pass all of the tests of any predicate under all of the **PredicateGroup** with their set of **PredicateReference** elements.
110112

113+
The **PredicateValidations** element must appear directly following the **Predicates** element within the [BuildingBlocks](buildingblocks.md) element.
114+
111115
```XML
112116
<PredicateValidations>
113117
<PredicateValidation Id="">
@@ -190,7 +194,7 @@ With **Predicates** and **PredicateValidationsInput** you can control the comple
190194
- **Lowercase** using the `IncludesCharacters` method, validates that the password contains a lowercase letter.
191195
- **Uppercase** using the `IncludesCharacters` method, validates that the password contains an uppercase letter.
192196
- **Number** using the `IncludesCharacters` method, validates that the password contains a digit.
193-
- **Symbol** using the `IncludesCharacters` method, validates that the password contains one of following symbols `@#$%^&*\-_+=[]{}|\:',?/~"();!`
197+
- **Symbol** using the `IncludesCharacters` method, validates that the password contains one of several symbol characters.
194198
- **PIN** using the `MatchesRegex` method, validates that the password contains numbers only.
195199
- **AllowedAADCharacters** using the `MatchesRegex` method, validates that the password only invalid character was provided.
196200
- **DisallowedWhitespace** using the `MatchesRegex` method, validates that the password doesn't begin or end with a whitespace character.
@@ -229,7 +233,7 @@ With **Predicates** and **PredicateValidationsInput** you can control the comple
229233
<Predicate Id="Symbol" Method="IncludesCharacters">
230234
<UserHelpText>a symbol</UserHelpText>
231235
<Parameters>
232-
<Parameter Id="CharacterSet">@#$%^&amp;*\-_+=[]{}|\:',?/`~"();!</Parameter>
236+
<Parameter Id="CharacterSet">@#$%^&amp;*\-_+=[]{}|\\:',.?/`~"();!</Parameter>
233237
</Parameters>
234238
</Predicate>
235239

articles/active-directory/authentication/howto-mfa-nps-extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ If you need to kick off a new round of synchronization, us the instructions in [
116116
There are two factors that affect which authentication methods are available with an NPS extension deployment:
117117

118118
1. The password encryption algorithm used between the RADIUS client (VPN, Netscaler server, or other) and the NPS servers.
119-
- **PAP** supports all the authentication methods of Azure MFA in the cloud: phone call, one-way text message, mobile app notification, and mobile app verification code.
119+
- **PAP** supports all the authentication methods of Azure MFA in the cloud: phone call, one-way text message, mobile app notification, OATH hardware tokens, and mobile app verification code.
120120
- **CHAPV2** and **EAP** support phone call and mobile app notification.
121121

122122
> [!NOTE]

0 commit comments

Comments
 (0)