Skip to content

Commit 620e31e

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents 131da72 + 35340b0 commit 620e31e

File tree

3,808 files changed

+42506
-22203
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,808 files changed

+42506
-22203
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@
947947
{
948948
"path_to_root": "azure-cosmos-mongodb-dotnet",
949949
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
950-
"branch": "quickstart-test",
950+
"branch": "main",
951951
"branch_mapping": {}
952952
}
953953
],

.openpublishing.redirection.active-directory.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
35+
"redirect_url": "/azure/active-directory/fundamentals/whats-new",
36+
"redirect_document_id": true
37+
},
3338
{
3439
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
3540
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -10801,6 +10806,16 @@
1080110806
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
1080210807
"redirect_document_id": false
1080310808
},
10809+
{
10810+
"source_path": "articles/active-directory/saas-apps/iprova-provisioning-tutorial.md",
10811+
"redirect_url": "/azure/active-directory/saas-apps/zenya-provisioning-tutorial",
10812+
"redirect_document_id": false
10813+
},
10814+
{
10815+
"source_path": "articles/active-directory/saas-apps/iprova-tutorial.md",
10816+
"redirect_url": "/azure/active-directory/saas-apps/zenya-tutorial",
10817+
"redirect_document_id": false
10818+
},
1080410819
{
1080510820
"source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
1080610821
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",

.openpublishing.redirection.azure-monitor.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-monitor/change/change-analysis-powershell.md",
5+
"redirect_url": "/azure/azure-monitor/change/change-analysis",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/azure-monitor/app/snapshot-debugger.md",
510
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger",
@@ -365,6 +370,51 @@
365370
"source_path_from_root": "/articles/azure-monitor/insights/redis-cache-insights-overview.md" ,
366371
"redirect_url": "/azure/azure-cache-for-redis/redis-cache-insights-overview",
367372
"redirect_document_id": false
373+
},
374+
{
375+
"source_path_from_root": "/articles/azure-monitor/logs/ingestion-time-transformations.md" ,
376+
"redirect_url": "/azure/azure-monitor/essentials/data-collection-transformations",
377+
"redirect_document_id": false
378+
},
379+
{
380+
"source_path_from_root": "/articles/azure-monitor/logs/tutorial-ingestion-time-transformations.md" ,
381+
"redirect_url": "/azure/azure-monitor/logs/tutorial-workspace-transformations-portal",
382+
"redirect_document_id": false
383+
},
384+
{
385+
"source_path_from_root": "/articles/azure-monitor/logs/tutorial-ingestion-time-transformations-api.md" ,
386+
"redirect_url": "/azure/azure-monitor/logs/tutorial-workspace-transformations-api",
387+
"redirect_document_id": false
388+
},
389+
{
390+
"source_path_from_root": "/articles/azure-monitor/logs/tutorial-custom-logs.md" ,
391+
"redirect_url": "/azure/azure-monitor/logs/tutorial-logs-ingestion-portal",
392+
"redirect_document_id": false
393+
},
394+
{
395+
"source_path_from_root": "/articles/azure-monitor/logs/tutorial-custom-logs-api.md" ,
396+
"redirect_url": "/azure/azure-monitor/logs/tutorial-logs-ingestion-api",
397+
"redirect_document_id": false
398+
},
399+
{
400+
"source_path_from_root": "/articles/azure-monitor/agents/data-sources.md" ,
401+
"redirect_url": "/azure/azure-monitor/essentials/data-sources",
402+
"redirect_document_id": false
403+
},
404+
{
405+
"source_path_from_root": "/articles/azure-monitor/essentials/data-collection-rule-transformations.md" ,
406+
"redirect_url": "/azure/azure-monitor/essentials/data-collection-transformations-structure",
407+
"redirect_document_id": false
408+
},
409+
{
410+
"source_path_from_root": "/articles/azure-monitor/logs/custom-logs-overview.md" ,
411+
"redirect_url": "/azure/azure-monitor/logs/logs-ingestion-api-overview",
412+
"redirect_document_id": false
413+
},
414+
{
415+
"source_path_from_root": "/articles/azure-monitor/insights/cosmosdb-insights-overview.md" ,
416+
"redirect_url": "/azure/cosmos-db/cosmosdb-insights-overview",
417+
"redirect_document_id": false
368418
}
369419
]
370420
}

