Skip to content

Commit 3173b06

Browse files
authored
Merge pull request #300083 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 8a2ec1a + fe1e0ae commit 3173b06

12 files changed

+12
-12
lines changed

articles/api-management/developer-portal-self-host.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ Update the developer portal URL in any template that has a link in the footer:
432432

433433
## Move from managed to self-hosted developer portal
434434

435-
Over time, your business requirements may change. You can end up in a situation where the managed version of the API Management developer portal no longer satisfies your needs. For example, a new requirement may force you to build a custom widget that integrates with a third-party data provider. Unlike the manged version, the self-hosted version of the portal offers you full flexibility and extensibility.
435+
Over time, your business requirements may change. You can end up in a situation where the managed version of the API Management developer portal no longer satisfies your needs. For example, a new requirement may force you to build a custom widget that integrates with a third-party data provider. Unlike the managed version, the self-hosted version of the portal offers you full flexibility and extensibility.
436436

437437
### Transition process
438438

articles/data-factory/connector-snowflake.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ The following table shows the release stage and change logs for different versio
693693
| :----------- | :------- |:------- |
694694
| Snowflake V1 | GA version available | / |
695695
| Snowflake V2 (version 1.0) | GA version available | • Add support for Key pair authentication.<br><br>• The `accountIdentifier`, `warehouse`, `database`, `schema` and `role` properties are used to establish a connection instead of `connectionstring` property.<br><br>• Add support for BigDecimal in Lookup activity. The NUMBER type, as defined in Snowflake, will be displayed as a string in Lookup activity. If you want to covert it to numeric type in V2, you can use the pipeline parameter with [int function](control-flow-expression-language-functions.md#int) or [float function](control-flow-expression-language-functions.md#float). For example, `int(activity('lookup').output.firstRow.VALUE)`, `float(activity('lookup').output.firstRow.VALUE)`<br><br>• timestamp data type in Snowflake is read as DateTimeOffset data type in Lookup and Script activity. If you still need to use the Datetime value as a parameter in your pipeline after upgrading to V2, you can convert DateTimeOffset type to DateTime type by using [formatDateTime function](control-flow-expression-language-functions.md#formatdatetime) (recommended) or [concat function](control-flow-expression-language-functions.md#concat). For example: `formatDateTime(activity('lookup').output.firstRow.DATETIMETYPE)`, `concat(substring(activity('lookup').output.firstRow.DATETIMETYPE, 0, 19), 'Z')`<br><br>• Script parameters are not supported in Script activity. As an alternative, utilize dynamic expressions for script parameters. For more information, see [Expressions and functions in Azure Data Factory and Azure Synapse Analytics](control-flow-expression-language-functions.md).<br><br>• Multiple SQL statements execution in Script activity is not supported. |
696-
| Snowflake V2 (version 1.1) | Preview version available | • Add support for script parameters.<br><br>• Add support for mutiple statement execution in Script activity. |
696+
| Snowflake V2 (version 1.1) | Preview version available | • Add support for script parameters.<br><br>• Add support for multiple statement execution in Script activity. |
697697

698698
### <a name="upgrade-the-snowflake-linked-service"></a> Upgrade the Snowflake connector from V1 to V2
699699

articles/data-factory/data-factory-service-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ You can find the managed identity information from Azure portal -> your data fac
190190

191191
The managed identity information will also show up when you create linked service, which supports managed identity authentication, like Azure Blob, Azure Data Lake Storage, Azure Key Vault, etc.
192192

193-
To grant permissions for the Data Factory manged identity to your Azure data sources, follow these steps. For detailed steps, see [Assign Azure roles using the Azure portal](../role-based-access-control/role-assignments-portal.yml).
193+
To grant permissions for the Data Factory managed identity to your Azure data sources, follow these steps. For detailed steps, see [Assign Azure roles using the Azure portal](../role-based-access-control/role-assignments-portal.yml).
194194

195195
1. Select **Access control (IAM)** on the Azure portal page for the data source.
196196

articles/iot-central/core/howto-export-to-blob-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Blob Storage destinations let you configure the connection with a *connection st
4040

4141
# [Managed identity](#tab/managed-identity)
4242

43-
This article shows how to create a managed identity using the Azure CLI. You can also use the Azure portal to create a manged identity.
43+
This article shows how to create a managed identity using the Azure CLI. You can also use the Azure portal to create a managed identity.
4444

4545
If you don't have an existing Azure storage account to export to, run the following script in the Azure Cloud Shell bash environment. The script creates a resource group, Azure Storage account, and blob container. The script then enables the managed identity for your IoT Central application and assigns the role it needs to access your storage account:
4646

articles/iot-central/core/howto-export-to-event-hubs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Event Hubs destinations let you configure the connection with a *connection stri
3232

3333
# [Managed identity](#tab/managed-identity)
3434

35-
This article shows how to create a managed identity using the Azure CLI. You can also use the Azure portal to create a manged identity.
35+
This article shows how to create a managed identity using the Azure CLI. You can also use the Azure portal to create a managed identity.
3636

3737
If you don't have an existing Event Hubs namespace to export to, run the following script in the Azure Cloud Shell bash environment. The script creates a resource group, Event Hubs namespace, and event hub. The script then enables the managed identity for your IoT Central application and assigns the role it needs to access your event hub:
3838

articles/iot-central/core/howto-export-to-service-bus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Service Bus destinations let you configure the connection with a *connection str
3434

3535
# [Managed identity](#tab/managed-identity)
3636

37-
This article shows how to create a managed identity using the Azure CLI. You can also use the Azure portal to create a manged identity.
37+
This article shows how to create a managed identity using the Azure CLI. You can also use the Azure portal to create a managed identity.
3838

3939
If you don't have an existing Service Bus namespace to export to, run the following script in the Azure Cloud Shell bash environment. The script creates a resource group, Service Bus namespace, and queue. The script then enables the managed identity for your IoT Central application and assigns the role it needs to access your Service Bus queue:
4040

articles/scheduler/migrate-from-scheduler-to-logic-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ To control the way that an action tries to rerun in your workflow when intermitt
152152

153153
## Handle exceptions and errors
154154

155-
In Azure Scheduler, if the default action fails to run, you can run an alterative action that addresses the error condition. In Azure Logic Apps, you can also perform the same task. For more information about exception handling in Azure Logic Apps, see [Handle errors and exceptions - RunAfter property](../logic-apps/logic-apps-exception-handling.md#control-run-after-behavior).
155+
In Azure Scheduler, if the default action fails to run, you can run an alternative action that addresses the error condition. In Azure Logic Apps, you can also perform the same task. For more information about exception handling in Azure Logic Apps, see [Handle errors and exceptions - RunAfter property](../logic-apps/logic-apps-exception-handling.md#control-run-after-behavior).
156156

157157
1. In the designer, above the action that you want to handle, [add a parallel branch](../logic-apps/logic-apps-control-flow-branches.md).
158158

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ If you can't use a registered application or a service principal, use a configur
8484
For more information, see:
8585

8686
- [Authentication in Azure Key Vault](/azure/key-vault/general/authentication)
87-
- [What are manged identities for Azure resources?](/entra/identity/managed-identities-azure-resources/overview)
87+
- [What are managed identities for Azure resources?](/entra/identity/managed-identities-azure-resources/overview)
8888
- [Application and service principal objects in Microsoft Entra ID](/entra/identity-platform/app-objects-and-service-principals?tabs=browser)
8989

9090
Your virtual machine is typically created by your **infrastructure** team. Configuring access to credentials and managing key vaults is typically done by your **security** team.

articles/storage/blobs/storage-blob-copy-async-go.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The following methods wrap the [Copy Blob](/rest/api/storageservices/copy-blob)
5858

5959
## Copy a blob from a source within Azure
6060

61-
If you're copying a blob within the same storage account, the operation can complete synchronously. Access to the source blob can be authorized via Microsoft Entra ID (recommended), a shared access signature (SAS), or an account key. For an alterative synchronous copy operation, see [Copy a blob from a source object URL with Go](storage-blob-copy-url-go.md).
61+
If you're copying a blob within the same storage account, the operation can complete synchronously. Access to the source blob can be authorized via Microsoft Entra ID (recommended), a shared access signature (SAS), or an account key. For an alternative synchronous copy operation, see [Copy a blob from a source object URL with Go](storage-blob-copy-url-go.md).
6262

6363
If the copy source is a blob in a different storage account, the operation can complete asynchronously. The source blob must either be public or authorized via SAS token. The SAS token needs to include the **Read ('r')** permission. To learn more about SAS tokens, see [Delegate access with shared access signatures](../common/storage-sas-overview.md).
6464

articles/storage/blobs/storage-blob-copy-async-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The `beginCopy` method returns a [SyncPoller](/java/api/com.azure.core.util.poll
5252

5353
## Copy a blob from a source within Azure
5454

55-
If you're copying a blob within the same storage account, the operation can complete synchronously. Access to the source blob can be authorized via Microsoft Entra ID, a shared access signature (SAS), or an account key. For an alterative synchronous copy operation, see [Copy a blob from a source object URL with Java](storage-blob-copy-url-java.md).
55+
If you're copying a blob within the same storage account, the operation can complete synchronously. Access to the source blob can be authorized via Microsoft Entra ID, a shared access signature (SAS), or an account key. For an alternative synchronous copy operation, see [Copy a blob from a source object URL with Java](storage-blob-copy-url-java.md).
5656

5757
If the copy source is a blob in a different storage account, the operation can complete asynchronously. The source blob must either be public or authorized via SAS token. The SAS token needs to include the **Read ('r')** permission. To learn more about SAS tokens, see [Delegate access with shared access signatures](../common/storage-sas-overview.md).
5858

0 commit comments

Comments
 (0)