Skip to content

Commit 8a7a3a2

Browse files
authored
Merge pull request #259034 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 2a1b3d0 + cff8bfe commit 8a7a3a2

File tree

11 files changed

+35
-30
lines changed

11 files changed

+35
-30
lines changed

articles/ai-services/content-safety/overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ There are different types of analysis available from this service. The following
6060

6161
Content Safety Studio not only contains out-of-the-box AI models but also includes Microsoft's built-in terms blocklists to flag profanities and stay up to date with new trends. You can also upload your own blocklists to enhance the coverage of harmful content that's specific to your use case.
6262

63-
Studio also lets you set up a moderation workflow, where you can continuously monitor and improve content moderation performance. It can help you meet content requirements from all kinds of industries like gaming, media, education, E-commerce, and more. Businesses can easily connect their services to the Studio and have their content moderated in real time, whether user-generated or AI-generated.
63+
Studio also lets you set up a moderation workflow, where you can continuously monitor and improve content moderation performance. It can help you meet content requirements from all kinds of industries like gaming, media, education, E-commerce, and more. Businesses can easily connect their services to the Studio and have their content moderated in real-time, whether user-generated or AI-generated.
6464

6565
All of these capabilities are handled by the Studio and its backend; customers don’t need to worry about model development. You can onboard your data for quick validation and monitor your KPIs accordingly, like technical metrics (latency, accuracy, recall), or business metrics (block rate, block volume, category proportions, language proportions, and more). With simple operations and configurations, customers can test different solutions quickly and find the best fit, instead of spending time experimenting with custom models or doing moderation manually.
6666

@@ -129,21 +129,21 @@ To use the Azure AI Content Safety APIs, you must create your Content Safety res
129129
- West US 2
130130
- Sweden Central
131131

132-
Feel free to [contact us](mailto:acm-team@microsoft.com) if you need other regions for your business.
132+
Feel free to [contact us](mailto:contentsafetysupport@microsoft.com) if you need other regions for your business.
133133

134134
### Query rates
135135

136-
| Pricing Tier | Requests per second (RPS) |
136+
| Pricing Tier | Requests per 10 seconds (RPS) |
137137
| :----------- | :--------------------- |
138-
| F0 | 5 |
139-
| S0 | 10 |
138+
| F0 | 1000 |
139+
| S0 | 1000 |
140140

141-
If you need a faster rate, please [contact us](mailto:acm-team@microsoft.com) to request.
141+
If you need a faster rate, please [contact us](mailto:contentsafetysupport@microsoft.com) to request.
142142

143143

144144
## Contact us
145145

146-
If you get stuck, [email us](mailto:acm-team@microsoft.com) or use the feedback widget on the upper right of any docs page.
146+
If you get stuck, [email us](mailto:contentsafetysupport@microsoft.com) or use the feedback widget on the upper right of any docs page.
147147

148148
## Next steps
149149

