Skip to content

Commit 92c094a

Browse files
authored
Merge pull request #202462 from MicrosoftDocs/main
6/22 AM Publish
2 parents 30414ba + 8317a14 commit 92c094a

File tree

81 files changed

+434
-491
lines changed

Some content is hidden

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

81 files changed

+434
-491
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,12 @@
586586
"redirect_document_id": true
587587
},
588588
{
589-
"source_path_from_root": "/articles/security-center/quickstart-enable-database-protections.md",
590-
"redirect_url": "/azure/defender-for-cloud/defender-for-sql-enable-azure-sql-protections",
589+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-sql-enable-azure-sql-protections.md",
590+
"redirect_url": "/azure/defender-for-cloud/quickstart-enable-database-protections",
591591
"redirect_document_id": true
592592
},
593593
{
594-
"source_path_from_root": "/articles/security-center/quickstart-enable-defender-for-cosmos.md ",
594+
"source_path_from_root": "/articles/defender-for-cloud/quickstart-enable-defender-for-cosmos.md",
595595
"redirect_url": "/azure/defender-for-cloud/defender-for-databases-enable-cosmos-protections",
596596
"redirect_document_id": true
597597
},

articles/active-directory/develop/scenario-web-app-call-api-acquire-token.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ The code for ASP.NET is similar to the code shown for ASP.NET Core:
8585
- Finally, it calls the `AcquireTokenSilent` method of the confidential client application.
8686
- If interaction is required, the web app needs to challenge the user (re-sign in) and ask for more claims.
8787

