Skip to content

Commit ea5497a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into five-app-articles
2 parents f153d0b + 3c2a5a4 commit ea5497a

File tree

406 files changed

+5532
-2207
lines changed

Some content is hidden

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

406 files changed

+5532
-2207
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@
986986
".openpublishing.redirection.azure-percept.json",
987987
".openpublishing.redirection.azure-productivity.json",
988988
".openpublishing.redirection.azure-australia.json",
989+
".openpublishing.redirection.aks.json",
989990
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
990991
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
991992
"articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.active-directory.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10847,6 +10847,41 @@
1084710847
"redirect_document_id": false
1084810848
},
1084910849
{
10850+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
10851+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10852+
"redirect_document_id": false
10853+
},
10854+
{
10855+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
10856+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10857+
"redirect_document_id": false
10858+
},
10859+
{
10860+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
10861+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10862+
"redirect_document_id": false
10863+
},
10864+
{
10865+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
10866+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10867+
"redirect_document_id": false
10868+
},
10869+
{
10870+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
10871+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10872+
"redirect_document_id": false
10873+
},
10874+
{
10875+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
10876+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10877+
"redirect_document_id": false
10878+
},
10879+
{
10880+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
10881+
"redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
10882+
"redirect_document_id": false
10883+
},
10884+
{
1085010885
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
1085110886
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
1085210887
"redirect_document_id": false

.openpublishing.redirection.aks.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/aks/azure-cni-overlay.md",
5+
"redirect_url": "/azure/aks",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

articles/active-directory-domain-services/powershell-create-instance.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: sample
13-
ms.date: 08/17/2022
13+
ms.date: 09/1/2022
1414
ms.author: justinha
1515
ms.custom: devx-track-azurepowershell
1616

@@ -48,7 +48,7 @@ To complete this article, you need the following resources:
4848

4949
Azure AD DS requires a service principal to authenticate and communicate and an Azure AD group to define which users have administrative permissions in the managed domain.
5050

51-
First, create an Azure AD service principal by using a specific application ID named *Domain Controller Services*. The ID value is *2565bd9d-da50-47d4-8b85-4c97f669dc36*. Don't change this application ID.
51+
First, create an Azure AD service principal by using a specific application ID named *Domain Controller Services*. The ID value is *2565bd9d-da50-47d4-8b85-4c97f669dc36* for global Azure and *6ba9a5d4-8456-4118-b521-9c5ca10cdf84* for other Azure clouds. Don't change this application ID.
5252

5353
Create an Azure AD service principal using the [New-AzureADServicePrincipal][New-AzureADServicePrincipal] cmdlet:
5454

@@ -230,7 +230,7 @@ When the Azure portal shows that the managed domain has finished provisioning, t
230230

231231
## Complete PowerShell script
232232

233-
The following complete PowerShell script combines all of the tasks shown in this article. Copy the script and save it to a file with a `.ps1` extension. Run the script in a local PowerShell console or the [Azure Cloud Shell][cloud-shell].
233+
The following complete PowerShell script combines all of the tasks shown in this article. Copy the script and save it to a file with a `.ps1` extension. For Azure Global, use AppId value *2565bd9d-da50-47d4-8b85-4c97f669dc36*. For other Azure clouds, use AppId value *6ba9a5d4-8456-4118-b521-9c5ca10cdf84*. Run the script in a local PowerShell console or the [Azure Cloud Shell][cloud-shell].
234234

235235
> [!NOTE]
236236
> To enable Azure AD DS, you must be a global administrator for the Azure AD tenant. You also need at least *Contributor* privileges in the Azure subscription.
@@ -251,7 +251,7 @@ Connect-AzureAD
251251
Connect-AzAccount
252252
253253
# Create the service principal for Azure AD Domain Services.
254-
New-AzureADServicePrincipal -AppId "6ba9a5d4-8456-4118-b521-9c5ca10cdf84"
254+
New-AzureADServicePrincipal -AppId "2565bd9d-da50-47d4-8b85-4c97f669dc36"
255255
256256
# First, retrieve the object ID of the 'AAD DC Administrators' group.
257257
$GroupObjectId = Get-AzureADGroup `

0 commit comments

Comments
 (0)