Skip to content

Commit 9100cf2

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into howto-module-twins
I do a git pull upstream main
2 parents 2f97e5d + a26bda5 commit 9100cf2

File tree

3,577 files changed

+67033
-24687
lines changed

Some content is hidden

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

3,577 files changed

+67033
-24687
lines changed

.openpublishing.build.ps1

Lines changed: 0 additions & 17 deletions
This file was deleted.

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,12 @@
590590
"branch": "main",
591591
"branch_mapping": {}
592592
},
593+
{
594+
"path_to_root": "msdocs-jboss-mysql-sample-app",
595+
"url": "https://github.com/Azure-Samples/msdocs-jboss-mysql-sample-app",
596+
"branch": "main",
597+
"branch_mapping": {}
598+
},
593599
{
594600
"path_to_root": "playwright-testing-service",
595601
"url": "https://github.com/microsoft/playwright-testing-service",

.openpublishing.redirection.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3714,6 +3714,36 @@
37143714
"source_path_from_root": "/articles/reliability/resiliency-recommendations/recommend-cosmos-db-nosql.md",
37153715
"redirect_url": "/azure/reliability/reliability-cosmos-db-nosql",
37163716
"redirect_document_id": false
3717+
},
3718+
{
3719+
"source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-portal.md",
3720+
"redirect_url": "/azure/virtual-network/tutorial-create-route-table",
3721+
"redirect_document_id": false
3722+
},
3723+
{
3724+
"source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-powershell.md",
3725+
"redirect_url": "/azure/virtual-network/tutorial-create-route-table",
3726+
"redirect_document_id": false
3727+
},
3728+
{
3729+
"source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-cli.md",
3730+
"redirect_url": "/azure/virtual-network/tutorial-create-route-table",
3731+
"redirect_document_id": false
3732+
},
3733+
{
3734+
"source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-portal.md",
3735+
"redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
3736+
"redirect_document_id": false
3737+
},
3738+
{
3739+
"source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-powershell.md",
3740+
"redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
3741+
"redirect_document_id": false
3742+
},
3743+
{
3744+
"source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-cli.md",
3745+
"redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
3746+
"redirect_document_id": false
37173747
}
37183748
]
37193749
}

articles/active-directory-b2c/age-gating.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Age gating in Azure Active Directory B2C (Azure AD B2C) enables you to identify
2525
>This feature is in public preview. Do not use feature for production applications.
2626
>
2727
28-
When age gating is enabled for a user flow, users are asked for their date of birth, and country of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
28+
When age gating is enabled for a user flow, users are asked for their date of birth, and country/region of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
2929

3030
![Screenshot of age gating information gather flow](./media/age-gating/age-gating-information-gathering.png)
3131

@@ -69,7 +69,7 @@ After your tenant is set up to use age gating, you can then use this feature in
6969
1. To test your policy, select **Run user flow**.
7070
1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
7171
1. Select the **Run user flow** button.
72-
1. Sign-in with a local or social account. Then select your country of residence, and date of birth that simulate a minor.
72+
1. Sign-in with a local or social account. Then select your country/region of residence, and date of birth that simulate a minor.
7373
1. Repeat the test, and select a date of birth that simulates an adult.
7474

7575
When you sign-in as a minor, you should see the following error message: *Unfortunately, your sign on has been blocked. Privacy and online safety laws in your country prevent access to accounts belonging to children.*

articles/active-directory-b2c/custom-domain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Follow these steps to create an Azure Front Door:
108108

109109
1. To choose the directory that contains the Azure subscription that you’d like to use for Azure Front Door and *not* the directory containing your Azure AD B2C tenant select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
110110

111-
1. Follow the steps in [Create Front Door profile - Quick Create](../frontdoor/create-front-door-portal.md#create-front-door-profile---quick-create) to create a Front Door for your Azure AD B2C tenant using the following settings:
111+
1. Follow the steps in [Create Front Door profile - Quick Create](../frontdoor/create-front-door-portal.md#create-an-azure-front-door-profile) to create a Front Door for your Azure AD B2C tenant using the following settings:
112112

113113

114114
|Key |Value |
@@ -202,7 +202,7 @@ To create a CNAME record for your custom domain:
202202
The **default-route** routes the traffic from the client to Azure Front Door. Then, Azure Front Door uses your configuration to send the traffic to Azure AD B2C. Follow these steps to enable the default-route.
203203

204204
1. Select **Front Door manager**.
205-
1. To add enable the **default-route**, first expand an endpoint from the list of endpoints in the Front Door manager. Then, select the **default-route**.
205+
1. To enable the **default-route**, first expand an endpoint from the list of endpoints in the Front Door manager. Then, select the **default-route**.
206206

207207
The following screenshot shows how to select the default-route.
208208

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ The Following are the IDs for a content definition with an ID of `api.phonefacto
318318
| `error_phone_throttled` | You hit the limit on the number of call attempts. Try again shortly. | `>= 1.2.3` |
319319
| `error_throttled` | You hit the limit on the number of verification attempts. Try again shortly. | `>= 1.2.3` |
320320
| `error_incorrect_code` | The verification code you have entered does not match our records. Please try again, or request a new code. | `All` |
321-
| `countryList` | See [the countries list](#phone-factor-authentication-page-example). | `All` |
321+
| `countryList` | See [the countries/regions list](#phone-factor-authentication-page-example). | `All` |
322322
| `error_448` | The phone number you provided is unreachable. | `All` |
323323
| `error_449` | User has exceeded the number of retry attempts. | `All` |
324324
| `verification_code_input_placeholder_text` | Verification code | `All` |

articles/active-directory-b2c/openid-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ client_id=00001111-aaaa-2222-bbbb-3333cccc4444
5959
| {tenant} | Yes | Name of your [Azure AD B2C tenant]( tenant-management-read-tenant-name.md#get-your-tenant-name). If you're using a [custom domain](custom-domain.md), replace `tenant.b2clogin.com` with your domain, such as `fabrikam.com`. |
6060
| {policy} | Yes | The user flow or policy that the app runs. Specify the name of a user flow that you create in your Azure AD B2C tenant. For example: `b2c_1_sign_in`, `b2c_1_sign_up`, or `b2c_1_edit_profile`. |
6161
| client_id | Yes | The application ID that the [Azure portal](https://portal.azure.com/) assigned to your application. |
62-
| nonce | Yes | A value included in the request (generated by the application) that is included in the resulting ID token as a claim. The application can then verify this value to mitigate token replay attacks. The value is typically a randomized unique string that can be used to identify the origin of the request. |
62+
| nonce | Recommended | A value included in the request (generated by the application) that is included in the resulting ID token as a claim. The application can then verify this value to mitigate token replay attacks. The value is typically a randomized unique string that can be used to identify the origin of the request. |
6363
| response_type | Yes | Must include an ID token for OpenID Connect. If your web application also needs tokens for calling a web API, you can use `code+id_token`.|
6464
| scope | Yes | A space-separated list of scopes. The `openid` scope indicates a permission to sign in the user and get data about the user in the form of ID tokens. The `offline_access` scope is optional for web applications. It indicates that your application need a *refresh token* for extended access to resources. The `https://{tenant-name}/{app-id-uri}/{scope}` indicates a permission to protected resources, such as a web API. For more information, see [Request an access token](access-tokens.md#scopes). |
6565
| prompt | No | The type of user interaction that you require. The only valid value at this time is `login`, which forces the user to enter their credentials on that request. |

0 commit comments

Comments
 (0)