88+
>[!NOTE]
89+
>The scope should be the fully qualified scope name. For example,`({api_uri}/scope)`.
90+
8891
The following code snippet is extracted from [HomeController.cs#L157-L192](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/257c8f96ec3ff875c351d1377b36403eed942a18/WebApp/Controllers/HomeController.cs#L157-L192) in the [ms-identity-aspnet-webapp-openidconnect](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect) ASP.NET MVC code sample:
8992

9093
```C#

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: enterprise-users
1010
ms.workload: identity
1111
ms.topic: overview
12-
ms.date: 06/20/2022
12+
ms.date: 06/22/2022
1313
ms.author: curtand
1414
ms.reviewer: krbain
1515
ms.custom: it-pro
@@ -397,6 +397,20 @@ The following device attributes can be used.
397397
deviceTrustType | AzureAD, ServerAD, Workplace | device.deviceOwnership -eq "AzureAD"
398398
enrollmentProfileName | Apple Device Enrollment Profile name, Android Enterprise Corporate-owned dedicated device Enrollment Profile name, or Windows Autopilot profile name | device.enrollmentProfileName -eq "DEP iPhones"
399399
extensionAttribute1 | any string value | device.extensionAttribute1 -eq "some string value"
400+
extensionAttribute2 | any string value | device.extensionAttribute2 -eq "some string value"
401+
extensionAttribute3 | any string value | device.extensionAttribute3 -eq "some string value"
402+
extensionAttribute4 | any string value | device.extensionAttribute4 -eq "some string value"
403+
extensionAttribute5 | any string value | device.extensionAttribute5 -eq "some string value"
404+
extensionAttribute6 | any string value | device.extensionAttribute6 -eq "some string value"
405+
extensionAttribute7 | any string value | device.extensionAttribute7 -eq "some string value"
406+
extensionAttribute8 | any string value | device.extensionAttribute8 -eq "some string value"
407+
extensionAttribute9 | any string value | device.extensionAttribute9 -eq "some string value"
408+
extensionAttribute10 | any string value | device.extensionAttribute10 -eq "some string value"
409+
extensionAttribute11 | any string value | device.extensionAttribute11 -eq "some string value"
410+
extensionAttribute12 | any string value | device.extensionAttribute12 -eq "some string value"
411+
extensionAttribute13 | any string value | device.extensionAttribute13 -eq "some string value"
412+
extensionAttribute14 | any string value | device.extensionAttribute14 -eq "some string value"
413+
extensionAttribute15 | any string value | device.extensionAttribute15 -eq "some string value"
400414
isRooted | true false | device.isRooted -eq true
401415
managementType | MDM (for mobile devices) | device.managementType -eq "MDM"
402416
memberOf | Any string value (valid group object ID) | device.memberof -any (group.objectId -in ['value'])

articles/active-directory/enterprise-users/licensing-service-plan-reference.md

Lines changed: 11 additions & 10 deletions
Large diffs are not rendered by default.

articles/active-directory/manage-apps/whats-new-docs.md

Lines changed: 19 additions & 289 deletions
Large diffs are not rendered by default.

articles/aks/private-clusters.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ When you provision a private AKS cluster, AKS by default creates a private FQDN
1919

2020
Private cluster is available in public regions, Azure Government, and Azure China 21Vianet regions where [AKS is supported](https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service).
2121

22-
> [!NOTE]
23-
> Azure Government sites are supported, however US Gov Texas isn't currently supported because of missing Private Link support.
24-
2522
## Prerequisites
2623

2724
* Azure CLI >= 2.28.0 or Azure CLI with aks-preview extension 0.5.29 or later.

articles/app-service/configure-connect-to-azure-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ zone_pivot_groups: app-service-containers-code
1212

1313
::: zone pivot="code-windows"
1414
> [!NOTE]
15-
> Mounting Azure Storage as a local share for App Service on Windows code is currently in preview.
15+
> Mounting Azure Storage as a local share for App Service on Windows code (non-container) is currently in preview.
1616
>
17-
This guide shows how to mount Azure Storage Files as a network share in Windows code in App Service. Only [Azure Files Shares](../storage/files/storage-how-to-use-files-portal.md) and [Premium Files Shares](../storage/files/storage-how-to-create-file-share.md) are supported. The benefits of custom-mounted storage include:
17+
This guide shows how to mount Azure Storage Files as a network share in Windows code (non-container) in App Service. Only [Azure Files Shares](../storage/files/storage-how-to-use-files-portal.md) and [Premium Files Shares](../storage/files/storage-how-to-create-file-share.md) are supported. The benefits of custom-mounted storage include:
1818

1919
- Configure persistent storage for your App Service app and manage the storage separately.
2020
- Make static content like video and images readily available for your App Service app.

articles/app-service/includes/tutorial-python-postgresql-app/connect-postgres-to-app-visual-studio-code-2.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ ms.azure.devx-azure-tooling: ['vscode-azure-tools']
1010
ms.custom: devx-track-python
1111
---
1212

13-
In the **App Service** section of the Azure Tools extension:
13+
In the Azure Tools extension:
1414

15-
1. Locate your web app, expand the node, and under **Application Settings** right-click to bring up the context menu.
15+
1. Expand **RESOURCES**. (Make sure resources are sorted by resource type.)
16+
17+
1. Locate your web app, expand its node, and right-click **Application Settings** to bring up the context menu.
1618

1719
1. Select **Add new setting...** from the menu.

articles/app-service/includes/tutorial-python-postgresql-app/create-app-service-visual-studio-code-10.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ View the output and browse to the website:
1414

1515
1. When a message appears indicating that the new App Service was created, select **View Output** to switch to the **Output** window in VS Code.
1616

17-
1. To confirm that the App Service is running properly, expand your subscription in the **Azure: App Service** explorer, right-click the App Service name, and select **Browse Website**.
17+
1. To confirm that the App Service is running properly, right-click the App Service name, and select **Browse Website**.
1818

1919
1. Because you haven't deployed your own code to the App Service yet (which you do in a later step), only a default app page appears.

articles/app-service/includes/tutorial-python-postgresql-app/create-app-service-visual-studio-code-2.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ms.azure.devx-azure-tooling: ['vscode-azure-tools']
1010
ms.custom: devx-track-python
1111
---
1212

13-
In the Azure Tools extension for VS Code:
13+
In the Azure Tools extension:
1414

15-
1. Locate the **App Service** section in the Azure Tools extension.
15+
1. Expand **RESOURCES** and find your subscription. (Make sure resources are grouped by resource type.)
1616

17-
1. Right-click the Azure subscription you want to create your web app in.
17+
1. Right-click **App Services** in your subscription.
1818

19-
1. Select **Create New Web App...(Advanced)** from the context menu.
19+
1. Select **Create New Web App...(Advanced)**.

0 commit comments

Comments
 (0)