Skip to content

Commit 8e210ef

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fix
2 parents 900745e + 6f4cf8f commit 8e210ef

File tree

15 files changed

+132
-103
lines changed

15 files changed

+132
-103
lines changed

articles/ai-services/document-intelligence/concept-read.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ The pages collection is a list of pages within the document. Each page is repres
123123
| --- | --- | --- |
124124
|Images (JPEG/JPG, PNG, BMP, HEIF) | Each image = 1 page unit | Total images |
125125
|PDF | Each page in the PDF = 1 page unit | Total pages in the PDF |
126-
|TIFF | Each image in the TIFF = 1 page unit | Total images in the PDF |
126+
|TIFF | Each image in the TIFF = 1 page unit | Total images in the TIFF |
127127
|Word (DOCX) | Up to 3,000 characters = 1 page unit, embedded or linked images not supported | Total pages of up to 3,000 characters each |
128128
|Excel (XLSX) | Each worksheet = 1 page unit, embedded or linked images not supported | Total worksheets |
129129
|PowerPoint (PPTX) | Each slide = 1 page unit, embedded or linked images not supported | Total slides |

articles/ai-studio/how-to/configure-managed-network.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ The Azure AI managed VNet feature is free. However, you're charged for the follo
322322
323323
## Limitations
324324

325+
* Azure AI Studio currently doesn't support bring your own virtual network, it only supports managed VNet isolation.
325326
* Azure AI services provisioned with Azure AI and Azure AI Search attached with Azure AI should be public.
326327
* The "Add your data" feature in the Azure AI Studio playground doesn't support private storage account.
327328
* Once you enable managed VNet isolation of your Azure AI, you can't disable it.

articles/ai-studio/how-to/create-manage-compute.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ To create a compute instance in Azure AI Studio:
6666
- **Assign a managed identity**: You can attach system assigned or user assigned managed identities to grant access to resources. The name of the created system managed identity will be in the format `/workspace-name/computes/compute-instance-name` in your Microsoft Entra ID.
6767
- **Enable SSH access**: Enter credentials for an administrator user account that will be created on each compute node. These can be used to SSH to the compute nodes.
6868
Note that disabling SSH prevents SSH access from the public internet. When a private virtual network is used, users can still SSH from within the virtual network.
69-
- **Enable virtual network**:
70-
- If you're using an Azure Virtual Network, specify the Resource group, Virtual network, and Subnet to create the compute instance inside an Azure Virtual Network. You can also select No public IP to prevent the creation of a public IP address, which requires a private link workspace. You must also satisfy these network requirements for virtual network setup.
71-
- If you're using a managed virtual network, the compute instance is created inside the managed virtual network. You can also select No public IP to prevent the creation of a public IP address. For more information, see managed compute with a managed network.
7269

7370
1. On the **Applications** page you can add custom applications to use on your compute instance, such as RStudio or Posit Workbench. Then select **Next**.
7471
1. On the **Tags** page you can add additional information to categorize the resources you create. Then select **Review + Create** or **Next** to review your settings.

articles/azure-monitor/containers/container-insights-logs-schema.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ You can enable the **ContainerLogV2** schema for a cluster either using the clus
6161
## Multi-line logging in Container Insights
6262
With multiline logging enabled, previously split container logs are stitched together and sent as single entries to the ContainerLogV2 table. If the stitched log line is larger than 64 KB, it will be truncated due to Log Analytics workspace limits. This feature also has support for .NET, Go, Python and Java stack traces, which appear as single entries in the ContainerLogV2 table. Enable multiline logging with ConfigMap as described in [Configure data collection in Container insights using ConfigMap](container-insights-data-collection-configmap.md).
6363

