Skip to content

Commit 77a806d

Browse files
authored
Merge branch 'MicrosoftDocs:main' into cosmos-nosql-howto-geospatial
2 parents e83a92f + e893878 commit 77a806d

File tree

78 files changed

+666
-387
lines changed

Some content is hidden

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

78 files changed

+666
-387
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
{
414414
"source_path_from_root": "/articles/security-center/defender-for-dns-introduction.md",
415415
"redirect_url": "/azure/defender-for-cloud/defender-for-dns-introduction",
416-
"redirect_document_id": true
416+
"redirect_document_id": false
417417
},
418418
{
419419
"source_path_from_root": "/articles/security-center/defender-for-key-vault-introduction.md",
@@ -840,6 +840,11 @@
840840
"redirect_url": "/azure/defender-for-cloud/enable-agentless-scanning-vms",
841841
"redirect_document_id": true
842842
},
843+
{
844+
"source_path_from_root": "/articles/defender-for-cloud/tutorial-enable-dns-plan.md",
845+
"redirect_url": "/azure/defender-for-cloud/defender-for-dns-introduction",
846+
"redirect_document_id": true
847+
},
843848
{
844849
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
845850
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",

articles/active-directory/develop/multi-service-web-app-access-storage.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: app-service
88
ms.topic: tutorial
99
ms.workload: identity
10-
ms.date: 03/24/2023
10+
ms.date: 07/31/2023
1111
ms.author: ryanwi
1212
ms.reviewer: stsoneff
1313
ms.devlang: csharp, javascript
@@ -162,6 +162,9 @@ az storage container create \
162162

163163
You need to grant your web app access to the storage account before you can create, read, or delete blobs. In a previous step, you configured the web app running on App Service with a managed identity. Using Azure RBAC, you can give the managed identity access to another resource, just like any security principal. The Storage Blob Data Contributor role gives the web app (represented by the system-assigned managed identity) read, write, and delete access to the blob container and data.
164164

165+
> [!NOTE]
166+
> Some operations on private blob containers are not supported by Azure RBAC, such as viewing blobs or copying blobs between accounts. A blob container with private access level requires a SAS token for any operation that is not authorized by Azure RBAC. For more information, see [When to use a shared access signature](/azure/storage/common/storage-sas-overview#when-to-use-a-shared-access-signature).
167+
165168
# [Portal](#tab/azure-portal)
166169

167170
In the [Azure portal](https://portal.azure.com), go into your storage account to grant your web app access. Select **Access control (IAM)** in the left pane, and then select **Role assignments**. You'll see a list of who has access to the storage account. Now you want to add a role assignment to a robot, the app service that needs access to the storage account. Select **Add** > **Add role assignment** to open the **Add role assignment** page.

articles/active-directory/external-identities/auditing-and-reporting.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ You can dive into each of these events to get the details. For example, let's lo
3535

3636
You can also export these logs from Azure AD and use the reporting tool of your choice to get customized reports.
3737

38-
## Sponsor field for B2B users (preview)
38+
## Sponsors field for B2B users (preview)
3939

40-
You can also manage and track your guest users in the organization using the sponsor feature (preview). The **Sponsor** field on the user account displays who is responsible for the guest user. A sponsor can be a user or a group. To learn more about the sponsor feature (preview), see [Add sponsors to a guest user](b2b-sponsors.md).
40+
You can also manage and track your guest users in the organization using the sponsors feature (preview). The **Sponsors** field on the user account displays who is responsible for the guest user. A sponsor can be a user or a group. To learn more about the sponsors feature (preview), see [Add sponsors to a guest user](b2b-sponsors.md).
4141

4242
### Next steps
4343

4444
- [B2B collaboration user properties](user-properties.md)
4545
- [Leave an organization](leave-the-organization.md)
46-
- [Troubleshoot B2B collaboration](troubleshoot.md)
46+
- [Troubleshoot B2B collaboration](troubleshoot.md)

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure-graph.md

Lines changed: 75 additions & 93 deletions
Large diffs are not rendered by default.

articles/active-directory/saas-apps/citi-program-tutorial.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 04/12/2023
12+
ms.date: 07/31/2023
1313
ms.author: jeedes
1414

1515
---
@@ -31,10 +31,10 @@ You configure and test Azure AD single sign-on for CITI Program in a test enviro
3131

3232
To integrate Azure Active Directory with CITI Program, you need:
3333

34+
* CITI Program Single Sign-On (SSO) enabled subscription. Note that [SSO is a paid service with CITI Program](https://support.citiprogram.org/s/article/single-sign-on-sso-and-shibboleth-technical-specs#General).
3435
* An Azure AD user account. If you don't already have one, you can [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3536
* One of the following roles: Global Administrator, Cloud Application Administrator, Application Administrator, or owner of the service principal.
3637
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
37-
* CITI Program single sign-on (SSO) enabled subscription.
3838

3939
## Add application and assign a test user
4040

@@ -78,7 +78,7 @@ Complete the following steps to enable Azure AD single sign-on in the Azure port
7878

7979
![Screenshot shows the image of attributes configuration.](common/default-attributes.png "Default Attributes")
8080

81-
1. CITI Program application expects urn:oid named attributes to be passed back in the SAML response, which are shown below. These attributes are also pre-populated but you can review them as per your requirements. These are all required.
81+
1. CITI Program application expects urn: oid named attributes to be passed back in the SAML response, which are shown below. These attributes are also pre-populated but you can review them as per your requirements. These are all required.
8282

8383
| Name | Source Attribute|
8484
| ---------------| --------- |
@@ -93,6 +93,7 @@ Complete the following steps to enable Azure AD single sign-on in the Azure port
9393
| ---------------| --------- |
9494
| urn:oid:2.16.840.1.113730.3.1.241 | user.displayname |
9595
| urn:oid:2.16.840.1.113730.3.1.3 | user.employeeid |
96+
| urn:oid:1.3.6.1.4.1.22704.1.1.1.8 | [other user attribute] |
9697

9798
1. On the **Set-up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Metadata XML** and select **Download** to download the certificate and save it on your computer.
9899

@@ -132,4 +133,4 @@ CITI Program supports just-in-time user provisioning. First time SSO users will
132133

133134
## Next steps
134135

135-
Once you configure CITI Program you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-aad).
136+
Once you configure CITI Program you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-aad).

articles/ai-services/speech-service/includes/language-support/pronunciation-assessment.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: eur
1616
|English (India)|`en-IN` |
1717
|English (United Kingdom)|`en-GB`|
1818
|English (United States)|`en-US`|
19-
|French (Canada)|`fr-CA`<sup>1</sup> |
19+
|French (Canada)|`fr-CA`|
2020
|French (France)|`fr-FR`|
2121
|German (Germany)|`de-DE`|
2222
|Italian (Italy)|`it-IT`<sup>1</sup>|
@@ -25,6 +25,7 @@ ms.author: eur
2525
|Malay (Malaysia)|`ms-MY`<sup>1</sup>|
2626
|Norwegian Bokmål (Norway)|`nb-NO`<sup>1</sup>|
2727
|Portuguese (Brazil)|`pt-BR`<sup>1</sup>|
28+
|Russian (Russia)|`ru-RU`<sup>1</sup>|
2829
|Spanish (Mexico)|`es-MX` |
2930
|Spanish (Spain)|`es-ES` |
3031
|Tamil (India)|`ta-IN`<sup>1</sup> |

articles/ai-services/speech-service/language-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ With the cross-lingual feature, you can transfer your custom neural voice model
9696

9797
# [Pronunciation assessment](#tab/pronunciation-assessment)
9898

99-
The table in this section summarizes the 19 locales supported for pronunciation assessment, and each language is available on all [Speech to text regions](regions.md#speech-service). Latest update extends support from English to 18 additional languages and quality enhancements to existing features, including accuracy, fluency and miscue assessment. You should specify the language that you're learning or practicing improving pronunciation. The default language is set as `en-US`. If you know your target learning language, [set the locale](how-to-pronunciation-assessment.md#get-pronunciation-assessment-results) accordingly. For example, if you're learning British English, you should specify the language as `en-GB`. If you're teaching a broader language, such as Spanish, and are uncertain about which locale to select, you can run various accent models (`es-ES`, `es-MX`) to determine the one that achieves the highest score to suit your specific scenario.
99+
The table in this section summarizes the 20 locales supported for pronunciation assessment, and each language is available on all [Speech to text regions](regions.md#speech-service). Latest update extends support from English to 19 additional languages and quality enhancements to existing features, including accuracy, fluency and miscue assessment. You should specify the language that you're learning or practicing improving pronunciation. The default language is set as `en-US`. If you know your target learning language, [set the locale](how-to-pronunciation-assessment.md#get-pronunciation-assessment-results) accordingly. For example, if you're learning British English, you should specify the language as `en-GB`. If you're teaching a broader language, such as Spanish, and are uncertain about which locale to select, you can run various accent models (`es-ES`, `es-MX`) to determine the one that achieves the highest score to suit your specific scenario.
100100

101101
[!INCLUDE [Language support include](includes/language-support/pronunciation-assessment.md)]
102102

articles/app-service/app-service-plan-manage.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ keywords: app service, azure app service, scale, app service plan, change, creat
55
ms.assetid: 4859d0d5-3e3c-40cc-96eb-f318b2c51a3d
66
ms.topic: article
77
ms.author: msangapu
8-
ms.date: 06/29/2023
9-
ms.custom: seodec18
8+
ms.date: 07/31/2023
9+
ms.custom: "UpdateFrequency3"
1010

1111
---
1212
# Manage an App Service plan in Azure
@@ -20,27 +20,25 @@ An [Azure App Service plan](overview-hosting-plans.md) provides the resources th
2020
2121
You can create an empty App Service plan, or you can create a plan as part of app creation.
2222

23-
1. In the [Azure portal](https://portal.azure.com), select **Create a resource**.
23+
1. To start creating an App Service Plan, browse to [https://ms.portal.azure.com/#create/Microsoft.AppServicePlanCreate](https://ms.portal.azure.com/#create/Microsoft.AppServicePlanCreate).
2424

25-
![Create a resource in the Azure portal.][createResource]
25+
:::image type="content" source="./media/azure-web-sites-web-hosting-plans-in-depth-overview/create-appserviceplan.png" alt-text="Create an App Service Plan in the Azure portal.":::
2626

27-
1. Select **New** > **Web App** or another kind of App service app.
27+
2. Configure the **Project Details** section before configuring the App Service plan.
28+
29+
3. In the **App Service Plan details** section, name the App Service Plan, then select the **Operating System** and **Region**. Region determines where your App Service plan is created.
2830

29-
![Create an app in the Azure portal.][createWebApp]
31+
4. When creating a plan, you can select the pricing tier of the new plan. In **Pricing Tier**, select a **Pricing plan** or select **Explore pricing plans** to view additional details.
3032

31-
2. Configure the **Instance Details** section before configuring the App Service plan. Settings such as **Publish** and **Operating Systems** can change the available pricing tiers for your App Service plan. **Region** determines where your App Service plan is created.
32-
33-
3. In the **App Service Plan** section, select an existing plan, or create a plan by selecting **Create new**.
34-
35-
![Create an App Service plan.][createASP]
33+
5. In the **Zone redundancy** section, select whether the App Service Plan zone redundancy should be enabled or disabled.
3634

37-
4. When creating a plan, you can select the pricing tier of the new plan. In **Sku and size**, select **Change size** to change the pricing tier.
35+
6. Select **Review + create** to create the App Service Plan.
3836

3937
<a name="move"></a>
4038

4139
## Move an app to another App Service plan
4240

43-
You can move an app to another App Service plan, as long as the source plan and the target plan are in the _same resource group, geographical region,and of the same OS type_. Any change in type such as Windows to Linux or any type that is different from the originating type is not supported.
41+
You can move an app to another App Service plan, as long as the source plan and the target plan are in the _same resource group, geographical region, and of the same OS type_. Any change in type such as Windows to Linux or any type that is different from the originating type is not supported.
4442

4543

4644
> [!NOTE]
@@ -96,6 +94,5 @@ To avoid unexpected charges, when you delete the last app in an App Service plan
9694
> [Scale up an app in Azure](manage-scale-up.md)
9795
9896
[change]: ./media/azure-web-sites-web-hosting-plans-in-depth-overview/change-appserviceplan.png
99-
[createASP]: ./media/azure-web-sites-web-hosting-plans-in-depth-overview/create-appserviceplan.png
10097
[createWebApp]: ./media/azure-web-sites-web-hosting-plans-in-depth-overview/create-web-app.png
10198
[createResource]: ./media/azure-web-sites-web-hosting-plans-in-depth-overview/create-a-resource.png

articles/app-service/includes/tutorial-dotnet-storage-managed-identity/introduction.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ az storage container create \
170170

171171
You need to grant your web app access to the storage account before you can create, read, or delete blobs. In a previous step, you configured the web app running on App Service with a managed identity. Using Azure RBAC, you can give the managed identity access to another resource, just like any security principal. The Storage Blob Data Contributor role gives the web app (represented by the system-assigned managed identity) read, write, and delete access to the blob container and data.
172172

173+
> [!NOTE]
174+
> Some operations on private blob containers are not supported by Azure RBAC, such as viewing blobs or copying blobs between accounts. A blob container with private access level requires a SAS token for any operation that is not authorized by Azure RBAC. For more information, see [When to use a shared access signature](/azure/storage/common/storage-sas-overview#when-to-use-a-shared-access-signature).
175+
173176
# [Portal](#tab/azure-portal)
174177

175178
In the [Azure portal](https://portal.azure.com), go into your storage account to grant your web app access. Select **Access control (IAM)** in the left pane, and then select **Role assignments**. You'll see a list of who has access to the storage account. Now you want to add a role assignment to a robot, the app service that needs access to the storage account. Select **Add** > **Add role assignment** to open the **Add role assignment** page.
9.01 KB
Loading

0 commit comments

Comments
 (0)