Skip to content

Commit a2517bd

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into naman-edit2
2 parents fc9a885 + 9cda53f commit a2517bd

File tree

978 files changed

+12709
-7008
lines changed

Some content is hidden

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

978 files changed

+12709
-7008
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10681,6 +10681,12 @@
1068110681
"redirect_url": "/azure/active-directory/reports-monitoring/reference-basic-info-sign-in-logs",
1068210682
"redirect_document_id": false
1068310683
}
10684+
,
10685+
{
10686+
"source_path": "articles/active-directory/managed-identities-azure-resources/services-support-managed-identities.md",
10687+
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/managed-identities-status",
10688+
"redirect_document_id": false
10689+
}
1068410690

1068510691
]
1068610692
}

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@
1010
"redirect_url": "/azure/defender-for-cloud/upcoming-changes",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/security-center/policy-reference.md",
15+
"redirect_url": "/azure/defender-for-cloud/policy-reference",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/security-center/security-center-policy-definitions.md",
20+
"redirect_url": "/azure/defender-for-cloud/policy-reference",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-introduction.md#what-is-hash-reputation-analysis-for-malware",
25+
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-introduction#what-kind-of-alerts-does-microsoft-defender-for-storage-provide",
26+
"redirect_document_id": false
27+
},
1328
{
1429
"source_path_from_root": "/articles/security-center/release-notes-archive.md",
1530
"redirect_url": "/azure/defender-for-cloud/release-notes-archive",

.openpublishing.redirection.json

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@
6565
"redirect_url": "/previous-versions/azure/machine-learning/classic/deploy-consume-web-service-guide",
6666
"redirect_document_id": false
6767
},
68-
{
69-
"source_path": "articles/machine-learning/classic/deploy-with-resource-manager-template.md",
70-
"redirect_url": "/previous-versions/azure/machine-learning/classic/deploy-with-resource-manager-template",
71-
"redirect_document_id": false
72-
},
7368
{
7469
"source_path": "articles/machine-learning/classic/evaluate-model-performance.md",
7570
"redirect_url": "/previous-versions/azure/machine-learning/classic/evaluate-model-performance",
@@ -15472,6 +15467,46 @@
1547215467
"redirect_url": "/azure/developer/chef/windows-vm-configure",
1547315468
"redirect_document_id": false
1547415469
},
15470+
{
15471+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-configure-your-solution.md",
15472+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-configure-your-solution",
15473+
"redirect_document_id": false
15474+
},
15475+
{
15476+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-create-micro-agent-module-twin.md",
15477+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-create-micro-agent-module-twin",
15478+
"redirect_document_id": false
15479+
},
15480+
{
15481+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-standalone-agent-binary-installation.md",
15482+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
15483+
"redirect_document_id": false
15484+
},
15485+
{
15486+
"source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-configure-agent-based-solution.md",
15487+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-configure-agent-based-solution",
15488+
"redirect_document_id": false
15489+
},
15490+
{
15491+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-investigate-security-recommendations.md",
15492+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-investigate-security-recommendations",
15493+
"redirect_document_id": false
15494+
},
15495+
{
15496+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-investigate-security-alerts.md",
15497+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-investigate-security-alerts",
15498+
"redirect_document_id": false
15499+
},
15500+
{
15501+
"source_path_from_root": "/articles/defender-for-iot/device-builders/tutorial-configure-micro-agent-twin.md",
15502+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-configure-micro-agent-twin",
15503+
"redirect_document_id": false
15504+
},
15505+
{
15506+
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-azure-rtos-security-module.md",
15507+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-quickstart-azure-rtos-security-module",
15508+
"redirect_document_id": false
15509+
},
1547515510
{
1547615511
"source_path_from_root": "/articles/defender-for-iot/organizations/integration-cisco-ise-pxgrid.md",
1547715512
"redirect_url": "/azure/defender-for-iot/organizations/integration-forescout",
@@ -24058,11 +24093,6 @@
2405824093
"redirect_url": "/azure/security-center/policy-reference",
2405924094
"redirect_document_id": false
2406024095
},
24061-
{
24062-
"source_path_from_root": "/articles/security-center/security-center-policy-definitions.md",
24063-
"redirect_url": "/azure/security-center/policy-reference",
24064-
"redirect_document_id": false
24065-
},
2406624096
{
2406724097
"source_path_from_root": "/articles/operations-management-suite/oms-security-connect-products.md",
2406824098
"redirect_url": "/azure/security-center/quick-security-solutions",
@@ -24840,7 +24870,12 @@
2484024870
},
2484124871
{
2484224872
"source_path_from_root": "/articles/sentinel/connect-windows-security-events.md",
24843-
"redirect_url": "/azure/sentinel/data-connectors-reference#windows-security-events-preview",
24873+
"redirect_url": "/azure/sentinel/data-connectors-reference#windows-security-events-via-ama",
24874+
"redirect_document_id": false
24875+
},
24876+
{
24877+
"source_path_from_root": "/articles/sentinel/data-connectors-reference.md#windows-security-events-preview",
24878+
"redirect_url": "/azure/sentinel/data-connectors-reference#windows-security-events-via-ama",
2484424879
"redirect_document_id": false
2484524880
},
2484624881
{
@@ -34570,7 +34605,7 @@
3457034605
},
3457134606
{
3457234607
"source_path_from_root": "/articles/security/fundamentals/channel-nine.md",
34573-
"redirect_url": "https://channel9.msdn.com/",
34608+
"redirect_url": "/teamblog/channel9joinedmicrosoftlearn/",
3457434609
"redirect_document_id": false
3457534610
},
3457634611
{
@@ -39988,6 +40023,11 @@
3998840023
"redirect_url": "/azure/cognitive-services/Speech-Service/speech-devices",
3998940024
"redirect_document_id": false
3999040025
},
40026+
{
40027+
"source_path_from_root": "/articles/cognitive-services/Speech-Service/keyword-recognition-region-support.md",
40028+
"redirect_url": "/azure/cognitive-services/Speech-Service/regions",
40029+
"redirect_document_id": true
40030+
},
3999140031
{
3999240032
"source_path_from_root": "/articles/cognitive-services/entitylinking/GettingStarted.md",
3999340033
"redirect_url": "/azure/cognitive-services/text-analytics",
@@ -41793,11 +41833,6 @@
4179341833
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
4179441834
"redirect_document_id": false
4179541835
},
41796-
{
41797-
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/facebook-post-moderation.md",
41798-
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41799-
"redirect_document_id": false
41800-
},
4180141836
{
4180241837
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/moderation-jobs-quickstart-dotnet.md",
4180341838
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thank you for taking the time to contribute to the Microsoft Azure documentation.
44

5-
This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
5+
This guide covers some general topics related to contribution and refers to the [contributors guide](/contribute) for more detailed explanations when required.
66

77
## Code of Conduct
88

@@ -21,8 +21,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
2121

2222
### Editing in GitHub
2323

24-
Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
24+
Follow the guidance for [Quick edits to existing documents](/contribute/#quick-edits-to-existing-documents) in our contributors guide.
2525

2626
### Pull Request
2727

28-
Review the guidance for [Pull Requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
28+
Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

articles/active-directory-b2c/billing.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.topic: reference
1010
ms.workload: identity
11-
ms.date: 01/14/2022
11+
ms.date: 01/17/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: fasttrack-edit
@@ -84,6 +84,7 @@ A subscription linked to an Azure AD B2C tenant can be used for the billing of A
8484

8585
After you complete these steps for an Azure AD B2C tenant, your Azure subscription is billed based on your Azure Direct or Enterprise Agreement details, if applicable.
8686

87+
8788
## Change your Azure AD pricing tier
8889

8990
A tenant must be linked to the appropriate Azure pricing tier based on the features you want to use with your Azure AD B2C tenant. Premium features require Azure AD B2C Premium P1 or P2, as described in the [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
@@ -110,6 +111,9 @@ To change your pricing tier, follow these steps:
110111

111112
![Screenshot that shows how to select the pricing tier.](media/billing/select-tier.png)
112113

114+
> [!NOTE]
115+
> Currently, Azure AD Premium P1 for Azure AD B2C is the default pricing tier, and it's equivalent to Azure AD Free tier, but it costs money. Therefore, in terms of features, Azure AD Premium P1 license applied to Azure AD tenant, is not equivalent to Azure AD B2C Premium P1 license in a B2C tenant, and the same is true for Premium P2. Hence, you expect that some features available in Azure AD tenant may be missing in Azure AD B2C even when the tenants have Azure AD Premium P2 and Azure AD B2C Premium P2 licenses respectively. For instance, Azure AD Premium P2 offers identity protection in Azure AD B2C tenants, but does not offer other Azure AD Premium P2 features that apply to Azure AD tenants.
116+
113117
## Switch to MAU billing (pre-November 2019 Azure AD B2C tenants)
114118

115119
If you linked your Azure AD B2C tenant to a subscription before **November 1, 2019**, the previous per-authentication billing model is being used. We recommend you upgrade to the monthly active users (MAU) billing model. Billing options are configured in your Azure AD B2C resource.

0 commit comments

Comments
 (0)