.openpublishing.redirection.defender-for-iot.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_from_root": "/articles/defender-for-iot/organizations/appliance-catalog/appliance-catalog-overview.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/appliance-catalog/index",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/plan-network-monitoring.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-network-monitoring",

.openpublishing.redirection.json

Lines changed: 56 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/api-management/zone-redundancy.md",
5+
"redirect_url": "/azure/availability-zones/migrate-api-mgt",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/virtual-machines/linux/find-unattached-nics.md",
510
"redirect_url": "/previous-versions/azure/virtual-machines/linux/find-unattached-nics",
@@ -10383,8 +10388,8 @@
1038310388
},
1038410389
{
1038510390
"source_path_from_root": "/articles/azure-supportability/classic-deployment-model-quota-increase-requests.md",
10386-
"redirect_url": "/azure/azure-portal/supportability/classic-deployment-model-quota-increase-requests",
10387-
"redirect_document_id": true
10391+
"redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
10392+
"redirect_document_id": false
1038810393
},
1038910394
{
1039010395
"source_path_from_root": "/articles/azure-supportability/how-to-create-azure-support-request.md",
@@ -10428,44 +10433,79 @@
1042810433
},
1042910434
{
1043010435
"source_path_from_root": "/articles/azure-supportability/low-priority-quota.md",
10431-
"redirect_url": "/azure/azure-portal/supportability/spot-quota",
10432-
"redirect_document_id": true
10436+
"redirect_url": "/azure/quotas/spot-quota",
10437+
"redirect_document_id": false
1043310438
},
1043410439
{
1043510440
"source_path_from_root": "/articles/azure-supportability/networking-quota-requests.md",
10436-
"redirect_url": "/azure/azure-portal/supportability/networking-quota-requests",
10437-
"redirect_document_id": true
10441+
"redirect_url": "/azure/quotas/networking-quota-requests",
10442+
"redirect_document_id": false
1043810443
},
1043910444
{
1044010445
"source_path_from_root": "/articles/azure-supportability/per-vm-quota-requests.md",
10441-
"redirect_url": "/azure/azure-portal/supportability/per-vm-quota-requests",
10442-
"redirect_document_id": true
10446+
"redirect_url": "/azure/quotas/per-vm-quota-requests",
10447+
"redirect_document_id": false
1044310448
},
1044410449
{
1044510450
"source_path_from_root": "/articles/azure-supportability/regional-quota-requests.md",
10446-
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
10447-
"redirect_document_id": true
10451+
"redirect_url": "/azure/quotas/regional-quota-requests",
10452+
"redirect_document_id": false
1044810453
},
1044910454
{
1045010455
"source_path_from_root": "/articles/azure-supportability/resource-manager-core-quotas-request.md",
10451-
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
10456+
"redirect_url": "/azure/quotas/regional-quota-requests",
1045210457
"redirect_document_id": false
1045310458
},
1045410459
{
1045510460
"source_path_from_root": "/articles/azure-portal/supportability/resource-manager-core-quotas-request.md",
10456-
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
10461+
"redirect_url": "/azure/quotas/regional-quota-requests",
1045710462
"redirect_document_id": false
1045810463
},
1045910464
{
10460-
"source_path_from_root": "/articles/azure-supportability/sku-series-unavailable.md",
10461-
"redirect_url": "/azure/azure-portal/supportability/sku-series-unavailable",
10462-
"redirect_document_id": true
10465+
"source_path_from_root": "/articles/azure-supportability/sku-series-unavailable.md",
10466+
"redirect_url": "/troubleshoot/azure/general/region-access-request-process",
10467+
"redirect_document_id": false
1046310468
},
1046410469
{
1046510470
"source_path_from_root": "/articles/azure-portal/supportability/low-priority-quota.md",
10466-
"redirect_url": "/azure/azure-portal/supportability/spot-quota",
10471+
"redirect_url": "/azure/quotas/spot-quota",
1046710472
"redirect_document_id": false
1046810473
},
10474+
{
10475+
"source_path_from_root": "/articles/azure-portal/supportability/quotas-overview.md",
10476+
"redirect_url": "/azure/quotas/quotas-overview",
10477+
"redirect_document_id": true
10478+
},
10479+
{
10480+
"source_path_from_root": "/articles/azure-portal/supportability/view-quotas.md",
10481+
"redirect_url": "/azure/quotas/view-quotas",
10482+
"redirect_document_id": true
10483+
},
10484+
{
10485+
"source_path_from_root": "/articles/azure-portal/supportability/per-vm-quota-requests.md",
10486+
"redirect_url": "/azure/quotas/per-vm-quota-requests",
10487+
"redirect_document_id": true
10488+
},
10489+
{
10490+
"source_path_from_root": "/articles/azure-portal/supportability/regional-quota-requests.md",
10491+
"redirect_url": "/azure/quotas/regional-quota-requests",
10492+
"redirect_document_id": true
10493+
},
10494+
{
10495+
"source_path_from_root": "/articles/azure-portal/supportability/spot-quota.md",
10496+
"redirect_url": "/azure/quotas/spot-quota",
10497+
"redirect_document_id": true
10498+
},
10499+
{
10500+
"source_path_from_root": "/articles/azure-portal/supportability/classic-deployment-model-quota-increase-requests.md",
10501+
"redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
10502+
"redirect_document_id": true
10503+
},
10504+
{
10505+
"source_path_from_root": "/articles/azure-portal/supportability/networking-quota-requests.md",
10506+
"redirect_url": "/azure/quotas/networking-quota-requests",
10507+
"redirect_document_id": true
10508+
},
1046910509
{
1047010510
"source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
1047110511
"redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",

articles/active-directory-b2c/configure-authentication-in-azure-web-app-file-based.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: "b2c-support"
1515

1616
# Configure authentication in an Azure Web App configuration file by using Azure AD B2C
1717

18-
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [File-based configuration in Azure App Service authentication](/azure/app-service/configure-authentication-file-based) article.
18+
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [File-based configuration in Azure App Service authentication](../app-service/configure-authentication-file-based.md) article.
1919

2020
## Overview
2121

@@ -141,6 +141,5 @@ From your server code, the provider-specific tokens are injected into the reques
141141

142142
## Next steps
143143

144-
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/azure/app-service/configure-authentication-user-identities).
145-
* Lear how to [Work with OAuth tokens in Azure App Service authentication](/azure/app-service/configure-authentication-oauth-tokens).
146-
144+
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](../app-service/configure-authentication-user-identities.md).
145+
* Learn how to [Work with OAuth tokens in Azure App Service authentication](../app-service/configure-authentication-oauth-tokens.md).

