Skip to content

Commit 11c47e4

Browse files
authored
Merge pull request #177481 from MicrosoftDocs/master
10/25 PM Publish
2 parents 16149cc + 564450c commit 11c47e4

File tree

282 files changed

+3113
-975
lines changed

Some content is hidden

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

282 files changed

+3113
-975
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5273,6 +5273,11 @@
52735273
"redirect_url": "/azure/architecture/vdc/networking-virtual-datacenter",
52745274
"redirect_document_id": false
52755275
},
5276+
{
5277+
"source_path_from_root": "/articles/automation/automation-intro.md",
5278+
"redirect_url": "/azure/automation/overview",
5279+
"redirect_document_id": false
5280+
},
52765281
{
52775282
"source_path_from_root": "/articles/automation/automation-quickstart-create-account.md",
52785283
"redirect_url": "/azure/automation/quickstarts/create-account-portal",
@@ -46597,6 +46602,11 @@
4659746602
"source_path_from_root": "/articles/app-service/web-sites-integrate-with-vnet.md",
4659846603
"redirect_url": "/azure/app-service/overview-vnet-integration",
4659946604
"redirect_document_id": false
46605+
},
46606+
{
46607+
"source_path_from_root": "/articles/mariadb/concepts-performance-recommendations.md",
46608+
"redirect_url": "/azure/mariadb/overview",
46609+
"redirect_document_id": false
4660046610
}
4660146611
]
4660246612
}

articles/active-directory-b2c/aad-sspr-technical-profile.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Azure Active Directory B2C (Azure AD B2C) provides support for verifying an emai
2323
This technical profile:
2424

2525
- Doesn't provide an interface to interact with the user. Instead, the user interface is called from a [self-asserted](self-asserted-technical-profile.md) technical profile, or a [display control](display-controls.md) as a [validation technical profile](validation-technical-profile.md).
26-
- Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.
26+
- Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.
2727
- Validates an email address via a verification code.
2828

