Skip to content

Commit 5ff63c2

Browse files
normestanormesta
committed
Fixing a merge conflict
2 parents 33d2cbc + 448a9db commit 5ff63c2

File tree

317 files changed

+7264
-2001
lines changed

Some content is hidden

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

317 files changed

+7264
-2001
lines changed

‎.github/policies/disallow-edits.yml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: GitOps.PullRequestIssueManagement primitive
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Close PRs that contain content for services that have been migrated out of the azure-docs-pr repository.
9+
if:
10+
- payloadType: Pull_Request
11+
- isAction:
12+
action: Opened
13+
- or:
14+
- filesMatchPattern:
15+
matchAny: true
16+
pattern: articles/aks/*
17+
- filesMatchPattern:
18+
matchAny: true
19+
pattern: articles/defender-for-cloud/*
20+
- filesMatchPattern:
21+
matchAny: true
22+
pattern: articles/attestation/*
23+
- filesMatchPattern:
24+
matchAny: true
25+
pattern: articles/confidential-ledger/*
26+
- filesMatchPattern:
27+
matchAny: true
28+
pattern: articles/dedicated-hsm/*
29+
- filesMatchPattern:
30+
matchAny: true
31+
pattern: articles/key-vault/*
32+
- filesMatchPattern:
33+
matchAny: true
34+
pattern: articles/payment-hsm/*
35+
- filesMatchPattern:
36+
matchAny: true
37+
pattern: articles/postgresql/*
38+
- filesMatchPattern:
39+
matchAny: true
40+
pattern: articles/cosmos-db/*
41+
- filesMatchPattern:
42+
matchAny: true
43+
pattern: articles/dms/*
44+
- filesMatchPattern:
45+
matchAny: true
46+
pattern: articles/mariadb/*
47+
- filesMatchPattern:
48+
matchAny: true
49+
pattern: articles/mysql/*
50+
- filesMatchPattern:
51+
matchAny: true
52+
pattern: articles/managed-instance-apache-cassandra/*
53+
- filesMatchPattern:
54+
matchAny: true
55+
pattern: articles/virtual-machines/*
56+
- filesMatchPattern:
57+
matchAny: true
58+
pattern: articles/virtual-machines-scale-sets/*
59+
- filesMatchPattern:
60+
matchAny: true
61+
pattern: articles/container-instances/*
62+
- filesMatchPattern:
63+
matchAny: true
64+
pattern: articles/service-fabric/*
65+
- filesMatchPattern:
66+
matchAny: true
67+
pattern: articles/machine-learning/*
68+
- filesMatchPattern:
69+
matchAny: true
70+
pattern: articles/ai-studio/*
71+
- filesMatchPattern:
72+
matchAny: true
73+
pattern: articles/ai-services/*
74+
- filesMatchPattern:
75+
matchAny: true
76+
pattern: articles/genomics/*
77+
- filesMatchPattern:
78+
matchAny: true
79+
pattern: articles/open-datasets/*
80+
- filesMatchPattern:
81+
matchAny: true
82+
pattern: articles/search/*
83+
- filesMatchPattern:
84+
matchAny: true
85+
pattern: articles/azure-monitor/*
86+
- filesMatchPattern:
87+
matchAny: true
88+
pattern: articles/advisor/*
89+
- filesMatchPattern:
90+
matchAny: true
91+
pattern: articles/chaos-studio/*
92+
- filesMatchPattern:
93+
matchAny: true
94+
pattern: articles/service-health/*
95+
- filesMatchPattern:
96+
matchAny: true
97+
pattern: articles/azure-arc/*
98+
- filesMatchPattern:
99+
matchAny: true
100+
pattern: articles/azure-linux/*
101+
- filesMatchPattern:
102+
matchAny: true
103+
pattern: articles/azure-portal/*
104+
- filesMatchPattern:
105+
matchAny: true
106+
pattern: articles/copilot/*
107+
- filesMatchPattern:
108+
matchAny: true
109+
pattern: articles/lighthouse/*
110+
- filesMatchPattern:
111+
matchAny: true
112+
pattern: articles/quotas/*
113+
- filesMatchPattern:
114+
matchAny: true
115+
pattern: articles/container-registry/*
116+
- filesMatchPattern:
117+
matchAny: true
118+
pattern: articles/kubernetes-fleet/*
119+
then:
120+
- addReply:
121+
reply: >-
122+
@${issueAuthor} - You tried to add content to a folder path that has been removed from this repository. Your pull request will be automatically closed. Submit your changes to the updated repository, which can be identified by clicking the Edit this Document link at the top of any published article for that product or service.
123+
- closePullRequest
124+

‎.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,6 @@
254254
"branch": "main",
255255
"branch_mapping": {}
256256
},
257-
{
258-
"path_to_root": "azure-reference-other-repo",
259-
"url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
260-
"branch": "main",
261-
"branch_mapping": {}
262-
},
263257
{
264258
"path_to_root": "azure-sdk-for-go-samples",
265259
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/confidential-computing/virtual-machine-solutions.md",
5+
"redirect_url": "/azure/virtual-machines/",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/defender-for-iot/organizations/eiot-sensor.md",
510
"redirect_url": "/previous-versions/azure/defender-for-iot/organizations/eiot-sensor",

‎articles/active-directory-b2c/partner-n8identity.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Use this solution for the following scenarios:
2929

3030
## Prerequisites
3131

32-
To get started, you'll need:
32+
To get started, you need:
3333

3434
* An Azure subscription
3535

@@ -55,11 +55,11 @@ The TheAccessHub Admin Tool runs in the N8ID Azure subscription or the customer
5555
6. TheAccessHub Admin Tool syncs user records with Azure AD B2C.
5656
7. Based on TheAccessHub Admin Tool response, Azure AD B2C sends a customized welcome email to users.
5757

58-
## Create a Global Administrator in your Azure AD B2C tenant
58+
## Create an External Identity Provider Administrator and B2C User Flow Administrator in your Azure AD B2C tenant
5959

60-
TheAccessHub Admin Tool permissions act on behalf of a Global Administrator to read user information and conduct changes in your Azure AD B2C tenant. Changes to your regular administrators won't affect TheAccessHub Admin Tool interaction with the tenant.
60+
TheAccessHub Admin Tool permissions act on behalf of an External Identity Provider Administrator and B2C User Flow Administrator to read user information and conduct changes in your Azure AD B2C tenant. Changes to your regular administrators don't affect TheAccessHub Admin Tool interaction with the tenant.
6161

62-
To create a Global Administrator:
62+
To create an External Identity Provider Administrator and B2C User Flow Administrator:
6363

6464
1. In the Azure portal, sign in to your Azure AD B2C tenant as an Administrator.
6565
2. Go to **Microsoft Entra ID** > **Users**.
@@ -70,20 +70,20 @@ To create a Global Administrator:
7070
* Enter the **account name**, such as TheAccessHub Service Account.
7171
7. Select **Show Password**.
7272
8. Copy and save the initial password.
73-
9. To assign the Global Administrator role, for **User**, select the user's current role.
74-
10. Select the **Global Administrator** record.
73+
9. To assign the External Identity Provider Administrator and B2C User Flow Administrator role, for **User**, select the user's current role.
74+
10. Select the **External Identity Provider Administrator** and **B2C User Flow Administrator** records.
7575
11. Select **Create**.
7676

7777
## Connect TheAccessHub Admin Tool to your Azure AD B2C tenant
7878

79-
TheAccessHub Admin Tool uses the Microsoft Graph API to read and make changes to a directory. It acts as a Global Administrator in your tenant. Use the following instructions to add needed permissions.
79+
TheAccessHub Admin Tool uses the Microsoft Graph API to read and make changes to a directory. It acts as an External Identity Provider Administrator and B2C User Flow Administrator in your tenant. Use the following instructions to add needed permissions.
8080

8181
To authorize TheAccessHub Admin Tool to access your directory:
8282

8383
1. Use the credentials N8 Identity provided to sign in to TheAccessHub Admin Tool.
8484
2. Go to **System Admin** > **Azure AD B2C Config**.
8585
3. Select **Authorize Connection**.
86-
4. In the new window, sign in with your Global Administrator account. When you sign in for the first time with the new service account, a prompt to reset your password can appear.
86+
4. In the new window, sign in with your External Identity Provider Administrator and B2C User Flow Administrator account. When you sign in for the first time with the new service account, a prompt to reset your password can appear.
8787
5. Follow the prompts and select **Accept**.
8888

8989
## Configure a new CSR user with your enterprise identity
@@ -189,7 +189,7 @@ With TheAccessHub Admin Tool, you can import data from various databases, LDAPs,
189189

190190
* **Type**: **Database**
191191
* **Database type**: select a supported database
192-
* **Connection URL**: enter a JDBC connection string, such as `jdbc:postgresql://myhost.com:5432/databasename`
192+
* **Connection URL**: enter a Java Database Connectivity (JDBC) connection string, such as `jdbc:postgresql://myhost.com:5432/databasename`
193193
* **Username**: username to access the database
194194
* **Password**: password to access the database
195195
* **Query**: the SQL query to extract customer details, such as `SELECT * FROM mytable;`'
@@ -226,7 +226,7 @@ With TheAccessHub Admin Tool, you can import data from various databases, LDAPs,
226226
8. Select **Next**.
227227
9. In **Search-Mapping configuration**, identify load-record correlation with customers in TheAccessHub Admin Tool.
228228
10. Select source identifying attributes. Match attributes TheAccessHub Admin Tool attributes with the same values. If there's a match, the record is overridden. Otherwise, a new customer is created.
229-
11. Sequence the number of checks. For example, check email first, then first and last name.
229+
11. Sequence the number of checks. For example, check email first, then first and family name.
230230
12. On the left-side menu, select **Data Mapping**.
231231
13. In **Data-Mapping configuration**, assign the TheAccessHub Admin Tool attributes to be populated from your source attributes. Unmapped attributes remain unchanged for customers. If you map the attribute `org_name` with a current organization value, created customers go in the organization.
232232
15. Select **Next**.
@@ -273,7 +273,7 @@ If you occasionally sync TheAccessHub Admin Tool, it might not be up to date wit
273273

274274
For your sign-up custom policies, the following steps enable a secure certificate to notify TheAccessHub Admin Tool of new accounts.
275275

276-
1. Use the credentials N8ID provided to sign in to TheAccessHub Admin Tool.
276+
1. To sign in to TheAccessHub Admin Tool, use the credentials N8ID provided.
277277
2. Go to **System Admin** > **Admin Tools** > **API Security**.
278278
3. Select **Generate**.
279279
4. Copy the **Certificate Password**.
@@ -287,7 +287,7 @@ For your sign-up custom policies, the following steps enable a secure certificat
287287
3. Supply your Azure AD B2C tenant domain and the two Identity Experience Framework IDs from your Identity Experience Framework configuration.
288288
4. Select **Save**.
289289
5. Select **Download** to get a .zip file with basic policies that add customers into TheAccessHub Admin Tool as customers sign up.
290-
6. Use the instructions in [Create user flows](./tutorial-create-user-flows.md?pivots=b2c-custom-policy) to design custom policies in Azure AD B2C.
290+
6. To design custom policies in Azure AD B2C, use the instructions in [Create user flows](./tutorial-create-user-flows.md?pivots=b2c-custom-policy).
291291

292292
## Next steps
293293

0 commit comments

Comments
 (0)