articles/ai-services/document-intelligence/quickstarts/includes/v3-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Before you run the cURL command, make the following changes to the [post request
6767
| **General Document** | prebuilt-document | `https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf` |
6868
| **Read** | prebuilt-read | `https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/read.png` |
6969
| **Layout** | prebuilt-layout | `https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/layout.png` |
70-
| **Health insurance card** | healthInsuranceCard.us | `https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/insurance-card.png` |
70+
| **Health insurance card** | prebuilt-healthInsuranceCard.us | `https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/insurance-card.png` |
7171
| **W-2** | prebuilt-tax.us.w2 | `https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/w2.png` |
7272
| **Invoice** | prebuilt-invoice | `https://github.com/Azure-Samples/cognitive-services-REST-api-samples/raw/master/curl/form-recognizer/rest-api/invoice.pdf` |
7373
| **Receipt** | prebuilt-receipt | `https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/receipt.png` |

articles/azure-app-configuration/howto-targetingfilter-aspnet-core.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.devlang: csharp
77
author: maud-lv
88
ms.author: malev
99
ms.topic: conceptual
10-
ms.date: 11/20/2020
10+
ms.date: 11/20/2023
1111
---
1212

1313
# Enable staged rollout of features for targeted audiences
@@ -16,6 +16,11 @@ Feature flags allow you to dynamically activate or deactivate functionality in y
1616

1717
In this article, you'll learn how to roll out a new feature in an ASP.NET Core web application to specified users and groups, using `TargetingFilter` with Azure App Configuration.
1818

19+
## Prerequisites
20+
21+
- Finish the [Quickstart: Add feature flags to an ASP.NET Core app](./quickstart-feature-flag-aspnet-core.md).
22+
- Update the `Microsoft.FeatureManagement.AspNetCore` package to version **2.6.0** or later.
23+
1924
## Create a web application with feature flags and authentication
2025

2126
To roll out features based on users and groups, you'll need a web application that allows users to sign in.
@@ -189,4 +194,4 @@ Users with `contoso-xyz.com` email addresses will not see the *Beta* item. While
189194
## Next steps
190195

191196
> [!div class="nextstepaction"]
192-
> [Feature management overview](./concept-feature-management.md)
197+
> [Feature management overview](./concept-feature-management.md)

articles/azure-monitor/agents/azure-monitor-agent-send-data-to-event-hubs-and-storage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ Create a data collection rule for collecting events and sending to storage and e
375375
"news",
376376
"syslog",
377377
"user",
378-
"UUCP"
378+
"uucp"
379379
],
380380
"logLevels": [
381381
"Debug",
@@ -625,13 +625,13 @@ Use the following section to troubleshoot sending data to Event Hubs and Storage
625625

626626
### Data not found in storage account table storage
627627

628-
- Check that the built-in role `Storage Table Data Contributor` is assigned with managed identity on storage account.
628+
- Check that the built-in role `Storage Table Data Contributor` is assigned with managed identity on the storage account.
629629
- Check that the managed identity is assigned to the VM.
630630
- Check that the AMA settings have managed identity parameter.
631631

632632
### Data not flowing to event hub
633633

634-
- Check that the built-in role `Azure Event Hubs Data Sender` is assigned with managed identity on storage account.
634+
- Check that the built-in role `Azure Event Hubs Data Sender` is assigned with managed identity on the event hub instance.
635635
- Check that the managed identity is assigned to the VM.
636636
- Check that the AMA settings have managed identity parameter.
637637

articles/azure-monitor/app/usage-flows.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The User Flows tool visualizes how users move between the pages and features of
1717
* Where are the places that users churn most from your site?
1818
* Are there places where users repeat the same action over and over?
1919

20-
The User Flows tool starts from an initial page view, custom event, or exception that you specify. From this initial event, User Flows shows the events that happened before and after user sessions. Lines of varying thickness show how many times users followed each path. Special **Session Started** nodes show where the subsequent nodes began a session. **Session Ended** nodes show how many users sent no page views or custom events after the preceding node, highlighting where users probably left your site.
20+
The User Flows tool starts from an initial custom event, exception, dependency, page view or request that you specify. From this initial event, User Flows shows the events that happened before and after user sessions. Lines of varying thickness show how many times users followed each path. Special **Session Started** nodes show where the subsequent nodes began a session. **Session Ended** nodes show how many users sent no page views or custom events after the preceding node, highlighting where users probably left your site.
2121

2222
> [!NOTE]
2323
> Your Application Insights resource must contain page views or custom events to use the User Flows tool. [Learn how to set up your app to collect page views automatically with the Application Insights JavaScript SDK](./javascript.md).
@@ -27,10 +27,10 @@ The User Flows tool starts from an initial page view, custom event, or exception
2727

2828
:::image type="content" source="./media/usage-flows/initial-event.png" lightbox="./media/usage-flows/initial-event.png" alt-text="Screenshot that shows choosing an initial event for User Flows.":::
2929

30-
To begin answering questions with the User Flows tool, choose an initial page view, custom event, or exception to serve as the starting point for the visualization:
30+
To begin answering questions with the User Flows tool, choose an initial custom event, exception, dependency, page view or request to serve as the starting point for the visualization:
3131

3232
1. Select the link in the **What do users do after?** title or select **Edit**.
33-
1. Select a page view, custom event, or exception from the **Initial event** dropdown list.
33+
1. Select a custom event, exception, dependency, page view or request from the **Initial event** dropdown list.
3434
1. Select **Create graph**.
3535

3636
The **Step 1** column of the visualization shows what users did most frequently after the initial event. The items are ordered from top to bottom and from most to least frequent. The **Step 2** and subsequent columns show what users did next. The information creates a picture of all the ways that users moved through your site.
@@ -44,7 +44,7 @@ If page views or custom events are missing that you expect to see in the visuali
4444
* Check the **Excluded events** section on the **Edit** menu.
4545
* Use the plus buttons on **Others** nodes to include less-frequent events in the visualization.
4646
* If the page view or custom event you expect is sent infrequently by users, increase the time range of the visualization on the **Edit** menu.
47-
* Make sure the page view, custom event, or exception you expect is set up to be collected by the Application Insights SDK in the source code of your site. Learn more about [collecting custom events](./api-custom-events-metrics.md).
47+
* Make sure the custom event, exception, dependency, page view or request you expect is set up to be collected by the Application Insights SDK in the source code of your site. Learn more about [collecting custom events](./api-custom-events-metrics.md).
4848

4949
If you want to see more steps in the visualization, use the **Previous steps** and **Next steps** dropdown lists above the visualization.
5050

@@ -92,4 +92,4 @@ Use the **Split by** options on the **Edit** menu:
9292
* [Usage overview](usage-overview.md)
9393
* [Users, sessions, and events](usage-segmentation.md)
9494
* [Retention](usage-retention.md)
95-
* [Adding custom events to your app](./api-custom-events-metrics.md)
95+
* [Adding custom events to your app](./api-custom-events-metrics.md)

articles/azure-monitor/visualize/workbooks-getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ By default, the workbook is auto-filled with the same settings as the LA workspa
3232

3333
## Share a workbook
3434

35-
When you want to share a workbook or template, keep in mind that the person you want to share with must have permissions to access the workbook. They must have an Azure account, and **Azure Sentinel Workbook Reader** permissions.
35+
When you want to share a workbook or template, keep in mind that the person you want to share with must have permissions to access the workbook. They must have an Azure account, and **Monitoring Reader** permissions.
3636
To share a workbook or workbook template:
3737

3838
1. In the Azure portal, select the workbook or template you want to share.
@@ -79,4 +79,4 @@ Select **Auto refresh** to open a list of intervals that you can use to select t
7979

8080
## Next steps
8181

82-
[Azure Workbooks data sources](workbooks-data-sources.md)
82+
[Azure Workbooks data sources](workbooks-data-sources.md)

articles/batch/create-pool-extensions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ Request Body
6161
"deploymentConfiguration": {
6262
"virtualMachineConfiguration": {
6363
"imageReference": {
64-
"publisher": "almalinux",
65-
"offer": "almalinux",
66-
"sku": "9-gen1",
64+
"publisher": "microsoftcblmariner",
65+
"offer": "cbl-mariner",
66+
"sku": "cbl-mariner-2",
6767
"version": "latest"
6868
},
69-
"nodeAgentSkuId": "batch.node.el 9",
69+
"nodeAgentSkuId": "batch.node.mariner 2.0",
7070
"extensions": [
7171
{
7272
"name": "secretext",

articles/key-vault/general/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Your applications can securely access the information they need by using URIs. T
4040

4141
Access to a key vault requires proper authentication and authorization before a caller (user or application) can get access. Authentication establishes the identity of the caller, while authorization determines the operations that they're allowed to perform.
4242

43-
Authentication is done via Microsoft Entra ID. Authorization may be done via Azure role-based access control (Azure RBAC) or Key Vault access policy. Azure RBAC can be used for both management of the vaults and access data stored in a vault, while key vault access policy can only be used when attempting to access data stored in a vault.
43+
Authentication is done via Microsoft Entra ID. Authorization may be done via Azure role-based access control (Azure RBAC) or Key Vault access policy. Azure RBAC can be used for both management of the vaults and to access data stored in a vault, while key vault access policy can only be used when attempting to access data stored in a vault.
4444

4545
Azure Key Vaults may be either software-protected or, with the Azure Key Vault Premium tier, hardware-protected by hardware security modules (HSMs). Software-protected keys, secrets, and certificates are safeguarded by Azure, using industry-standard algorithms and key lengths. For situations where you require added assurance, you can import or generate keys in HSMs that never leave the HSM boundary. Azure Key Vault uses nCipher HSMs, which are Federal Information Processing Standards (FIPS) 140-2 Level 2 validated. You can use nCipher tools to move a key from your HSM to Azure Key Vault.
4646

articles/managed-ccf/quickstart-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Azure Managed CCF (Managed CCF) is a new and highly secure service for deploying
2020
## Prerequisites
2121

2222
- An Azure subscription - [create one for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
23-
- Java Development Kit (KDK) versions that are [supported by the Azure SDK for Java](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/confidentialledger/azure-resourcemanager-confidentialledger/README.md).
23+
- Java Development Kit (JDK) versions that are [supported by the Azure SDK for Java](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/confidentialledger/azure-resourcemanager-confidentialledger/README.md).
2424
- [OpenSSL](https://www.openssl.org/) on a computer running Windows or Linux.
2525

2626
## Setup

articles/search/search-howto-index-cosmosdb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Because terminology can be confusing, it's worth noting that [Azure Cosmos DB in
2828

2929
+ An [automatic indexing policy](../cosmos-db/index-policy.md) on the Azure Cosmos DB collection, set to [Consistent](../cosmos-db/index-policy.md#indexing-mode). This is the default configuration. Lazy indexing isn't recommended and may result in missing data.
3030

31-
+ Read permissions. A "full access" connection string includes a key that grants access to the content, but if you're using Azure roles, make sure the [search service managed identity](search-howto-managed-identities-data-sources.md) has **Cosmos DB Account Reader Role** permissions.
31+
+ Read permissions. A "full access" connection string includes a key that grants access to the content, but if you're using Azure RBAC (Entra ID), make sure the [search service managed identity](search-howto-managed-identities-data-sources.md) is assigned both **Cosmos DB Account Reader Role** and [**Cosmos DB Built-in Data Reader Role**](../cosmos-db/how-to-setup-rbac.md#built-in-role-definitions).
3232

3333
+ A REST client, such as [Postman](search-get-started-rest.md), to send REST calls that create the data source, index, and indexer.
3434

0 commit comments

Comments
 (0)