Skip to content

Commit c0b18df

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-protected-actions-preview
2 parents 1b94818 + ebe0ec7 commit c0b18df

File tree

1,056 files changed

+17147
-16169
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,056 files changed

+17147
-16169
lines changed

.openpublishing.publish.config.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,12 @@
878878
"branch": "docs-snippets",
879879
"branch_mapping": {}
880880
},
881+
{
882+
"path_to_root": "ms-identity-python-webapp",
883+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
884+
"branch": "main",
885+
"branch_mapping": {}
886+
},
881887
{
882888
"path_to_root": "ms-identity-node",
883889
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -937,6 +943,12 @@
937943
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
938944
"branch": "main",
939945
"branch_mapping": {}
946+
},
947+
{
948+
"path_to_root": "microsoft-graph",
949+
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
950+
"branch": "main",
951+
"branch_mapping": {}
940952
}
941953
],
942954
"branch_target_mapping": {
@@ -972,8 +984,6 @@
972984
".openpublishing.redirection.baremetal-infrastructure.json",
973985
".openpublishing.redirection.defender-for-cloud.json",
974986
".openpublishing.redirection.defender-for-iot.json",
975-
".openpublishing.redirection.deployment-environments.json",
976-
".openpublishing.redirection.dev-box.json",
977987
".openpublishing.redirection.healthcare-apis.json",
978988
".openpublishing.redirection.iot-hub-device-update.json",
979989
".openpublishing.redirection.json",
@@ -1030,6 +1040,8 @@
10301040
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10311041
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10321042
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1033-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1043+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1044+
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1045+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
10341046
]
10351047
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
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/correlation.md",
50+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/distributed-tracing.md",
55+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/azure-monitor/app/console.md",
5060
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,11 @@
13951395
"redirect_url": "/azure/azure-resource-manager/managed-applications/cli-samples",
13961396
"redirect_document_id": false
13971397
},
1398+
{
1399+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/cli-samples.md",
1400+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1401+
"redirect_document_id": false
1402+
},
13981403
{
13991404
"source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
14001405
"redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",
@@ -1585,6 +1590,11 @@
15851590
"redirect_url": "/azure/azure-resource-manager/managed-applications/powershell-samples",
15861591
"redirect_document_id": false
15871592
},
1593+
{
1594+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/powershell-samples.md",
1595+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1596+
"redirect_document_id": false
1597+
},
15881598
{
15891599
"source_path_from_root": "/articles/managed-applications/publish-managed-app-definition-quickstart.md",
15901600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1889,6 +1899,26 @@
18891899
"source_path_from_root": "/articles/xplat-cli-azure-resource-manager.md",
18901900
"redirect_url": "/azure/azure-resource-manager/management/manage-resources-cli",
18911901
"redirect_document_id": false
1902+
},
1903+
{
1904+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample.md",
1905+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1906+
"redirect_document_id": false
1907+
},
1908+
{
1909+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-create-definition.md",
1910+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1911+
"redirect_document_id": false
1912+
},
1913+
{
1914+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-poweshell-sample-create-application.md",
1915+
"redirect_url": "/azure/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart",
1916+
"redirect_document_id": false
1917+
},
1918+
{
1919+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
1920+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1921+
"redirect_document_id": false
18921922
}
18931923
]
18941924
}

.openpublishing.redirection.dev-box.json

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

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7548,6 +7548,11 @@
75487548
"redirect_url": "/azure/reliability/reliability-functions",
75497549
"redirect_document_id": false
75507550
},
7551+
{
7552+
"source_path_from_root": "/articles/azure-functions/functions-bindings-triggers-python.md",
7553+
"redirect_url": "/azure/azure-functions/functions-reference-python?pivots=python-mode-decorators#triggers-and-inputs",
7554+
"redirect_document_id": false
7555+
},
75517556
{
75527557
"source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
75537558
"redirect_url": "/azure/azure-government",

articles/active-directory-b2c/billing.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ Usage charges for Azure AD B2C are billed to an Azure subscription. You need to
7474

7575
A subscription linked to an Azure AD B2C tenant can be used for the billing of Azure AD B2C usage or other Azure resources, including additional Azure AD B2C resources. It can't be used to add other Azure license-based services or Office 365 licenses within the Azure AD B2C tenant.
7676

77+
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-create-subscription.md)]
78+
7779
### Prerequisites
7880

