Skip to content

Commit ade2223

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ASMToc
2 parents 4113de9 + a021d56 commit ade2223

File tree

575 files changed

+9464
-7220
lines changed

Some content is hidden

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

575 files changed

+9464
-7220
lines changed

.openpublishing.publish.config.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,12 @@
943943
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
944944
"branch": "main",
945945
"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": {}
946952
}
947953
],
948954
"branch_target_mapping": {
@@ -978,8 +984,6 @@
978984
".openpublishing.redirection.baremetal-infrastructure.json",
979985
".openpublishing.redirection.defender-for-cloud.json",
980986
".openpublishing.redirection.defender-for-iot.json",
981-
".openpublishing.redirection.deployment-environments.json",
982-
".openpublishing.redirection.dev-box.json",
983987
".openpublishing.redirection.healthcare-apis.json",
984988
".openpublishing.redirection.iot-hub-device-update.json",
985989
".openpublishing.redirection.json",
@@ -1036,6 +1040,8 @@
10361040
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10371041
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10381042
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1039-
"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"
10401046
]
10411047
}

.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.

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

0 commit comments

Comments
 (0)