Skip to content

Commit fcd7ded

Browse files
hangwan97hangwan97
authored
Merge branch 'main' into consumption_cli
2 parents a35ff3c + 2360c57 commit fcd7ded

File tree

1,070 files changed

+20124
-9788
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,070 files changed

+20124
-9788
lines changed

‎.openpublishing.publish.config.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,13 @@
233233
{
234234
"path_to_root": "azure-functions-durable-js",
235235
"url": "https://github.com/Azure/azure-functions-durable-js",
236-
"branch": "main",
236+
"branch": "v2.x",
237+
"branch_mapping": {}
238+
},
239+
{
240+
"path_to_root": "azure-functions-durable-js-v3",
241+
"url": "https://github.com/Azure/azure-functions-durable-js",
242+
"branch": "v3.x",
237243
"branch_mapping": {}
238244
},
239245
{
@@ -536,6 +542,12 @@
536542
"branch": "main",
537543
"branch_mapping": {}
538544
},
545+
{
546+
"path_to_root": "azure-cosmos-db-mongodb-mern-web-app",
547+
"url": "https://github.com/Azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app/",
548+
"branch": "main",
549+
"branch_mapping": {}
550+
},
539551
{
540552
"path_to_root": "azure-cosmos-spark",
541553
"url": "https://github.com/Azure/azure-cosmosdb-spark",
@@ -996,7 +1008,7 @@
9961008
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9971009
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9981010
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
999-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1011+
"articles/iot/.openpublishing.redirection.iot.json",
10001012
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
10011013
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10021014
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4491,6 +4491,11 @@
44914491
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
44924492
"redirect_document_id": false
44934493
},
4494+
{
4495+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md",
4496+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-user-profile-info",
4497+
"redirect_document_id": false
4498+
},
44944499
{
44954500
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44964501
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7274,6 +7279,11 @@
72747279
{
72757280
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72767281
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
7282+
"redirect_document_id": false
7283+
},
7284+
{
7285+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
7286+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
72777287
"redirect_document_id": true
72787288
},
72797289
{

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/console.md",
50+
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",
51+
"redirect_document_id": false
52+
},
4853
{
4954
"source_path_from_root": "/articles/azure-monitor/app/resource-manager-web-app.md",
5055
"redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-web-app",

‎.openpublishing.redirection.azure-resource-manager.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,6 +1410,11 @@
14101410
"redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-custom-role-definition",
14111411
"redirect_document_id": false
14121412
},
1413+
{
1414+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/concepts-custom-role-definition.md",
1415+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1416+
"redirect_document_id": false
1417+
},
14131418
{
14141419
"source_path_from_root": "/articles/managed-applications/concepts-managed-applications-built-in-policy.md",
14151420
"redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-built-in-policy",
@@ -1600,6 +1605,11 @@
16001605
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-portal",
16011606
"redirect_document_id": false
16021607
},
1608+
{
1609+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/publish-portal.md",
1610+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1611+
"redirect_document_id": false
1612+
},
16031613
{
16041614
"source_path_from_root": "/articles/managed-applications/publish-service-catalog-app.md",
16051615
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1881,4 +1891,4 @@
18811891
"redirect_document_id": false
18821892
}
18831893
]
1884-
}
1894+
}