7981
* [Azure subscription](https://azure.microsoft.com/free/)

articles/active-directory-b2c/manage-users-portal.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 02/24/2023
11+
ms.date: 03/30/2023
1212
ms.author: godonnell
1313
ms.subservice: B2C
14+
ms.custom: "b2c-support"
1415
---
1516

1617
# Use the Azure portal to create and delete consumer users in Azure AD B2C
@@ -34,7 +35,7 @@ This article focuses on working with **consumer accounts** in the Azure portal.
3435
1. Sign in to the [Azure portal](https://portal.azure.com).
3536
1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
3637
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
37-
1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
38+
1. In the left menu, select **Azure Active Directory**. Or, select **All services** and search for and select **Azure Active Directory**.
3839
1. Under **Manage**, select **Users**.
3940
1. Select **New user**.
4041
1. Select **Create Azure AD B2C user**.

articles/active-directory-b2c/tutorial-create-tenant.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ Before you create your Azure AD B2C tenant, you need to take the following consi
4040

4141
- An Azure account that's been assigned at least the [Contributor](../role-based-access-control/built-in-roles.md) role within the subscription or a resource group within the subscription is required.
4242

43+
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-create-subscription.md)]
44+
4345
## Create an Azure AD B2C tenant
4446
>[!NOTE]
45-
>If you're unable to create Azure AD B2C tenant, [review your user settings page](tenant-management-check-tenant-creation-permission.md) to ensure that tenant creation isn't switched off. If tenant creation is switched off, ask your _Global Administrator_ to assign you a _Tenant Creator_ role.
47+
>If you're unable to create Azure AD B2C tenant, [review your user settings page](tenant-management-check-tenant-creation-permission.md) to ensure that tenant creation isn't switched off. If tenant creation is switched on, ask your _Global Administrator_ to assign you a _Tenant Creator_ role.
4648
4749
1. Sign in to the [Azure portal](https://portal.azure.com/).
4850

articles/active-directory-domain-services/concepts-custom-attributes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Azure AD supports adding custom data to resources using [extensions](/graph/exte
2323
- [onPremisesExtensionAttributes](/graph/extensibility-overview?tabs=http#extension-attributes) are a set of 15 attributes that can store extended user string attributes.
2424
- [Directory extensions](/graph/extensibility-overview?tabs=http#directory-azure-ad-extensions) allow the schema extension of specific directory objects, such as users and groups, with strongly typed attributes through registration with an application in the tenant.
2525

26-
Both types of extensions can be configured By using Azure AD Connect for users who are managed on-premises, or MSGraph APIs for cloud-only users.
26+
Both types of extensions can be configured by using Azure AD Connect for users who are managed on-premises, or Microsoft Graph APIs for cloud-only users.
2727

2828
>[!Note]
2929
>The following types of extensions aren't supported for synchronization:
30-
>- Custom Security Attributes in Azure AD (Preview)
31-
>- MSGraph Schema Extensions
32-
>- MSGraph Open Extensions
30+
>- Custom security attributes in Azure AD (Preview)
31+
>- Microsoft Graph schema extensions
32+
>- Microsoft Graph open extensions
3333
3434

3535
## Requirements
@@ -72,4 +72,4 @@ To check the backfilling status, click **Azure AD DS Health** and verify the **S
7272

7373
To configure onPremisesExtensionAttributes or directory extensions for cloud-only users in Azure AD, see [Custom data options in Microsoft Graph](/graph/extensibility-overview?tabs=http#custom-data-options-in-microsoft-graph).
7474

75-
To sync onPremisesExtensionAttributes or directory extensions from on-premises to Azure AD, [configure Azure AD Connect](../active-directory/hybrid/how-to-connect-sync-feature-directory-extensions.md).
75+
To sync onPremisesExtensionAttributes or directory extensions from on-premises to Azure AD, [configure Azure AD Connect](../active-directory/hybrid/how-to-connect-sync-feature-directory-extensions.md).

0 commit comments

Comments
 (0)