2929
[!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
@@ -38,7 +38,7 @@ Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, C
3838

3939
The following example shows an Azure AD SSPR technical profile:
4040

41-
```XML
41+
```xml
4242
<TechnicalProfile Id="AadSspr-SendCode">
4343
<DisplayName>Send Code</DisplayName>
4444
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -57,7 +57,6 @@ The **InputClaims** element contains a list of claims to send to Azure AD SSPR.
5757
| --------- | -------- | ----------- |
5858
| emailAddress | Yes | The identifier for the user who owns the email address. The `PartnerClaimType` property of the input claim must be set to `emailAddress`. |
5959

60-
6160
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before sending to the Azure AD SSPR service.
6261

6362
### Output claims
@@ -81,12 +80,11 @@ The following metadata can be used to configure the error messages displayed upo
8180
| UserMessageIfInternalError | No | User error message if the server has encountered an internal error. |
8281
| UserMessageIfThrottled| No | User error message if a request has been throttled.|
8382

84-
8583
### Example: send an email
8684

8785
The following example shows an Azure AD SSPR technical profile that is used to send a code via email.
8886

89-
```XML
87+
```xml
9088
<TechnicalProfile Id="AadSspr-SendCode">
9189
<DisplayName>Send Code</DisplayName>
9290
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -142,7 +140,7 @@ The following metadata can be used to configure the error messages displayed upo
142140

143141
The following example shows an Azure AD SSPR technical profile used to verify the code.
144142

145-
```XML
143+
```xml
146144
<TechnicalProfile Id="AadSspr-VerifyCode">
147145
<DisplayName>Verify Code</DisplayName>
148146
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -154,4 +152,4 @@ The following example shows an Azure AD SSPR technical profile used to verify th
154152
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="emailAddress"/>
155153
</InputClaims>
156154
</TechnicalProfile>
157-
```
155+
```

articles/active-directory-b2c/add-sign-in-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ zone_pivot_groups: b2c-policy-type
2222

2323
## Sign-in flow overview
2424

25-
The sign-in policy lets users:
25+
The sign-in policy lets users:
2626

2727
* Users can sign in with an Azure AD B2C Local Account
2828
* Sign-up or sign-in with a social account
@@ -74,7 +74,7 @@ To add sign-in policy:
7474

7575
## Remove the sign-up link
7676

77-
The **SelfAsserted-LocalAccountSignin-Email** technical profile is a [self-asserted](self-asserted-technical-profile.md), which is invoked during the sign-up or sign-in flow. To remove the sign-up link, set the `setting.showSignupLink` metadata to `false`. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
77+
The **SelfAsserted-LocalAccountSignin-Email** technical profile is a [self-asserted](self-asserted-technical-profile.md), which is invoked during the sign-up or sign-in flow. To remove the sign-up link, set the `setting.showSignupLink` metadata to `false`. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
7878

7979
1. Open the extensions file of your policy. For example, _`SocialAndLocalAccounts/`**`TrustFrameworkExtensions.xml`**_.
8080
1. Find the `ClaimsProviders` element. If the element doesn't exist, add it.
@@ -99,7 +99,7 @@ The **SelfAsserted-LocalAccountSignin-Email** technical profile is a [self-asser
9999

100100
1. Within `<BuildingBlocks>` element, add the following [ContentDefinition](contentdefinitions.md) to reference the version 1.2.0, or newer data URI:
101101

102-
```XML
102+
```xml
103103
<!--
104104
<BuildingBlocks>
105105
<ContentDefinitions>-->

articles/active-directory-b2c/conditional-access-technical-profile.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Web.TPEngine.Providers.ConditionalAccessProtocolProvider, Web.TPEngine, Version=
3030

3131
The following example shows a Conditional Access technical profile:
3232

33-
```XML
33+
```xml
3434
<TechnicalProfile Id="ConditionalAccessEvaluation">
3535
<DisplayName>Conditional Access Provider</DisplayName>
3636
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.ConditionalAccessProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -60,7 +60,6 @@ The **InputClaims** element contains a list of claims to send to Conditional Acc
6060
| IsFederated | Yes |boolean | Indicates whether or not a user signed in with a federated account. The value must be `false`. |
6161
| IsMfaRegistered | Yes |boolean | Indicates whether the user already enrolled a phone number for multi-factor authentication. |
6262

63-
6463
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before sending them to the Conditional Access service.
6564

6665
### Output claims
@@ -78,7 +77,7 @@ The **OutputClaimsTransformations** element may contain a collection of **Output
7877

7978
The following example shows a Conditional Access technical profile that is used to evaluate the sign-in threat.
8079

81-
```XML
80+
```xml
8281
<TechnicalProfile Id="ConditionalAccessEvaluation">
8382
<DisplayName>Conditional Access Provider</DisplayName>
8483
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.ConditionalAccessProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -119,7 +118,6 @@ The **InputClaims** element contains a list of claims to send to Conditional Acc
119118
| --------- | -------- | ----------- |----------- |
120119
| ChallengesSatisfied | Yes | stringCollection| The list of satisfied challenges to remediate the identified threat as return from the evaluation mode, challenges claim.|
121120

122-
123121
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before calling the Conditional Access service.
124122

125123
### Output claims

articles/active-directory-b2c/conditional-access-user-flow.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Automating risk assessment with policy conditions means risky sign-ins are ident
2222
Azure AD B2C evaluates each sign-in event and ensures that all policy requirements are met before granting the user access. During this **Evaluation** phase, the Conditional Access service evaluates the signals collected by Identity Protection risk detections during sign-in events. The outcome of this evaluation process is a set of claims that indicates whether the sign-in should be granted or blocked. The Azure AD B2C policy uses these claims to act within the user flow. An example is blocking access or challenging the user with a specific remediation like multi-factor authentication (MFA). “Block access” overrides all other settings.
2323
::: zone pivot="b2c-custom-policy"
2424
The following example shows a Conditional Access technical profile that is used to evaluate the sign-in threat.
25-
```XML
25+
```xml
2626
<TechnicalProfile Id="ConditionalAccessEvaluation">
2727
<DisplayName>Conditional Access Provider</DisplayName>
2828
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.ConditionalAccessProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -41,7 +41,7 @@ The remediation may also happen through other channels. For example, when the ac
4141
> To remediate the risk successfully within the journey, make sure the *Remediation* technical profile is called after the *Evaluation* technical profile is executed. If *Evaluation* is invoked without *Remediation*, the risk state will be *At risk*.
4242
When the *Evaluation* technical profile recommendation returns `Block`, the call to the *Evaluation* technical profile is not required. The risk state is set to *At risk*.
4343
The following example shows a Conditional Access technical profile used to remediate the identified threat:
44-
```XML
44+
```xml
4545
<TechnicalProfile Id="ConditionalAccessRemediation">
4646
<DisplayName>Conditional Access Remediation</DisplayName>
4747
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.ConditionalAccessProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
@@ -350,7 +350,7 @@ To enable Conditional Access for a user flow, make sure the version supports Con
350350
### Configure claim other than phone number to be used for MFA
351351
In the Conditional Access policy above, the `DoesClaimExist` claim transformation method checks if a claim contains a value, for example if the `strongAuthenticationPhoneNumber` claim contains a phone number.
352352
The claims transformation isn't limited to the `strongAuthenticationPhoneNumber` claim. Depending on the scenario, you can use any other claim. In the following XML snippet, the `strongAuthenticationEmailAddress` claim is checked instead. The claim you choose must have a valid value, otherwise the `IsMfaRegistered` claim will be set to `False`. When set to `False`, the Conditional Access policy evaluation returns a `Block` grant type, preventing the user from completing user flow.
353-
```XML
353+
```xml
354354
<ClaimsTransformation Id="IsMfaRegisteredCT" TransformationMethod="DoesClaimExist">
355355
<InputClaims>
356356
<InputClaim ClaimTypeReferenceId="strongAuthenticationEmailAddress" TransformationClaimType="inputClaim" />

articles/active-directory-b2c/contentdefinitions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ The **ContentDefinition** element contains the following elements:
7575

7676
The **LoadUri** element is used to specify the URL of the HTML5 page for the content definition. The Azure AD B2C [custom policy starter-packs](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) come with content definitions that use Azure AD B2C HTML pages. The **LoadUri** starts with `~`, which is a relative path to your Azure AD B2C tenant.
7777

78-
```XML
78+
```xml
7979
<ContentDefinition Id="api.signuporsignin">
8080
<LoadUri>~/tenant/templates/AzureBlue/unified.cshtml</LoadUri>
8181
...
@@ -84,12 +84,12 @@ The **LoadUri** element is used to specify the URL of the HTML5 page for the con
8484

8585
You can [customize the user interface with HTML templates](customize-ui-with-html.md). When using HTML templates, provide an absolute URL. The following example illustrates a content definition with HTML template:
8686

87-
```XML
87+
```xml
8888
<ContentDefinition Id="api.signuporsignin">
8989
<LoadUri>https://your-storage-account.blob.core.windows.net/your-container/customize-ui.html</LoadUri>
9090
...
9191
</ContentDefinition>
92-
```
92+
```
9393

9494
### DataUri
9595

@@ -98,8 +98,8 @@ The **DataUri** element is used to specify the page identifier. Azure AD B2C use
9898
| Page identifier | Description |
9999
| ----- | ----------- |
100100
| `globalexception` | Displays an error page when an exception or an error is encountered. |
101-
| `providerselection`, `idpselection` | Lists the identity providers that users can choose from during sign-in. |
102-
| `unifiedssp` | Displays a form for signing in with a local account that's based on an email address or a user name. This value also provides the keep me sign-in functionality and Forgot your password? link. |
101+
| `providerselection`, `idpselection` | Lists the identity providers that users can choose from during sign-in. |
102+
| `unifiedssp` | Displays a form for signing in with a local account that's based on an email address or a user name. This value also provides the "keep me sign-in functionality" and "Forgot your password?" link. |
103103
| `unifiedssd` | Displays a form for signing in with a local account that's based on an email address or a username. This page identifier is deprecated. Use the `unifiedssp` page identifier instead. |
104104
| `multifactor` | Verifies phone numbers by using text or voice during sign-up or sign-in. |
105105
| `selfasserted` | Displays a form to collect data from a user. For example, enables users to create or update their profile. |
@@ -108,7 +108,7 @@ The **DataUri** element is used to specify the page identifier. Azure AD B2C use
108108

109109
You can enable [JavaScript client-side code](javascript-and-page-layout.md) by inserting `contract` between `elements` and the page type. For example, `urn:com:microsoft:aad:b2c:elements:contract:page-name:version`.
110110

111-
The [version](page-layout.md) part of the `DataUri` specifies the package of content containing HTML, CSS, and JavaScript for the user interface elements in your policy. If you intend to enable JavaScript client-side code, the elements you base your JavaScript on must be immutable. If they're not immutable, any changes could cause unexpected behavior on your user pages. To prevent these issues, enforce the use of a page layout and specify a page layout version. Doing so ensures that all content definitions youve based your JavaScript on are immutable. Even if you dont intend to enable JavaScript, you still need to specify the page layout version for your pages.
111+
The [version](page-layout.md) part of the `DataUri` specifies the package of content containing HTML, CSS, and JavaScript for the user interface elements in your policy. If you intend to enable JavaScript client-side code, the elements you base your JavaScript on must be immutable. If they're not immutable, any changes could cause unexpected behavior on your user pages. To prevent these issues, enforce the use of a page layout and specify a page layout version. Doing so ensures that all content definitions you've based your JavaScript on are immutable. Even if you don't intend to enable JavaScript, you still need to specify the page layout version for your pages.
112112

113113
The following example shows the **DataUri** of `selfasserted` version `1.2.0`:
114114

@@ -146,7 +146,7 @@ To migrate from the old **DataUri** value (without page contract) to page layout
146146
| `urn:com:microsoft:aad:b2c:elements:multifactor:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:multifactor:1.2.5` |
147147
| `urn:com:microsoft:aad:b2c:elements:multifactor:1.1.0` | `urn:com:microsoft:aad:b2c:elements:contract:multifactor:1.2.5` |
148148

149-
The following example shows the content definition identifiers and the corresponding **DataUri** with [latest page version](page-layout.md):
149+
The following example shows the content definition identifiers and the corresponding **DataUri** with [latest page version](page-layout.md):
150150

151151
```xml
152152
<!--

0 commit comments

Comments
 (0)