Skip to content

Commit 158ed3f

Browse files
authored
Merge branch 'MicrosoftDocs:main' into Broken-link-bwren
2 parents fc8b917 + 97d3500 commit 158ed3f

File tree

2,797 files changed

+40601
-20054
lines changed

Some content is hidden

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

2,797 files changed

+40601
-20054
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@
986986
".openpublishing.redirection.azure-percept.json",
987987
".openpublishing.redirection.azure-productivity.json",
988988
".openpublishing.redirection.azure-australia.json",
989+
".openpublishing.redirection.aks.json",
989990
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
990991
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
991992
"articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.active-directory.json

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10845,8 +10845,47 @@
1084510845
"source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
1084610846
"redirect_url": "/azure/azure-percept/index",
1084710847
"redirect_document_id": false
10848+
},
10849+
{
10850+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
10851+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10852+
"redirect_document_id": false
10853+
},
10854+
{
10855+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
10856+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10857+
"redirect_document_id": false
10858+
},
10859+
{
10860+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
10861+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10862+
"redirect_document_id": false
10863+
},
10864+
{
10865+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
10866+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10867+
"redirect_document_id": false
10868+
},
10869+
{
10870+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
10871+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10872+
"redirect_document_id": false
10873+
},
10874+
{
10875+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
10876+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10877+
"redirect_document_id": false
10878+
},
10879+
{
10880+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
10881+
"redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
10882+
"redirect_document_id": false
10883+
},
10884+
{
10885+
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10886+
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10887+
"redirect_document_id": false
1084810888
}
1084910889

10850-
1085110890
]
1085210891
}

.openpublishing.redirection.aks.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/aks/azure-cni-overlay.md",
5+
"redirect_url": "/azure/aks",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,11 @@
510510
"source_path_from_root": "/articles/azure-monitor/logs/workspace-design-service-providers.md" ,
511511
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
512512
"redirect_document_id": false
513+
},
514+
{
515+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-transition-hybrid.md" ,
516+
"redirect_url": "/azure/azure-monitor/containers/container-insights-onboard",
517+
"redirect_document_id": false
513518
}
514519
]
515520
}