articles/active-directory-b2c/configure-authentication-in-azure-web-app.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: "b2c-support"
1515

1616
# Configure authentication in an Azure Web App by using Azure AD B2C
1717

18-
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [configure your App Service or Azure Functions app to login using an OpenID Connect provider](/azure/app-service/configure-authentication-provider-openid-connect) article.
18+
This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [configure your App Service or Azure Functions app to login using an OpenID Connect provider](../app-service/configure-authentication-provider-openid-connect.md) article.
1919

2020
## Overview
2121

@@ -94,7 +94,7 @@ To register your application, follow these steps:
9494
1. For the **Client Secret** provide the Web App (client) secret from [step 2.2](#step-22-create-a-client-secret).
9595
9696
> [!TIP]
97-
> Your client secret will be stored as an app setting to ensure secrets are stored in a secure fashion. You can update that setting later to use [Key Vault references](/azure/app-service/app-service-key-vault-references) if you wish to manage the secret in Azure Key Vault.
97+
> Your client secret will be stored as an app setting to ensure secrets are stored in a secure fashion. You can update that setting later to use [Key Vault references](../app-service/app-service-key-vault-references.md) if you wish to manage the secret in Azure Key Vault.
9898
9999
1. Keep the rest of the settings with the default values.
100100
1. Press the **Add** button to finish setting up the identity provider.
@@ -119,6 +119,5 @@ From your server code, the provider-specific tokens are injected into the reques
119119
120120
## Next steps
121121
122-
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/azure/app-service/configure-authentication-user-identities).
123-
* Lear how to [Work with OAuth tokens in Azure App Service authentication](/azure/app-service/configure-authentication-oauth-tokens).
124-
122+
* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](../app-service/configure-authentication-user-identities.md).
123+
* Learn how to [Work with OAuth tokens in Azure App Service authentication](../app-service/configure-authentication-oauth-tokens.md).

