Skip to content

Commit 15089a2

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/manual-incidents
2 parents 0a18e17 + 67b74f4 commit 15089a2

File tree

792 files changed

+12118
-5762
lines changed

Some content is hidden

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

792 files changed

+12118
-5762
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: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10831,11 +10831,6 @@
1083110831
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
1083210832
"redirect_document_id": false
1083310833
},
10834-
{
10835-
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
10836-
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
10837-
"redirect_document_id": true
10838-
},
1083910834
{
1084010835
"source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
1084110836
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
@@ -10845,8 +10840,47 @@
1084510840
"source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
1084610841
"redirect_url": "/azure/azure-percept/index",
1084710842
"redirect_document_id": false
10843+
},
10844+
{
10845+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
10846+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10847+
"redirect_document_id": false
10848+
},
10849+
{
10850+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-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-delete-group.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-membership-azure-portal.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-settings-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-accessmanagement-managing-group-owners.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-manage-groups.md",
10876+
"redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
10877+
"redirect_document_id": false
10878+
},
10879+
{
10880+
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10881+
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10882+
"redirect_document_id": false
1084810883
}
1084910884

10850-
1085110885
]
1085210886
}

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

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34248,6 +34248,11 @@
3424834248
"redirect_url": "/azure/virtual-machines/windows/connect-winrm",
3424934249
"redirect_document_id": false
3425034250
},
34251+
{
34252+
"source_path_from_root": "/articles/azure-arc/servers/data-residency.md",
34253+
"redirect_url": "/azure/azure-arc/servers/overview",
34254+
"redirect_document_id": false
34255+
},
3425134256
{
3425234257
"source_path_from_root": "/articles/virtual-machines/linux/copy-files-to-linux-vm-using-scp.md",
3425334258
"redirect_url": "/azure/virtual-machines/copy-files-to-vm-using-scp",

articles/active-directory-b2c/enable-authentication-web-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ Under the project root folder, create a *config.json* file, and then add to it t
443443
```json
444444
{
445445
"credentials": {
446-
"tenantName": "<your-tenant-name>",
446+
"tenantName": "<your-tenant-name>.onmicrosoft.com",
447447
"clientID": "<your-webapi-application-ID>",
448448
"issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
449449
},
@@ -470,7 +470,7 @@ In the *config.json* file, update the following properties:
470470

471471
|Section |Key |Value |
472472
|---------|---------|---------|
473-
| credentials | tenantName | The first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso`).|
473+
| credentials | tenantName | Your Azure AD B2C [tenant name/domain name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
474474
| credentials |clientID | The web API application ID. In the [preceding diagram](#app-registration-overview), it's the application with *App ID: 2*. To learn how to get your web API application registration ID, see [Prerequisites](#prerequisites). |
475475
| credentials | issuer| The token issuer `iss` claim value. By default, Azure AD B2C returns the token in the following format: `https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/`. Replace `<your-tenant-name>` with the first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). Replace `<your-tenant-ID>` with your [Azure AD B2C tenant ID](tenant-management.md#get-your-tenant-id). |
476476
| policies | policyName | The user flows, or custom policy. To learn how to get your user flow or policy, see [Prerequisites](#prerequisites).|

articles/active-directory-domain-services/alert-service-principal.md

Lines changed: 3 additions & 3 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: troubleshooting
13-
ms.date: 07/09/2020
13+
ms.date: 09/04/2022
1414
ms.author: justinha
1515

1616
---
@@ -34,7 +34,7 @@ To check which service principal is missing and must be recreated, complete the
3434

3535
1. In the Azure portal, select **Azure Active Directory** from the left-hand navigation menu.
3636
1. Select **Enterprise applications**. Choose *All applications* from the **Application Type** drop-down menu, then select **Apply**.
37-
1. Search for each of the following application IDs. If no existing application is found, follow the *Resolution* steps to create the service principal or re-register the namespace.
37+
1. Search for each of the following application IDs. For Azure Global, search for AppId value *2565bd9d-da50-47d4-8b85-4c97f669dc36*. For other Azure clouds, search for AppId value *6ba9a5d4-8456-4118-b521-9c5ca10cdf84*. If no existing application is found, follow the *Resolution* steps to create the service principal or re-register the namespace.
3838

3939
| Application ID | Resolution |
4040
| :--- | :--- |
@@ -45,7 +45,7 @@ To check which service principal is missing and must be recreated, complete the
4545

4646
### Recreate a missing Service Principal
4747

48-
If application ID *2565bd9d-da50-47d4-8b85-4c97f669dc36* is missing from your Azure AD directory, use Azure AD PowerShell to complete the following steps. For more information, see [Azure AD PowerShell](/powershell/azure/active-directory/install-adv2).
48+
If application ID *2565bd9d-da50-47d4-8b85-4c97f669dc36* is missing from your Azure AD directory in Azure Global, use Azure AD PowerShell to complete the following steps. For other Azure clouds, use AppId value *6ba9a5d4-8456-4118-b521-9c5ca10cdf84*. For more information, see [Azure AD PowerShell](/powershell/azure/active-directory/install-adv2).
4949

5050
1. If needed, install the Azure AD PowerShell module and import it as follows:
5151

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 `

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ Use the general guidelines when implementing a SCIM endpoint to ensure compatibi
196196
* Microsoft Azure AD makes requests to fetch a random user and group to ensure that the endpoint and the credentials are valid. It's also done as a part of the **Test Connection** flow in the [Azure portal](https://portal.azure.com).
197197
* Support HTTPS on your SCIM endpoint.
198198
* Custom complex and multivalued attributes are supported but Azure AD doesn't have many complex data structures to pull data from in these cases. Simple paired name/value type complex attributes can be mapped to easily, but flowing data to complex attributes with three or more subattributes aren't well supported at this time.
199-
* The "type" subattribute values of multivalued complex attributes must be unique. For example, there can't be two different email addresses with the "work" subtype.
199+
* The "type" subattribute values of multivalued complex attributes must be unique. For example, there can't be two different email addresses with the "work" subtype.
200+
* The header for all the responses should be of content-Type: application/scim+json
200201

201202
### Retrieving Resources:
202203

articles/active-directory/app-proxy/application-proxy-security.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-proxy
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 04/21/2021
11+
ms.date: 09/02/2022
1212
ms.author: kenwith
1313
ms.reviewer: ashishj
1414
---
@@ -23,7 +23,7 @@ The following diagram shows how Azure AD enables secure remote access to your on
2323

2424
## Security benefits
2525

26-
Azure AD Application Proxy offers the following security benefits:
26+
Azure AD Application Proxy offers many security benefits including authenticated access, conditional access, traffic termination, all outbound access, cloud scale analytics and machine learning, and remote access as a service. It is important to note that even with all of the added security provided by Application Proxy, the systems being accessed must continually be updated with the latest patches.
2727

2828
### Authenticated access
2929

articles/active-directory/authentication/concepts-azure-multi-factor-authentication-prompts-session-lifetime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ When a user selects **Yes** on the *Stay signed in?* option during sign-in, a pe
6868

6969
If you have an Azure AD Premium 1 license, we recommend using Conditional Access policy for *Persistent browser session*. This policy overwrites the *Stay signed in?* setting and provides an improved user experience. If you don't have an Azure AD Premium 1 license, we recommend enabling the stay signed in setting for your users.
7070

71-
For more information on configuring the option to let users remain signed-in, see [Customize your Azure AD sign-in page](../fundamentals/customize-branding.md#customize-your-azure-ad-sign-in-page).
71+
For more information on configuring the option to let users remain signed-in, see [Customize your Azure AD sign-in page](../fundamentals/customize-branding.md#learn-about-the-stay-signed-in-prompt).
7272

7373
### Remember Multi-Factor Authentication
7474

0 commit comments

Comments
 (0)