.openpublishing.redirection.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
22
"redirections": [
3-
{
3+
{
44
"source_path": "articles/api-management/zone-redundancy.md",
55
"redirect_url": "/azure/availability-zones/migrate-api-mgt",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path": "articles/api-management/developer-portal-implement-widgets.md",
10+
"redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path": "articles/virtual-machines/linux/find-unattached-nics.md",
1015
"redirect_url": "/previous-versions/azure/virtual-machines/linux/find-unattached-nics",
@@ -6923,6 +6928,11 @@
69236928
"redirect_url": "/azure/azure-government/compare-azure-government-global-azure",
69246929
"redirect_document_id": false
69256930
},
6931+
{
6932+
"source_path_from_root": "/articles/azure-government/documentation-government-overview.md",
6933+
"redirect_url": "/azure/azure-government/documentation-government-plan-security",
6934+
"redirect_document_id": false
6935+
},
69266936
{
69276937
"source_path_from_root": "/articles/security/compliance/azure-services-in-fedramp-auditscope.md",
69286938
"redirect_url": "/azure/azure-government/compliance/azure-services-in-fedramp-auditscope",
@@ -22348,6 +22358,11 @@
2234822358
"redirect_url": "/azure/storage/common/customer-managed-keys-configure-key-vault",
2234922359
"redirect_document_id": false
2235022360
},
22361+
{
22362+
"source_path_from_root": "/articles/storage/common/customer-managed-keys-configure-key-vault.md",
22363+
"redirect_url": "/azure/storage/common/customer-managed-keys-configure-existing-account",
22364+
"redirect_document_id": false
22365+
},
2235122366
{
2235222367
"source_path_from_root": "/articles/storage/common/encryption-customer-managed-keys.md",
2235322368
"redirect_url": "/azure/storage/common/customer-managed-keys-overview",

articles/active-directory-b2c/configure-authentication-sample-react-spa-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ In the sample folder, open the *config.json* file. This file contains informatio
171171

172172
|Section |Key |Value |
173173
|---------|---------|---------|
174-
|credentials|tenantName| The first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). For example: `contoso`.|
174+
|credentials|tenantName| Your Azure AD B2C [domain/tenant name](tenant-management.md#get-your-tenant-name). For example: `contoso.ommicrosoft.com`.|
175175
|credentials|clientID| The web API application ID from step [2.1](#21-register-the-web-api-application). In the [earlier diagram](#app-registration), it's the application with **App ID: 2**.|
176176
|credentials| issuer| (Optional) The token issuer `iss` claim value. Azure AD B2C by default returns the token in the following format: `https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/`. Replace `<your-tenant-name>` with the first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). Replace `<your-tenant-ID>` with your [Azure AD B2C tenant ID](tenant-management.md#get-your-tenant-id). |
177177
|policies|policyName|The user flow or custom policy that you created in [step 1](#step-1-configure-your-user-flow). If your application uses multiple user flows or custom policies, specify only one. For example, use the sign-up or sign-in user flow.|
@@ -182,7 +182,7 @@ Your final configuration file should look like the following JSON:
182182
```json
183183
{
184184
"credentials": {
185-
"tenantName": "<your-tenant-name>",
185+
"tenantName": "<your-tenant-name>.ommicrosoft.com",
186186
"clientID": "<your-webapi-application-ID>",
187187
"issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
188188
},

articles/active-directory-b2c/enable-authentication-web-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ Under the project root folder, create a *config.json* file, and then add to it t
443443
```json
444444
{
445445
"credentials": {
446-
"tenantName": "<your-tenant-name>",
446+
"tenantName": "<your-tenant-name>.onmicrosoft.com",
447447
"clientID": "<your-webapi-application-ID>",
448448
"issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
449449
},
@@ -470,7 +470,7 @@ In the *config.json* file, update the following properties:
470470

471471
|Section |Key |Value |
472472
|---------|---------|---------|
473-
| credentials | tenantName | The first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso`).|
473+
| credentials | tenantName | Your Azure AD B2C [tenant name/domain name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
474474
| credentials |clientID | The web API application ID. In the [preceding diagram](#app-registration-overview), it's the application with *App ID: 2*. To learn how to get your web API application registration ID, see [Prerequisites](#prerequisites). |
475475
| credentials | issuer| The token issuer `iss` claim value. By default, Azure AD B2C returns the token in the following format: `https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/`. Replace `<your-tenant-name>` with the first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). Replace `<your-tenant-ID>` with your [Azure AD B2C tenant ID](tenant-management.md#get-your-tenant-id). |
476476
| policies | policyName | The user flows, or custom policy. To learn how to get your user flow or policy, see [Prerequisites](#prerequisites).|

articles/active-directory-b2c/index.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ landingContent:
2929
- text: What is Azure AD B2C?
3030
url: overview.md
3131
- text: Compare solutions for External Identities
32-
url: ../active-directory/external-identities/external-identities-overview.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
32+
url: ../active-directory/external-identities/external-identities-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
3333
- text: Get started with Azure AD B2C
3434
url: tutorial-create-tenant.md
3535
- text: Technical and feature overview
@@ -43,13 +43,13 @@ landingContent:
4343
- linkListType: learn
4444
links:
4545
- text: Authentication and authorization
46-
url: ../active-directory/develop/authentication-vs-authorization.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
46+
url: ../active-directory/develop/authentication-vs-authorization.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
4747
- text: Tokens
48-
url: ../active-directory/develop/security-tokens.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
48+
url: ../active-directory/develop/security-tokens.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
4949
- text: Protocols
50-
url: ../active-directory/develop/v2-app-types.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
50+
url: ../active-directory/develop/v2-app-types.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
5151
- text: Authentication library
52-
url: ../active-directory/develop/msal-overview.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
52+
url: ../active-directory/develop/msal-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
5353
- text: 'Build a web site: HTML, CSS, JavaScript'
5454
url: /learn/modules/build-simple-website/
5555

Binary file not shown.
61.8 KB
Loading

0 commit comments

Comments
 (0)