articles/active-directory-b2c/display-control-time-based-one-time-password.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 12/09/2021
12+
ms.date: 07/20/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -116,4 +116,8 @@ The following screenshot illustrates a TOTP verification page.
116116

117117
## Next steps
118118

119-
- Learn how to validate a TOTP code in [Define an Azure AD MFA technical profile](multi-factor-auth-technical-profile.md).
119+
- Learn more about multifactor authentication in [Enable multifactor authentication in Azure Active Directory B2C](multi-factor-authentication.md?pivots=b2c-custom-policy)
120+
121+
- Learn how to validate a TOTP code in [Define an Azure AD MFA technical profile](multi-factor-auth-technical-profile.md).
122+
123+
- Explore a sample [Azure AD B2C MFA with TOTP using any Authenticator app custom policy in GitHub](https://github.com/azure-ad-b2c/samples/tree/master/policies/totp).

articles/active-directory-b2c/enable-authentication-python-web-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ if __name__ == "__main__":
416416
417417
## Step 6: Run your web app
418418
419-
In the Terminal, run the app by entering the following command, which runs the Flask development server. The development server looks for `app.py` by default. Then, open your browser and navigate to the web app URL: <http://localhost:5000>.
419+
In the Terminal, run the app by entering the following command, which runs the Flask development server. The development server looks for `app.py` by default. Then, open your browser and navigate to the web app URL: `http://localhost:5000`.
420420
421421
# [Linux](#tab/linux)
422422

articles/active-directory-b2c/error-codes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 06/16/2021
12+
ms.date: 07/18/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -20,6 +20,7 @@ The following errors can be returned by the Azure Active Directory B2C service.
2020

2121
| Error code | Message | Notes |
2222
| ---------- | ------- | ----- |
23+
| `AADB2C90001` | This user already exists, and profile '{0}' does not allow the same user to be created again. | [Sign-up flow](add-sign-up-and-sign-in-policy.md) |
2324
| `AADB2C90002` | The CORS resource '{0}' returned a 404 not found. | [Hosting the page content](customize-ui-with-html.md#hosting-the-page-content) |
2425
| `AADB2C90006` | The redirect URI '{0}' provided in the request is not registered for the client ID '{1}'. | [Register a web application](tutorial-register-applications.md), [Sending authentication requests](openid-connect.md#send-authentication-requests) |
2526
| `AADB2C90007` | The application associated with client ID '{0}' has no registered redirect URIs. | [Register a web application](tutorial-register-applications.md), [Sending authentication requests](openid-connect.md#send-authentication-requests) |

0 commit comments

Comments
 (0)