Skip to content

Commit d300a7d

Browse files
authored
Merge pull request #261683 from MicrosoftDocs/main
Publish to Live Wednesday 4AM PST 12/20
2 parents e16205e + 11afd1d commit d300a7d

File tree

15 files changed

+127
-72
lines changed

15 files changed

+127
-72
lines changed

articles/ai-services/speech-service/how-to-custom-speech-test-and-train.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ The following table lists accepted data types, when each data type should be use
3535
| [Plain text](#plain-text-data-for-training) | No | Not applicable | Yes | 1-200 MB of related text |
3636
| [Structured text](#structured-text-data-for-training) | No | Not applicable | Yes | Up to 10 classes with up to 4,000 items and up to 50,000 training sentences |
3737
| [Pronunciation](#pronunciation-data-for-training) | No | Not applicable | Yes | 1 KB to 1 MB of pronunciation text |
38+
| [Display format](#custom-display-text-formatting-data-for-training) | No | Not applicable | Yes | Up to 200 lines for ITN, 1,000 lines for rewrite, 1,000 lines for profanity filter |
3839

3940
Training with plain text or structured text usually finishes within a few minutes.
4041

articles/azure-monitor/logs/azure-monitor-data-explorer-proxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ To create a new alert rule based on a cross-service query, follow the steps in [
165165
* Cross-service queries support data retrieval only.
166166
* [Private Link](../logs/private-link-security.md) (private endpoints) and [IP restrictions](/azure/data-explorer/security-network-restrict-public-access) do not support cross-service queries.
167167
* `mv-expand` is limited to 2000 records.
168+
* Queries of [external tables in Azure Data Explorer](/azure/data-explorer/external-table.md) are only supported if wrapped in a parameter-less function.
168169

169170
### Azure Resource Graph cross-service query limitations
170171

@@ -179,4 +180,3 @@ To create a new alert rule based on a cross-service query, follow the steps in [
179180
* [Write queries](/azure/data-explorer/write-queries)
180181
* [Perform cross-resource log queries in Azure Monitor](../logs/cross-workspace-query.md)
181182

182-

articles/defender-for-cloud/enable-permissions-management.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can find the new recommendations in the **Manage Access and Permissions** Se
2626
| **Aspect** | **Details** |
2727
| ----------------------------------------------- | ------------------------------------------------------------ |
2828
| Required / preferred environmental requirements | Defender CSPM <br> These capabilities are included in the Defender CSPM plan and don't require an additional license. |
29-
| Required roles and permissions | **AWS \ GCP** <br>Security Admin <br>Application.ReadWrite.All<br><br>**Azure** <br>Security Admin <br>Microsoft.Authorization/roleAssignments/write |
29+
| Required roles and permissions | **AWS / GCP** <br>Security Admin <br>Application.ReadWrite.All<br><br>**Azure** <br>Security Admin <br>Microsoft.Authorization/roleAssignments/write |
3030
| Clouds | :::image type="icon" source="./media/icons/yes-icon.png"::: Azure, AWS and GCP commercial clouds <br> :::image type="icon" source="./media/icons/no-icon.png"::: Nation/Sovereign (US Gov, China Gov, Other Gov) |
3131

3232
## Enable Permissions Management for Azure
@@ -71,9 +71,9 @@ Follow these steps to [connect your AWS account to Defender for Cloud](quickstar
7171

7272
:::image type="content" source="media/enable-permissions-management/enable-permissions-management-aws.png" alt-text="Screenshot of how to enable permissions management plan for AWS." lightbox="media/enable-permissions-management/enable-permissions-management-aws.png":::
7373

74-
1. Select **Configure access**, and then choose the appropriate **Permissions** type. Choose the deployment method: **'AWS CloudFormation' \ 'Terraform' script**.
74+
1. Select **Configure access**, and then choose the appropriate **Permissions** type. Choose the deployment method: **'AWS CloudFormation' / 'Terraform' script**.
7575
1. The deployment template is autofilled with default role ARN names. You can customize the role names by selecting the hyperlink.
76-
1. Run the updated CFT \ terraform script on your AWS environment.
76+
1. Run the updated CFT / terraform script on your AWS environment.
7777
1. Select **Save**.
7878
1. After a few seconds, you'll notice that the new **AWS CSPM (Preview)** standard is assigned on your security connector.
7979

@@ -104,7 +104,7 @@ Follow these steps to [connect your GCP account](quickstart-onboard-gcp.md) to M
104104
1. Enable the Defender CSPM plan. If the plan is already enabled, select **Settings** and turn on the Permissions Management feature.
105105

106106
1. Follow the wizard instructions to enable the plan with the new Permissions Management capabilities.
107-
1. Run the updated CFT \ terraform script on your GCP environment.
107+
1. Run the updated CFT / terraform script on your GCP environment.
108108
1. Select **Save**.
109109
1. After a few seconds, you'll notice that the new **GCP CSPM (Preview)** standard is assigned on your security connector.
110110

0 commit comments

Comments
 (0)