Skip to content

Commit a7a0914

Browse files
megvanhuygenmegvanhuygen
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into service-fabric-application-secret-store
2 parents 308ffbf + 3e53442 commit a7a0914

File tree

3,318 files changed

+40447
-22293
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,318 files changed

+40447
-22293
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ articles/directories.txt
2222
AzureMigration.ps1
2323

2424
!/.vscode/extensions.json
25-
articles/data-lake-analytics/.vscode/settings.json
2625
.gitignore
26+
**/.vscode/settings.json

‎.markdownlint.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"MD007": false,
1010
"MD009": false,
1111
"MD010": false,
12+
"MD011": true,
1213
"MD012": false,
1314
"MD013": false,
1415
"MD014": false,
@@ -32,10 +33,28 @@
3233
"MD035": false,
3334
"MD036": false,
3435
"MD037": false,
36+
"MD038": true,
37+
"MD039": true,
3538
"MD040": false,
3639
"MD041": false,
3740
"MD042": false,
41+
"MD043": true,
42+
"MD044": {
43+
"code_blocks": false,
44+
"names": [
45+
".NET",
46+
"ASP.NET",
47+
"Azure",
48+
"JavaScript",
49+
"NuGet",
50+
"PowerShell",
51+
"macOS",
52+
"C#",
53+
"CLI"
54+
]
55+
},
3856
"MD045": false,
3957
"MD046": false,
40-
"MD047": false
58+
"MD047": false,
59+
"MD048": true
4160
}

‎.openpublishing.redirection.json

Lines changed: 814 additions & 359 deletions
Large diffs are not rendered by default.

‎CODEOWNERS

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2-
# articles/storage/ @tamram @robinsh
3-
# articles/virtual-machines/ @iainfoulds @cynthn
4-
# articles/virtual-machines/linux/ @iainfoulds @cynthn
5-
# articles/virtual-machines/windows/ @iainfoulds @cynthn
6-
# articles/application-insights/ @SergeyKanzhelev
7-
# articles/cosmos-db/ @mimig1
8-
9-
# All Articles
10-
articles/ @apex-docs-pr-reviewers
11-
122
# Cognitive Services
133
articles/cognitive-services/ @diberry @erhopf, @nitinme
144

155
# DevOps
16-
176
articles/ansible/ @TomArcherMsft
187
articles/chef/ @TomArcherMsft
198
articles/jenkins/ @TomArcherMsft
209
articles/terraform/ @TomArcherMsft
2110

2211
# Governance
23-
2412
articles/governance/ @DCtheGeek
13+
14+
# Configuration
15+
*.json @SyntaxC4 @snoviking @arob98
16+
.acrolinx-config.edn @MonicaRush @arob98
17+
articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @arob98

‎FETCH_HEAD

Whitespace-only changes.

‎articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@
372372
href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
373373
- name: Cookie definitions
374374
href: cookie-definitions.md
375+
- name: Error codes
376+
href: error-codes.md
375377
- name: Region availability & data residency
376378
href: active-directory-b2c-reference-tenant-type.md
377379
- name: Enable billing

‎articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-basic.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,17 +298,19 @@ After your RESTful service is protected by the client ID (username) and secret,
298298

299299
## Step 5: Upload the policy to your tenant
300300

301-
1. In the [Azure portal](https://portal.azure.com), switch to the [context of your Azure AD B2C tenant](active-directory-b2c-navigate-to-b2c-context.md), and then open **Azure AD B2C**.
301+
1. In the [Azure portal](https://portal.azure.com), select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
302302
303-
2. Select **Identity Experience Framework**.
303+
1. In the Azure portal, search for and select **Azure AD B2C**.
304304

305-
3. Open **All Policies**.
305+
1. Select **Identity Experience Framework**.
306306

307-
4. Select **Upload Policy**.
307+
1. Open **All Policies**.
308308

309-
5. Select the **Overwrite the policy if it exists** check box.
309+
1. Select **Upload Policy**.
310310

311-
6. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
311+
1. Select the **Overwrite the policy if it exists** check box.
312+
313+
1. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
312314

313315
## Step 6: Test the custom policy by using Run Now
314316

‎articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-cert.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,19 @@ To support client certificate authentication in your custom policy, change the t
9696

9797
## Step 4: Upload the policy to your tenant
9898

99-
1. In the [Azure portal](https://portal.azure.com), switch to the [context of your Azure AD B2C tenant](active-directory-b2c-navigate-to-b2c-context.md), and then select **Azure AD B2C**.
99+
1. In the [Azure portal](https://portal.azure.com), select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
100100

101-
2. Select **Identity Experience Framework**.
101+
1. In the Azure portal, search for and select **Azure AD B2C**.
102102

103-
3. Select **All Policies**.
103+
1. Select **Identity Experience Framework**.
104104

105-
4. Select **Upload Policy**.
105+
1. Select **All Policies**.
106106

107-
5. Select the **Overwrite the policy if it exists** check box.
107+
1. Select **Upload Policy**.
108108

109-
6. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
109+
1. Select the **Overwrite the policy if it exists** check box.
110+
111+
1. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
110112

111113
## Step 5: Test the custom policy by using Run Now
112114
1. Open **Azure AD B2C Settings**, and then select **Identity Experience Framework**.

‎articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,9 @@ After you add the new claim, the relying party code looks like this:
333333

334334
## Step 7: Upload the policy to your tenant
335335

336-
1. In the [Azure portal](https://portal.azure.com), switch to the [context of your Azure AD B2C tenant](active-directory-b2c-navigate-to-b2c-context.md), and then open **Azure AD B2C**.
336+
1. In the [Azure portal](https://portal.azure.com), Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
337+
338+
1. In the Azure portal, search for and select **Azure AD B2C**.
337339

338340
1. Select **Identity Experience Framework**.
339341

‎articles/active-directory-b2c/active-directory-b2c-how-to-enable-billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ The management of Azure AD B2C using role-based access control is not affected b
130130

131131
Azure AD B2C tenants can be moved to another subscription if the source and destination subscriptions exist within the same Azure Active Directory tenant.
132132

133-
To learn how to move Azure resources like your Azure AD B2C tenant to another subscription, see [Move resources to new resource group or subscription](../azure-resource-manager/resource-group-move-resources.md).
133+
To learn how to move Azure resources like your Azure AD B2C tenant to another subscription, see [Move resources to new resource group or subscription](../azure-resource-manager/management/move-resource-group-and-subscription.md).
134134

135135
Before you initiate the move, be sure to read the entire article to fully understand the limitations and requirements for such a move. In addition to instructions for moving resources, it includes critical information like a pre-move checklist and how to validate the move operation.
136136

0 commit comments

Comments
 (0)