64+
>[!NOTE]
65+
> The configmap now features a language specification option, wherein the customers can select only the languages that they are interested in. This feature can be enabled by editing the languages in the stacktrace_languages option in the [configmap](https://github.com/microsoft/Docker-Provider/blob/ci_prod/kubernetes/container-azm-ms-agentconfig.yaml).
66+
6467
The following screenshots show multi-line logging for Go exception stack trace:
6568

6669
**Multi-line logging disabled**

articles/azure-netapp-files/manage-availability-zone-volume-placement.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ If you're using a custom RBAC role or the [built-in Contributor role](../role-ba
126126
* `Microsoft.NetApp/locations/{location}/quotaLimits`
127127
* `Microsoft.NetApp/locations/{location}/quotaLimits/{quotaLimitName}`
128128
* `Microsoft.NetApp/locations/{location}/regionInfo`
129+
* `Microsoft.NetApp/locations/{location}/regionInfos`
129130
* `Microsoft.NetApp/locations/{location}/queryNetworkSiblingSet`
130131
* `Microsoft.NetApp/locations/{location}/updateNetworkSiblingSet`
131132

articles/data-factory/control-flow-until-activity.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ ms.custom: devx-track-azurepowershell, synapse
1515
# Until activity in Azure Data Factory and Synapse Analytics
1616
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1717

18-
The Until activity provides the same functionality that a do-until looping structure provides in programming languages. It executes a set of activities in a loop until the condition associated with the activity evaluates to true. If an inner activity fails, the Until activity does not stop. You can specify a timeout value for the until activity.
18+
The Until activity provides the same functionality that a do-until looping structure provides in programming languages. It executes a set of activities in a loop until the condition associated with the activity evaluates to true. If an inner activity fails, the Until activity doesn't stop. You can specify a timeout value for the until activity.
1919

2020
## Create an Until activity with UI
2121

2222
To use an Until activity in a pipeline, complete the following steps:
2323

24-
1. Search for _Until_ in the pipeline Activities pane, and drag a Until activity to the pipeline canvas.
25-
1. Select the Until activity on the canvas if it is not already selected, and its **Settings** tab, to edit its details.
24+
1. Search for _Until_ in the pipeline Activities pane, and drag a Until activity to the pipeline canvas.
25+
1. Select the Until activity on the canvas if it isn't already selected, and its **Settings** tab, to edit its details.
2626

2727
:::image type="content" source="media/control-flow-until-activity/until-activity.png" alt-text="Shows the Settings tab of the Until activity in the pipeline canvas.":::
2828

29-
1. Enter an expression that will be evaluated after all child activities defined in the Until activity are executed. If the expression evaluates to false, the Until activity will execute all its child activities again. When it evaluates to true, the Until activity will complete. The expression can be a literal string expression, or any combination of dynamic [expressions, functions](control-flow-expression-language-functions.md), [system variables](control-flow-system-variables.md), or [outputs from other activities](how-to-expression-language-functions.md#examples-of-using-parameters-in-expressions). The example below checks the value of a previously defined pipeline array variable called TestVariable to see if it evaluates to ['done'].
29+
1. Enter an expression that will be evaluated after all child activities defined in the Until activity is executed. If the expression evaluates to false, the Until activity executes all its child activities again. When it evaluates to true, the Until activity completes. The expression can be a literal string expression, or any combination of dynamic [expressions, functions](control-flow-expression-language-functions.md), [system variables](control-flow-system-variables.md), or [outputs from other activities](how-to-expression-language-functions.md#examples-of-using-parameters-in-expressions). The example below checks the value of a previously defined pipeline array variable called TestVariable to see if it evaluates to ['done'].
3030

3131
:::image type="content" source="media/control-flow-until-activity/dynamic-content-to-check-variable-value.png" alt-text="Shows the  Add dynamic content  pane with an expression to check a variable for a defined value.":::
3232

33-
1. Define activities that the Until activity will execute by selecting the Edit Activities button on the Until activity directly, or by selecting the Activities tab to select it there. A new activities editor pane will be displayed where you can add any activities for the Until activity to execute. In this example, a Set Variable activity simply sets the value of the variable referenced in the expression above to ['done'], so the Until activity's expression will be true the first time it is executed, and the Until activity will stop. In your real-world use, you can check any conditions required and the Until activity will continue to execute its child activities each time the expression is evaluated, until the conditions are met.
33+
2. Define activities that the Until activity executes by selecting the Edit Activities button on the Until activity directly, or by selecting the Activities tab to select it there. A new activities editor pane is displayed where you can add any activities for the Until activity to execute. In this example, a Set Variable activity simply sets the value of the variable referenced in the aforementioned expression to ['done'], so the Until activity's expression will be true the first time it's executed, and the Until activity will stop. In your real-world use, you can check any conditions required and the Until activity will continue to execute its child activities each time the expression is evaluated, until the conditions are met.
3434

3535
:::image type="content" source="media/control-flow-until-activity/child-activities-editor.png" alt-text="Shows the activities editor for an Until activity with a Set Variable activity defined.":::
3636

@@ -44,7 +44,7 @@ To use an Until activity in a pipeline, complete the following steps:
4444
"value": "<expression that evaluates to true or false>",
4545
"type": "Expression"
4646
},
47-
"timeout": "<time out for the loop. for example: 00:01:00 (1 minute)>",
47+
"timeout": "<time out for the loop. for example: 00:10:00 (10 minute)>",
4848
"activities": [
4949
{
5050
"<Activity 1 definition>"
@@ -68,8 +68,8 @@ Property | Description | Allowed values | Required
6868
-------- | ----------- | -------------- | --------
6969
name | Name of the `Until` activity. | String | Yes
7070
type | Must be set to **Until**. | String | Yes
71-
expression | Expression that must evaluate to true or false | Expression. | Yes
72-
timeout | The do-until loop times out after the specified time here. | String. `d.hh:mm:ss` (or) `hh:mm:ss`. The default value is 7 days. Maximum value is: 90 days. | No
71+
expression | Expression that must evaluate to true or false | Expression. | Yes
72+
timeout | The do-until loop times out after the specified time here. | String. `d.hh:mm:ss` (or) `hh:mm:ss`. The default value is seven days. Maximum value is: 90 days. | No
7373
Activities | Set of activities that are executed until expression evaluates to `true`. | Array of activities. | Yes
7474

7575
## Example 1
@@ -92,7 +92,7 @@ In this example, the pipeline has two activities: **Until** and **Wait**. The Wa
9292
"value": "@equals('Failed', coalesce(body('MyUnauthenticatedActivity')?.status, actions('MyUnauthenticatedActivity')?.status, 'null'))",
9393
"type": "Expression"
9494
},
95-
"timeout": "00:00:01",
95+
"timeout": "00:10:00",
9696
"activities": [
9797
{
9898
"name": "MyUnauthenticatedActivity",
@@ -129,7 +129,7 @@ In this example, the pipeline has two activities: **Until** and **Wait**. The Wa
129129
```
130130

131131
## Example 2
132-
The pipeline in this sample copies data from an input folder to an output folder in a loop. The loop terminates when the value for the repeat parameter is set to false or it times out after one minute.
132+
The pipeline in this sample copies data from an input folder to an output folder in a loop. The loop terminates when the value for the repeat parameter is set to false or it times out after one minute.
133133

134134
### Pipeline with Until activity (Adfv2QuickStartPipeline.json)
135135

@@ -145,7 +145,7 @@ The pipeline in this sample copies data from an input folder to an output folder
145145
"value": "@equals('false', pipeline().parameters.repeat)",
146146
"type": "Expression"
147147
},
148-
"timeout": "00:01:00",
148+
"timeout": "00:10:00",
149149
"activities": [
150150
{
151151
"name": "CopyFromBlobToBlob",

articles/data-factory/control-flow-wait-activity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ In this example, the pipeline has two activities: **Until** and **Wait**. The Wa
6868
"value": "@equals('Failed', coalesce(body('MyUnauthenticatedActivity')?.status, actions('MyUnauthenticatedActivity')?.status, 'null'))",
6969
"type": "Expression"
7070
},
71-
"timeout": "00:00:01",
71+
"timeout": "00:10:00",
7272
"activities": [
7373
{
7474
"name": "MyUnauthenticatedActivity",

articles/data-factory/control-flow-webhook-activity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To use a Webhook activity in a pipeline, complete the following steps:
4949
"body": {
5050
"key": "value"
5151
},
52-
"timeout": "00:03:00",
52+
"timeout": "00:10:00",
5353
"reportStatusOnCallBack": false,
5454
"authentication": {
5555
"type": "ClientCertificate",

articles/data-manager-for-agri/concepts-llm-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Our LLM capability enables seamless selection of APIs mapped to farm operations
2424
2525
## Prerequisites
2626
- An instance of [Azure Data Manager for Agriculture](quickstart-install-data-manager-for-agriculture.md)
27-
- An instance of [Azure Open AI](../ai-services/openai/how-to/create-resource.md) created in your Azure subscription.
27+
- An instance of [Azure OpenAI](../ai-services/openai/how-to/create-resource.md) created in your Azure subscription.
2828
- You need [Azure Key Vault](../key-vault/general/quick-create-portal.md)
2929
- You need [Azure Container Registry](../container-registry/container-registry-get-started-portal.md)
3030

@@ -59,4 +59,4 @@ These use cases help input providers to plan equipment, seeds, applications and
5959
## Next steps
6060

6161
* Fill this onboarding [**form**](https://forms.office.com/r/W4X381q2rd) to get started with testing our LLM feature.
62-
* View our Azure Data Manager for Agriculture APIs [here](/rest/api/data-manager-for-agri).
62+
* View our Azure Data Manager for Agriculture APIs [here](/rest/api/data-manager-for-agri).

0 commit comments

Comments
 (0)