Skip to content

Commit c5d22a7

Browse files
authored
Merge pull request #259772 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 d0b0792 + 1425d6d commit c5d22a7

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

articles/ai-services/speech-service/batch-transcription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To use the batch transcription REST API:
3636
1. [Get batch transcription results](batch-transcription-get.md) - Check transcription status and retrieve transcription results asynchronously.
3737

3838
> [!IMPORTANT]
39-
> Batch transcription jobs are scheduled on a best-effort basis. At pick hours it may take up to 30 minutes or longer for a transcription job to start processing. See how to check the current status of a batch transcription job in [this section](batch-transcription-get.md#get-transcription-status).
39+
> Batch transcription jobs are scheduled on a best-effort basis. At peak hours it may take up to 30 minutes or longer for a transcription job to start processing. See how to check the current status of a batch transcription job in [this section](batch-transcription-get.md#get-transcription-status).
4040
4141
## Next steps
4242

articles/aks/azure-cni-overlay.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ The `--pod-cidr` parameter is required when upgrading from legacy CNI because th
169169

170170
[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
171171

172-
You must register the `Microsoft.ContainerService` `AzureOverlayDualStackPreview` feature flag.
172+
You must have the latest aks-preview Azure CLI extension installed and register the `Microsoft.ContainerService` `AzureOverlayDualStackPreview` feature flag.
173173

174174
Update an existing Kubenet cluster to use Azure CNI Overlay using the [`az aks update`][az-aks-update] command.
175175

articles/cosmos-db/analytical-store-change-data-capture.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In addition to providing incremental data feed from analytical store to diverse
2929
- Supports applying filters, projections and transformations on the Change feed via source query
3030
- Multiple change feeds on the same container can be consumed simultaneously
3131
- Each change in container appears exactly once in the change data capture feed, and the checkpoints are managed internally for you
32-
- Changes can be synchronized "from the Beginning” or “from a given timestamp” or “from now”
32+
- Changes can be synchronized "from the beginning” or “from a given timestamp” or “from now”
3333
- There's no limitation around the fixed data retention period for which changes are available
3434

3535
## Efficient incremental data capture with internally managed checkpoints
@@ -46,7 +46,7 @@ Change data capture in Azure Cosmos DB analytical store supports the following k
4646

4747
### Capturing changes from the beginning
4848

49-
When the `Start from beginning` option is selected, the initial load includes a full snapshot of container data in the first run, and changed or incremental data is captured in subsequent runs. This is limited by the `analytical TTL` property and documents TTL-removed from analytical store are not included in the change feed. Example: Imagine a container with `analytical TTL` set to 31536000 seconds, what is equivalent to 1 year. If you create a CDC process for this container, only documents newer than 1 year will be included in the initial load.
49+
When the `Start from beginning` option is selected, the initial load includes a full snapshot of container data in the first run, and changed or incremental data is captured in subsequent runs. This is limited by the `analytical TTL` property and documents TTL-removed from analytical store are not included in the change feed. Example: Imagine a container with `analytical TTL` set to 31536000 seconds, which is equivalent to 1 year. If you create a CDC process for this container, only documents newer than 1 year will be included in the initial load.
5050

5151
### Capturing changes from a given timestamp
5252

@@ -85,7 +85,7 @@ You can create multiple processes to consume CDC in analytical store. This appro
8585

8686
### Throughput isolation, lower latency and lower TCO
8787

88-
Operations on Cosmos DB analytical store don't consume the provisioned RUs and so don't affect your transactional workloads. change data capture with analytical store also has lower latency and lower TCO. The lower latency is attributed to analytical store enabling better parallelism for data processing and reduces the overall TCO enabling you to drive cost efficiencies in these rapidly shifting economic conditions.
88+
Operations on Cosmos DB analytical store don't consume the provisioned RUs and so don't affect your transactional workloads. Change data capture with analytical store also has lower latency and lower TCO. The lower latency is attributed to analytical store enabling better parallelism for data processing and reduces the overall TCO enabling you to drive cost efficiencies in these rapidly shifting economic conditions.
8989

9090
## Scenarios
9191

@@ -111,7 +111,7 @@ Change data capture capability enables an end-to-end analytical solution providi
111111

112112
The linked service interface for the API for MongoDB isn't available within Azure Data Factory data flows yet. You can use your API for MongoDB's account endpoint with the **Azure Cosmos DB for NoSQL** linked service interface as a work around until the Mongo linked service is directly supported.
113113

114-
In the interface for a new NoSQL linked service, select **Enter Manually** to provide the Azure Cosmos DB account information. Here, use the account's NoSQL document endpoint (ex: `https://<account-name>.documents.azure.com:443/`) instead of the Mongo DB endpoint (ex: `mongodb://<account-name>.mongo.cosmos.azure.com:10255/`)
114+
In the interface for a new NoSQL linked service, select **Enter Manually** to provide the Azure Cosmos DB account information. Here, use the account's NoSQL document endpoint (Example: `https://<account-name>.documents.azure.com:443/`) instead of the Mongo DB endpoint (Example: `mongodb://<account-name>.mongo.cosmos.azure.com:10255/`)
115115

116116
## Next steps
117117

articles/machine-learning/how-to-setup-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Microsoft Entra Conditional Access can be used to further control or restrict ac
3535
## Prerequisites
3636

3737
* Create an [Azure Machine Learning workspace](how-to-manage-workspace.md).
38-
* [Configure your development environment](how-to-configure-environment.md) or use a [Azure Machine Learning compute instance](how-to-create-compute-instance.md) and install the [Azure Machine Learning SDK v2](https://aka.ms/sdk-v2-install).
38+
* [Configure your development environment](how-to-configure-environment.md) or use an [Azure Machine Learning compute instance](how-to-create-compute-instance.md) and install the [Azure Machine Learning SDK v2](https://aka.ms/sdk-v2-install).
3939

4040
* Install the [Azure CLI](/cli/azure/install-azure-cli).
4141

articles/sap/monitor/provider-ha-pacemaker-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ When the provider settings validation operation fails with the code `PrometheusU
116116
1. Restart the HA cluster exporter agent.
117117
118118
```bash
119-
sstemctl start pmproxy
119+
systemctl start pmproxy
120120
```
121121
122122
1. Reenable the HA cluster exporter agent.

articles/sentinel/sap/deploy-data-connector-agent-container.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ In this section, you deploy the data connector agent. After you deploy the agent
231231
:::image type="content" source="media/deploy-data-connector-agent-container/finish-agent-deployment.png" alt-text="Screenshot of the final stage of the agent deployment.":::
232232
233233
1. Under **Just one step before we finish**, select **Copy** :::image type="content" source="media/deploy-data-connector-agent-container/copy-icon.png" alt-text="Screenshot of the Copy icon." border="false"::: next to **Agent command**.
234+
235+
The script updates the OS components, installs the Azure CLI and Docker software and other required utilities (jq, netcat, curl). You can supply additional parameters to the script to customize the container deployment. For more information on available command line options, see [Kickstart script reference](reference-kickstart.md).
236+
234237
1. In your target VM (the VM where you plan to install the agent), open a terminal and run the command you copied in the previous step.
235238
236239
The relevant agent information is deployed into Azure Key Vault, and the new agent is visible in the table under **Add an API based collector agent**.

articles/storage/files/authorize-oauth-rest.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ namespace FilesOAuthSample
108108
string aadEndpoint = "";
109109
string accountUri = "";
110110
string connectionString = "";
111-
string shareName = "testShare";
111+
string shareName = "test-share";
112112
string directoryName = "testDirectory";
113113
string fileName = "testFile";
114114
@@ -124,11 +124,11 @@ namespace FilesOAuthSample
124124
AuthorityHost = new Uri(aadEndpoint)
125125
});
126126
127-
ShareClientOptions clientOptions = new ShareClientOptions(ShareClientOptions.ServiceVersion.V2021_12_02);
127+
ShareClientOptions clientOptions = new ShareClientOptions(ShareClientOptions.ServiceVersion.V2023_05_03);
128128
129129
// Set Allow Trailing Dot and Source Allow Trailing Dot.
130130
clientOptions.AllowTrailingDot = true;
131-
clientOptions.SourceAllowTrailingDot = true;
131+
clientOptions.AllowSourceTrailingDot = true;
132132
133133
// x-ms-file-intent=backup will automatically be applied to all APIs
134134
// where it is required in derived clients.

0 commit comments

Comments
 (0)