‎.openpublishing.redirection.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/tables/table-storage-design-encrypt-data.md",
5+
"redirect_url": "/previous-versions/azure/storage/tables/table-storage-design-encrypt-data",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/active-directory/external-identities/configure-saas-apps.md",
10+
"redirect_url": "/azure/active-directory/saas-apps/dropboxforbusiness-tutorial",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/databox-online/azure-stack-edge-zero-touch-provisioning.md",
515
"redirect_url": "/azure/databox-online/azure-stack-edge-powershell-based-configuration",
@@ -11498,6 +11508,11 @@
1149811508
"redirect_url": "/azure/firewall/ftp-support",
1149911509
"redirect_document_id": false
1150011510
},
11511+
{
11512+
"source_path_from_root": "/articles/firewall/firewall-network-rule-logging.md",
11513+
"redirect_url": "/azure/firewall/firewall-diagnostics",
11514+
"redirect_document_id": false
11515+
},
1150111516
{
1150211517
"source_path_from_root": "/articles/security/governance-in-azure.md",
1150311518
"redirect_url": "/azure/governance/",
@@ -12505,12 +12520,12 @@
1250512520
},
1250612521
{
1250712522
"source_path_from_root": "/articles/security/fundamentals/iot-overview.md",
12508-
"redirect_url": "/azure/iot-fundamentals/iot-security-architecture",
12523+
"redirect_url": "/azure/iot/iot-security-architecture",
1250912524
"redirect_document_id": false
1251012525
},
1251112526
{
1251212527
"source_path_from_root": "/articles/security/fundamentals/iot-best-practices.md",
12513-
"redirect_url": "/azure/iot-fundamentals/iot-security-best-practices",
12528+
"redirect_url": "/azure/iot/iot-security-best-practices",
1251412529
"redirect_document_id": false
1251512530
},
1251612531
{

‎articles/active-directory-b2c/configure-authentication-in-sample-node-web-app-with-api.md

Lines changed: 1 addition & 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: how-to
12-
ms.date: 07/07/2022
12+
ms.date: 03/24/2023
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---

‎articles/active-directory-b2c/data-residency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Data resides in the **United States** for the following locations:
4242
4343
Data resides in **Europe** for the following locations:
4444

45-
> Algeria (DZ), Austria (AT), Azerbaijan (AZ), Bahrain (BH), Belarus (BY), Belgium (BE), Bulgaria (BG), Croatia (HR), Cyprus (CY), Czech Republic (CZ), Denmark (DK), Egypt (EG), Estonia (EE), Finland (FT), France (FR), Germany (DE), Greece (GR), Hungary (HU), Iceland (IS), Ireland (IE), Israel (IL), Italy (IT), Jordan (JO), Kazakhstan (KZ), Kenya (KE), Kuwait (KW), Latvia (LV), Lebanon (LB), Liechtenstein (LI), Lithuania (LT), Luxembourg (LU), North Macedonia (ML), Malta (MT), Montenegro (ME), Morocco (MA), Netherlands (NL), Nigeria (NG), Norway (NO), Oman (OM), Pakistan (PK), Poland (PL), Portugal (PT), Qatar (QA), Romania (RO), Russia (RU), Saudi Arabia (SA), Serbia (RS), Slovakia (SK), Slovenia (ST), South Africa (ZA), Spain (ES), Sweden (SE), Switzerland (CH), Tunisia (TN), Turkey (TR), Ukraine (UA), United Arab Emirates (AE) and United Kingdom (GB)
45+
> Algeria (DZ), Austria (AT), Azerbaijan (AZ), Bahrain (BH), Belarus (BY), Belgium (BE), Bulgaria (BG), Croatia (HR), Cyprus (CY), Czech Republic (CZ), Denmark (DK), Egypt (EG), Estonia (EE), Finland (FT), France (FR), Germany (DE), Greece (GR), Hungary (HU), Iceland (IS), Ireland (IE), Israel (IL), Italy (IT), Jordan (JO), Kazakhstan (KZ), Kenya (KE), Kuwait (KW), Latvia (LV), Lebanon (LB), Liechtenstein (LI), Lithuania (LT), Luxembourg (LU), North Macedonia (ML), Malta (MT), Montenegro (ME), Morocco (MA), Netherlands (NL), Nigeria (NG), Norway (NO), Oman (OM), Pakistan (PK), Poland (PL), Portugal (PT), Qatar (QA), Romania (RO), Russia (RU), Saudi Arabia (SA), Serbia (RS), Slovakia (SK), Slovenia (ST), South Africa (ZA), Spain (ES), Sweden (SE), Switzerland (CH), Tunisia (TN), Türkiye (TR), Ukraine (UA), United Arab Emirates (AE) and United Kingdom (GB)
4646
4747
Data resides in **Asia Pacific** for the following locations:
4848

‎articles/active-directory-b2c/enable-authentication-angular-spa-app-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: how-to
10-
ms.date: 03/09/2023
10+
ms.date: 03/23/2023
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"

‎articles/active-directory-b2c/enable-authentication-angular-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: how-to
10-
ms.date: 03/09/2023
10+
ms.date: 03/23/2023
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"

‎articles/active-directory-b2c/enable-authentication-ios-app-options.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
ms.service: active-directory
88
ms.workload: identity
9-
ms.topic: reference
9+
ms.topic: how-to
1010
ms.date: 07/29/2021
1111
ms.author: kengaderdus
1212
ms.subservice: B2C

0 commit comments

Comments
 (0)