Skip to content

Commit f0afb77

Browse files
committed
Merge branch 'main' into szuber/update-azure-introduction-new-section
2 parents f6793e3 + e91aa0d commit f0afb77

File tree

1,575 files changed

+19922
-12941
lines changed

Some content is hidden

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

1,575 files changed

+19922
-12941
lines changed

.openpublishing.publish.config.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -849,9 +849,15 @@
849849
"branch_mapping": {}
850850
},
851851
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
852+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
853+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
854+
"branch": "main",
855+
"branch_mapping": {}
856+
},
857+
{
858+
"path_to_root": "cosmos-db-nosql-python-samples",
859+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
860+
"branch": "main",
855861
"branch_mapping": {}
856862
},
857863
{

.openpublishing.redirection.active-directory.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3433,17 +3433,17 @@
34333433
},
34343434
{
34353435
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3436+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373437
"redirect_document_id": false
34383438
},
34393439
{
34403440
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3441+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423442
"redirect_document_id": false
34433443
},
34443444
{
34453445
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3446-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3446+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34473447
"redirect_document_id": false
34483448
},
34493449
{
@@ -5536,6 +5536,21 @@
55365536
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55375537
"redirect_document_id": true
55385538
},
5539+
{
5540+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5541+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5542+
"redirect_document_id": false
5543+
},
5544+
{
5545+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5546+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5547+
"redirect_document_id": false
5548+
},
5549+
{
5550+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5551+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5552+
"redirect_document_id": false
5553+
},
55395554
{
55405555
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415556
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5511,6 +5511,11 @@
55115511
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
55125512
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
55135513
"redirect_document_id": false
5514+
},
5515+
{
5516+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
5517+
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
5518+
"redirect_document_id": false
55145519
}
55155520
]
55165521
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
3030
"redirect_url": "/azure/devtest-labs/samples-powershell",
3131
"redirect_document_id": false
32-
}
32+
},
33+
{
34+
"source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
35+
"redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
36+
"redirect_document_id": false
37+
}
3338
]
3439
}

.openpublishing.redirection.communication-services.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.openpublishing.redirection.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path_from_root": "/articles/api-management/developer-portal-use-community-widgets.md",
1010
"redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/sentinel/whats-new-archive.md",
15+
"redirect_url": "/azure/sentinel/whats-new",
16+
"redirect_document_id": false
1217
},
1318
{
1419
"source_path": "articles/backup/sap-hana-db-manage.md",
@@ -6423,11 +6428,6 @@
64236428
"redirect_url": "/azure/storage/blobs/storage-encrypt-decrypt-blobs-key-vault",
64246429
"redirect_document_id": false
64256430
},
6426-
{
6427-
"source_path_from_root": "/articles/storage/blobs/storage-encrypt-decrypt-blobs-key-vault.md",
6428-
"redirect_url": "/azure/storage/blobs/client-side-encryption",
6429-
"redirect_document_id": false
6430-
},
64316431
{
64326432
"source_path_from_root": "/articles/storage/blobs/Storage-blob-performance-tiers.md",
64336433
"redirect_url": "/azure/storage/common/storage-account-overview",
@@ -29363,6 +29363,11 @@
2936329363
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6.md",
2936429364
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell",
2936529365
"redirect_document_id": false
29366+
},
29367+
{
29368+
"source_path_from_root": "/articles/cloud-shell/example-terraform-bash.md",
29369+
"redirect_url": "/azure/developer/terraform/quickstart-configure",
29370+
"redirect_document_id": false
2936629371
}
2936729372
]
2936829373
}
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3-
"docSetProductName": "Azure Active Directory application management",
4-
"rootDirectory": "articles/active-directory/manage-apps/",
5-
"docLinkSettings": {
6-
"linkFormat": "relative",
7-
"relativeLinkPrefix": "/azure/active-directory/manage-apps"
8-
},
9-
"inclusionCriteria": {
10-
"excludePullRequestTitles": true,
11-
"minAdditionsToFile" : 10,
12-
"maxFilesChanged": 50,
13-
"labels": [
14-
"label:active-directory/svc",
15-
"label:app-mgmt/subsvc"
16-
]
17-
},
18-
"areas": [
19-
{
20-
"name": ".",
21-
"heading": "Azure Active Directory application management"
22-
}
23-
]
24-
}
2+
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3+
"docSetProductName": "Azure Active Directory application management",
4+
"rootDirectory": "articles/active-directory/manage-apps/",
5+
"docLinkSettings": {
6+
"linkFormat": "relative",
7+
"relativeLinkPrefix": "/azure/active-directory/manage-apps"
8+
},
9+
"inclusionCriteria": {
10+
"omitPullRequestTitles": true,
11+
"minAdditionsToFile": 10,
12+
"maxFilesChanged": 50,
13+
"labels": [
14+
"label:active-directory/svc",
15+
"label:app-mgmt/subsvc"
16+
]
17+
},
18+
"areas": [
19+
{
20+
"name": ".",
21+
"heading": "Azure Active Directory application management"
22+
}
23+
]
24+
}

articles/active-directory-b2c/api-connector-samples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: kengaderdus
66
manager: CelesteDG
77

88
ms.author: kengaderdus
9-
ms.date: 07/16/2021
9+
ms.date: 11/03/2022
1010
ms.custom: mvc
1111
ms.topic: sample
1212
ms.service: active-directory

articles/active-directory-b2c/identity-provider-azure-ad-single-tenant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ If you want to get the `family_name` and `given_name` claims from Azure AD, you
8181
1. Select **Add optional claim**.
8282
1. For the **Token type**, select **ID**.
8383
1. Select the optional claims to add, `family_name` and `given_name`.
84-
1. Select **Add**. If **Turn on the Microsoft Graph email permission (required for claims to appear in token)** appears, enable it, and then select **Add** again.
84+
1. Select **Add**. If **Turn on the Microsoft Graph profile permission (required for claims to appear in token)** appears, enable it, and then select **Add** again.
8585
8686
## [Optional] Verify your app authenticity
8787

articles/active-directory-b2c/sign-in-options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: Sign-in options supported by Azure AD B2C
33
titleSuffix: Azure AD B2C
4-
description: Learn about the options for sign-up and sign-in you can use with Azure Active Directory B2C, including username and password, email, phone, or federation with social or external identity providers.
4+
description: Learn about the sign-up and sign-in options you can use with Azure Active Directory B2C, including username and password, email, phone, or federation with social or external identity providers.
55
services: active-directory-b2c
66
author: kengaderdus
77
manager: CelesteDG
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 05/10/2021
12+
ms.date: 11/03/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515

0 commit comments

Comments
 (0)