Skip to content

Commit f34ec10

Browse files
authored
Merge branch 'main' into jonathany-ms/add-collect-helm-release-doc
2 parents 7b932a7 + d661e3e commit f34ec10

File tree

4,104 files changed

+73011
-32357
lines changed

Some content is hidden

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

4,104 files changed

+73011
-32357
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: 133 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,105 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/lab-services/class-type-adobe-creative-cloud.md",
5+
"redirect_url": "/previous-versions/azure/lab-services/class-type-adobe-creative-cloud",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/lab-services/class-type-arcgis.md",
10+
"redirect_url": "/previous-versions/azure/lab-services/class-type-arcgis",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/lab-services/class-type-autodesk.md",
15+
"redirect_url": "/previous-versions/azure/lab-services/class-type-autodesk",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/lab-services/class-type-big-data-analytics.md",
20+
"redirect_url": "/previous-versions/azure/lab-services/class-type-big-data-analytics",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/lab-services/class-type-database-management.md",
25+
"redirect_url": "/previous-versions/azure/lab-services/class-type-database-management",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/lab-services/class-type-deep-learning-natural-language-processing.md",
30+
"redirect_url": "/previous-versions/azure/lab-services/class-type-deep-learning-natural-language-processing",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/lab-services/class-type-ethical-hacking.md",
35+
"redirect_url": "/previous-versions/azure/lab-services/class-type-ethical-hacking",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/lab-services/class-type-matlab.md",
40+
"redirect_url": "/previous-versions/azure/lab-services/class-type-matlab",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/lab-services/class-type-jupyter-notebook.md",
45+
"redirect_url": "/previous-versions/azure/lab-services/class-type-jupyter-notebook",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/lab-services/class-type-networking-gns3.md",
50+
"redirect_url": "/previous-versions/azure/lab-services/class-type-networking-gns3",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/lab-services/class-type-pltw.md",
55+
"redirect_url": "/previous-versions/azure/lab-services/class-type-pltw",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/lab-services/class-type-react-linux.md",
60+
"redirect_url": "/previous-versions/azure/lab-services/class-type-react-linux",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/lab-services/class-type-react-windows.md",
65+
"redirect_url": "/previous-versions/azure/lab-services/class-type-react-windows",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/lab-services/class-type-rstudio-linux.md",
70+
"redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-linux",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/lab-services/class-type-rstudio-windows.md",
75+
"redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-windows",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/lab-services/class-type-shell-scripting-linux.md",
80+
"redirect_url": "/previous-versions/azure/lab-services/class-type-shell-scripting-linux",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/lab-services/class-type-solidworks.md",
85+
"redirect_url": "/previous-versions/azure/lab-services/class-type-solidworks",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/lab-services/class-type-sql-server.md",
90+
"redirect_url": "/previous-versions/azure/lab-services/class-type-sql-server",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/lab-services/class-types.md",
95+
"redirect_url": "/previous-versions/azure/lab-services/class-types",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/lab-services/how-to-create-lab-accounts.md",
100+
"redirect_url": "/previous-versions/azure/lab-services/how-to-create-lab-accounts",
101+
"redirect_document_id": false
102+
},
3103
{
4104
"source_path": "articles/devtest-labs/devtest-lab-integrate-ci-cd.md",
5105
"redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
@@ -108,7 +208,7 @@
108208
{
109209
"source_path_from_root": "/articles/application-insights/app-insights-analytics-diagnostics.md",
110210
"redirect_url": "/azure/application-insights/app-insights-analytics",
111-
"redirect_document_id": true
211+
"redirect_document_id": false
112212
},
113213
{
114214
"source_path_from_root": "/articles/application-insights/app-insights-analytics-reference.md",
@@ -118,7 +218,7 @@
118218
{
119219
"source_path_from_root": "/articles/application-insights/app-insights-azure.md",
120220
"redirect_url": "/azure/application-insights/app-insights-overview",
121-
"redirect_document_id": true
221+
"redirect_document_id": false
122222
},
123223
{
124224
"source_path_from_root": "/articles/application-insights/app-insights-developer-analytics.md",
@@ -133,7 +233,7 @@
133233
{
134234
"source_path_from_root": "/articles/application-insights/app-insights-java-eclipse.md",
135235
"redirect_url": "/azure/application-insights/app-insights-java-quick-start",
136-
"redirect_document_id": true
236+
"redirect_document_id": false
137237
},
138238
{
139239
"source_path_from_root": "/articles/application-insights/app-insights-pricing-enterprise-details.md",
@@ -3330,6 +3430,11 @@
33303430
"redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
33313431
"redirect_document_id": false
33323432
},
3433+
{
3434+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md",
3435+
"redirect_url": "/azure/vpn-gateway/point-to-site-certificate-gateway",
3436+
"redirect_document_id": false
3437+
},
33333438
{
33343439
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-openvpn-clients.md",
33353440
"redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
@@ -3599,6 +3704,31 @@
35993704
"source_path_from_root": "/articles/third-party-notices.md",
36003705
"redirect_url": "https://github.com/MicrosoftDocs/azure-docs/blob/main/ThirdPartyNotices.md",
36013706
"redirect_document_id": false
3707+
},
3708+
{
3709+
"source_path_from_root": "/articles/reliability/glossary.md",
3710+
"redirect_url": "/azure/reliability/overview",
3711+
"redirect_document_id": false
3712+
},
3713+
{
3714+
"source_path_from_root": "/articles/reliability/resiliency-recommendations/recommend-cosmos-db-nosql.md",
3715+
"redirect_url": "/azure/reliability/reliability-cosmos-db-nosql",
3716+
"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
36023732
}
36033733
]
36043734
}

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/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)