Skip to content

Commit d858ff2

Browse files
authored
Merge pull request #273922 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 746dac4 + 324c389 commit d858ff2

File tree

8 files changed

+27
-25
lines changed

8 files changed

+27
-25
lines changed

articles/ai-services/document-intelligence/quickstarts/try-document-intelligence-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ monikerRange: '>=doc-intel-3.0.0'
2828
* A [**Document Intelligence**](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) or [**multi-service**](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource.
2929

3030
> [!TIP]
31-
> Create an Azure AI services resource if you plan to access multiple Azure AI services under a single endpoint/key. For Document Intelligence access only, create a Document Intelligence resource. Currently [Microsoft Entra authentication](../../../active-directory/authentication/overview-authentication.md) is not supported on Document Intelligence Studio to access Document Intelligence service APIs. To use Document Intelligence Studio, enabling access key-based authentication/local authentication is necessary.
31+
> Create an Azure AI services resource if you plan to access multiple Azure AI services under a single endpoint/key. For Document Intelligence access only, create a Document Intelligence resource. Please note that you'll need a single-service resource if you intend to use [Microsoft Entra authentication](../../../active-directory/authentication/overview-authentication.md).
3232
3333
#### Azure role assignments
3434

articles/ai-services/speech-service/includes/how-to/recognize-speech/cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ speechRecognizer->SessionStopped.Connect([&recognitionEnd](const SessionEventArg
171171
});
172172
```
173173
174-
With everything set up, call [`StopContinuousRecognitionAsync`](/cpp/cognitive-services/speech/speechrecognizer#startcontinuousrecognitionasync) to start recognizing:
174+
With everything set up, call [`StartContinuousRecognitionAsync`](/cpp/cognitive-services/speech/speechrecognizer#startcontinuousrecognitionasync) to start recognizing:
175175
176176
```cpp
177177
// Starts continuous recognition. Uses StopContinuousRecognitionAsync() to stop recognition.

articles/communication-services/quickstarts/email/send-email-smtp/smtp-authentication.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ username: <Azure Communication Services Resource name>.<Entra Application ID>.<E
7979
```
8080
**Pipe-delimited Format:**
8181
```
82-
username: <Azure Communication Services Resource name>.<Entra Application ID>.<Entra Tenant ID>
83-
OR
8482
username: <Azure Communication Services Resource name>|<Entra Application ID>|<Entra Tenant ID>
8583
```
8684

articles/cosmos-db/nosql/stored-procedures-triggers-udfs.md

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

articles/postgresql/flexible-server/azure-pipelines-deploy-database-task.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ The following example illustrates how to pass database arguments and run `execut
3535
displayName: Azure CLI
3636
inputs:
3737
azureSubscription: <Name of the Azure Resource Manager service connection>
38+
scriptType: 'pscore'
3839
scriptLocation: inlineScript
3940
arguments:
4041
-SERVERNAME mydemoserver `
@@ -57,6 +58,7 @@ The following example illustrates how to run an inline SQL script using `execute
5758
displayName: Azure CLI
5859
inputs:
5960
azureSubscription: <Name of the Azure Resource Manager service connection>
61+
scriptType: 'pscore'
6062
scriptLocation: inlineScript
6163
arguments:
6264
-SERVERNAME mydemoserver `

articles/postgresql/flexible-server/concepts-data-encryption.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ Here are requirements for configuring Key Vault:
7777

7878
- The **Days to retain deleted vaults** setting for Key Vault must be **90**. If you configured the existing Key Vault instance with a lower number, you need to create a new Key Vault instance because you can't modify an instance after creation.
7979

80+
- It is recommended to set the **Days to retain deleted vaults** configuration for Key Vault to 90 days. In the event that you have configured an existing Key Vault instance with a lower number, it should still valid. However, if you wish to modify this setting and increase the value, it is necessary to create a new Key Vault instance. Once an instance is created, it is not possible to modify its configuration.
81+
8082
- Enable the soft-delete feature in Key Vault to help protect from data loss if a key or a Key Vault instance is accidentally deleted. Key Vault retains soft-deleted resources for 90 days unless the user recovers or purges them in the meantime. The recover and purge actions have their own permissions associated with a Key Vault access policy.
8183

8284
The soft-delete feature is off by default, but you can turn it on through PowerShell or the Azure CLI. You can't turn it on through the Azure portal.

articles/storage/files/storage-files-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ms.topic: conceptual
3333
- The file existed in the Azure file share and server endpoint location prior to the server endpoint creation. If the file size and/or last modified time is different between the file on the server and Azure file share when the server endpoint is created, a conflict file is created.
3434
- Sync database was recreated due to corruption or knowledge limit reached. Once the database is recreated, sync enters a mode called reconciliation. If the file size and/or last modified time is different between the file on the server and Azure file share when reconciliation occurs, a conflict file is created.
3535

36-
Azure File Sync uses a simple conflict-resolution strategy: we keep both changes to files that are changed in two endpoints at the same time. The most recently written change keeps the original file name. The older file (determined by LastWriteTime) has the endpoint name and the conflict number appended to the file name. For server endpoints, the endpoint name is the name of the server. For cloud endpoints, the endpoint name is **Cloud**. The name follows this taxonomy:
36+
Once the initial upload to the Azure file share is complete, Azure File Sync doesn't overwrite any files in your sync group. Instead, it uses a simple conflict-resolution strategy: it keeps both changes to files that are changed in two endpoints at the same time. The most recently written change keeps the original file name. The older file (determined by LastWriteTime) has the endpoint name and the conflict number appended to the file name. For server endpoints, the endpoint name is the name of the server. For cloud endpoints, the endpoint name is **Cloud**. The name follows this taxonomy:
3737

3838
\<FileNameWithoutExtension\>-\<endpointName\>\[-#\].\<ext\>
3939

articles/virtual-machines/workloads/oracle/oracle-performance-best-practice.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Snapshots can be cloned to provide read/write access to current data for test an
9292

9393
## Automate VMs and storage selection
9494

95-
Consider using Community tool Oracle Migration Assistant Tool (OMAT) to get the right VM SKUs with recommended storage options including disk types, Elastic SAN & ANF with indicative cost based on list price. You can upload AWR report of the Oracle database as input and run the script to get an output of the recommended VM SKUs and storage options that aligns with the performance requirements of the database and is cost effective.
95+
Consider using Community tool [Oracle Migration Assistant Tool](https://github.com/Azure/Oracle-Workloads-for-Azure/tree/main/omat) (OMAT) to get the right VM SKUs with recommended storage options including disk types, Elastic SAN & ANF with indicative cost based on list price. You can provide AWR report of the Oracle database as a input and run the OMT tool script to get an output of the recommended VM SKUs and storage options that aligns with the performance requirements of the database and is cost effective.
9696

9797
## Next steps
9898
- [Migrate Oracle workload to Azure VMs (IaaS)](oracle-migration.md)

0 commit comments

Comments
 (0)