Skip to content

Commit f82e687

Browse files
committed
resolve merge conflict
2 parents d27f5d9 + ec9e26d commit f82e687

22 files changed

+1501
-664
lines changed

articles/app-service/deploy-staging-slots.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Set up Staging Environments in Azure App Service
2+
title: Set Up Staging Environments
33
description: Learn how to deploy apps to a nonproduction slot and automatically swap into production. Increase the reliability and eliminate app downtime from deployments.
44
ms.assetid: e224fc4f-800d-469a-8d6a-72bcde612450
55
ms.topic: how-to

articles/app-service/overview-authentication-authorization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Authentication and Authorization in Azure App Service and Azure Functions
2+
title: Authentication and Authorization
33
description: Learn about the built-in authentication and authorization support in Azure App Service and Azure Functions, and how it can help secure your app against unauthorized access.
44
ms.assetid: b7151b57-09e5-4c77-a10c-375a262f17e5
55
ms.topic: conceptual

articles/app-service/overview-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use managed identities for App Service and Azure Functions
2+
title: Managed Identities
33
description: Learn how managed identities work in Azure App Service and Azure Functions, along with how to configure a managed identity and generate a token for a back-end resource.
44
ms.topic: how-to
55
ms.date: 09/30/2024

articles/app-service/troubleshoot-diagnostic-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Enable Diagnostic Logging for Apps in Azure App Service
2+
title: Enable Diagnostic Logging
33
description: Learn how to enable diagnostic logging and add instrumentation to your application, along with how to access the information logged by Azure.
44
ms.assetid: c9da27b2-47d4-4c33-a3cb-1819955ee43b
55
ms.topic: how-to

articles/automation/delete-account.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article tells how to delete and your Automation account across
44
services: automation
55
ms.service: azure-automation
66
ms.subservice: process-automation
7-
ms.date: 12/28/2024
7+
ms.date: 03/20/2025
88
ms.topic: how-to
99
---
1010

@@ -93,6 +93,9 @@ While it attempts to unlink the Automation account, you can track the progress u
9393

9494
After the Automation account is successfully unlinked from the workspace, perform the steps in the [standalone Automation account](#delete-a-standalone-automation-account) section to delete the account.
9595

96+
> [!NOTE]
97+
> A previously soft-deleted Log Analytics workspace can't be unlinked from the Automation account successfully. In this scenario, first recover and permanently delete it to forcefully remove the link. Learn [how to recover a workspace in a soft-delete state](/azure/azure-monitor/logs/delete-workspace#recover-a-workspace-in-a-soft-delete-state) and [delete it permanently](/azure/azure-monitor/logs/delete-workspace#delete-a-workspace-permanently).
98+
9699
## Delete a shared capability Automation account
97100

98101
To delete your Automation account linked to a Log Analytics workspace in support of Update Management, Change Tracking and Inventory, and/or Start/Stop VMs during off-hours, perform the following steps.

articles/backup/create-manage-backup-vault.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create and delete Backup vaults
33
description: Learn how to create and delete the Backup vaults.
44
ms.topic: how-to
5-
ms.date: 11/23/2024
5+
ms.date: 03/19/2025
66
ms.custom: references_regions
77
ms.service: azure-backup
88
author: jyothisuri
@@ -44,6 +44,8 @@ Sign in to the [Azure portal](https://portal.azure.com).
4444

4545
![Select Review + Create](./media/backup-vault-overview/review-and-create.png)
4646

47+
Learn more about [creating a Backup vault using Azure Business Continuity Center](../business-continuity-center/backup-vaults.md).
48+
4749
## Delete a Backup vault
4850

4951
This section describes how to delete a Backup vault. It contains instructions for removing dependencies and then deleting a vault.

articles/backup/manage-backup-vault.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Manage Backup vaults
33
description: Learn how to manage the Backup vaults.
44
ms.topic: how-to
5-
ms.date: 10/10/2024
5+
ms.date: 03/19/2025
66
ms.custom: references_regions
77
ms.service: azure-backup
88
author: jyothisuri
@@ -14,6 +14,8 @@ This article describes how to manage Backup vaults once they're created.
1414

1515
A Backup vault is a storage entity in Azure that houses backup data for certain newer workloads that Azure Backup supports. You can use Backup vaults to hold backup data for various Azure services, such Azure Database for PostgreSQL servers and newer workloads that Azure Backup will support. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Backup vaults are based on the Azure Resource Manager model of Azure, which provides the **Azure role-based access control (Azure RBAC)** feature. Azure RBAC provides fine-grained access management control in Azure. [Azure provides various built-in roles](../role-based-access-control/built-in-roles.md), and Azure Backup has three [built-in roles to manage recovery points](backup-rbac-rs-vault.md). Backup vaults are compatible with Azure RBAC, which restricts backup and restore access to the defined set of user roles. [Learn more](backup-rbac-rs-vault.md).
1616

17+
Learn [how to create a Backup vault using Azure Business Continuity Center](../business-continuity-center/backup-vaults.md).
18+
1719
## Monitor and manage the Backup vault
1820

1921
This section explains how to use the Backup vault **Overview** dashboard to monitor and manage your Backup vaults. The overview pane contains two tiles: **Jobs** and **Instances**.

articles/data-factory/connector-oracle.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: jianleishen
66
ms.subservice: data-movement
77
ms.custom: synapse
88
ms.topic: conceptual
9-
ms.date: 03/04/2025
9+
ms.date: 03/20/2025
1010
ms.author: jianleishen
1111
---
1212

@@ -32,7 +32,7 @@ For a list of data stores that are supported as sources or sinks by the copy act
3232

3333
Specifically, this Oracle connector supports:
3434

35-
- The following versions of an Oracle database for version 2.0:
35+
- The following versions of an Oracle database for version 2.0 (Preview):
3636
- Oracle Database 19c or later
3737
- The following versions of an Oracle database for version 1.0:
3838
- Oracle 19c R1 (19.1) and higher
@@ -86,14 +86,14 @@ The following sections provide details about properties that are used to define
8686

8787
## Linked service properties
8888

89-
The Oracle connector now supports version 2.0. Refer to this [section](#upgrade-the-oracle-connector) to upgrade your Oracle connector version from version 1.0. For the property details, see the corresponding sections.
89+
The Oracle connector now supports version 2.0 (Preview). Refer to this [section](#upgrade-the-oracle-connector) to upgrade your Oracle connector version from version 1.0. For the property details, see the corresponding sections.
9090

91-
- [Version 2.0](#version-20)
91+
- [Version 2.0 (Preview)](#version-20-preview)
9292
- [Version 1.0](#version-10)
9393

94-
### Version 2.0
94+
### Version 2.0 (Preview)
9595

96-
The Oracle linked service supports the following properties when apply version 2.0:
96+
The Oracle linked service supports the following properties when apply version 2.0 (Preview):
9797

9898
| Property | Description | Required |
9999
|:--- |:--- |:--- |
@@ -348,7 +348,7 @@ To copy data from Oracle, set the source type in the copy activity to `OracleSou
348348
|:--- |:--- |:--- |
349349
| type | The type property of the copy activity source must be set to `OracleSource`. | Yes |
350350
| oracleReaderQuery | Use the custom SQL query to read data. An example is `"SELECT * FROM MyTable"`.<br>When you enable partitioned load, you need to hook any corresponding built-in partition parameters in your query. For examples, see the [Parallel copy from Oracle](#parallel-copy-from-oracle) section. | No |
351-
| convertDecimalToInteger | Oracle NUMBER type with zero or unspecified scale will be converted to corresponding integer. Allowed values are **true** and **false** (default). <br>If you are using Oracle version 2.0, this property will only be allowed to be set when supportV1DataTypes is true. | No |
351+
| convertDecimalToInteger | Oracle NUMBER type with zero or unspecified scale will be converted to corresponding integer. Allowed values are **true** and **false** (default). <br>If you are using Oracle version 2.0 (Preview), this property will only be allowed to be set when supportV1DataTypes is true. | No |
352352
| partitionOptions | Specifies the data partitioning options used to load data from Oracle. <br>Allowed values are: **None** (default), **PhysicalPartitionsOfTable**, and **DynamicRange**.<br>When a partition option is enabled (that is, not `None`), the degree of parallelism to concurrently load data from an Oracle database is controlled by the [`parallelCopies`](copy-activity-performance-features.md#parallel-copy) setting on the copy activity. | No |
353353
| partitionSettings | Specify the group of the settings for data partitioning. <br>Apply when the partition option isn't `None`. | No |
354354
| partitionNames | The list of physical partitions that needs to be copied. <br>Apply when the partition option is `PhysicalPartitionsOfTable`. If you use a query to retrieve the source data, hook `?AdfTabularPartitionName` in the WHERE clause. For an example, see the [Parallel copy from Oracle](#parallel-copy-from-oracle) section. | No |
@@ -487,7 +487,7 @@ You are suggested to enable parallel copy with data partitioning especially when
487487

488488
When you copy data from and to Oracle, the following interim data type mappings are used within the service. To learn about how the copy activity maps the source schema and data type to the sink, see [Schema and data type mappings](copy-activity-schema-and-type-mapping.md).
489489

490-
| Oracle data type | Interim service data type (for version 2.0) | Interim service data type (for version 1.0) |
490+
| Oracle data type | Interim service data type (for version 2.0 (Preview)) | Interim service data type (for version 1.0) |
491491
|:--- |:--- |:--- |
492492
| BFILE |Byte[] | Byte[] |
493493
| BINARY_FLOAT | Single | Single |
@@ -525,9 +525,9 @@ To learn details about the properties, check [Lookup activity](control-flow-look
525525

526526
Here are steps that help you upgrade the Oracle connector:
527527

528-
1. In **Edit linked service** page, select **2.0 (Preview)** under **Version** and configure the linked service by referring to [Linked service properties version 2.0](#version-20).
528+
1. In **Edit linked service** page, select **2.0 (Preview)** under **Version** and configure the linked service by referring to [Linked service properties version 2.0 (Preview)](#version-20-preview).
529529

530-
For the authentication related properties including username and password, specify the original values in the corresponding fields in version 2.0. Other connection properties such as host, port, and Oracle Service Name/Oracle SID in version 1.0 are now parameters of the [`server` property in version 2.0](#server-property-configuration).
530+
For the authentication related properties including username and password, specify the original values in the corresponding fields in version 2.0 (Preview). Other connection properties such as host, port, and Oracle Service Name/Oracle SID in version 1.0 are now parameters of the [`server` property in version 2.0 (Preview)](#server-property-configuration).
531531

532532
For example, if you configure the version 1.0 linked service as shown below:
533533

@@ -549,7 +549,7 @@ Here are steps that help you upgrade the Oracle connector:
549549
}
550550
```
551551

552-
The identical version 2.0 linked service configuration using **Easy Connect (Plus) Naming** is:
552+
The identical version 2.0 (Preview) linked service configuration using **Easy Connect (Plus) Naming** is:
553553

554554
:::image type="content" source="media/connector-oracle/easy-connect-naming-linked-service.png" alt-text="Screenshot of linked service using easy connector (Plus) naming.":::
555555

@@ -573,7 +573,7 @@ Here are steps that help you upgrade the Oracle connector:
573573
}
574574
```
575575

576-
The identical version 2.0 linked service configuration using **Connector Descriptor** is:
576+
The identical version 2.0 (Preview) linked service configuration using **Connector Descriptor** is:
577577

578578
:::image type="content" source="media/connector-oracle/connector-descriptor-linked-service.png" alt-text="Screenshot of linked service using connector descriptor.":::
579579

@@ -603,13 +603,13 @@ Here are steps that help you upgrade the Oracle connector:
603603

604604
Note that:
605605

606-
- If you use **Oracle Service Name** in version 1.0, you can use **Easy Connect (Plus) Naming** or **Connector Descriptor** as the server format in version 2.0.
606+
- If you use **Oracle Service Name** in version 1.0, you can use **Easy Connect (Plus) Naming** or **Connector Descriptor** as the server format in version 2.0 (Preview).
607607

608-
- If you use **Oracle SID** in version 1.0, you need to use **Connector Descriptor** as the server format in version 2.0.
608+
- If you use **Oracle SID** in version 1.0, you need to use **Connector Descriptor** as the server format in version 2.0 (Preview).
609609

610-
- For some additional connection properties in version 1.0, we provide alternative properties or parameters in the `server` property in version 2.0. You can refer to the table below to upgrade the version 1.0 properties.
610+
- For some additional connection properties in version 1.0, we provide alternative properties or parameters in the `server` property in version 2.0 (Preview). You can refer to the table below to upgrade the version 1.0 properties.
611611

612-
| Version 1.0 | Version 2.0  |
612+
| Version 1.0 | Version 2.0 (Preview)  |
613613
|:--- |:--- |
614614
| encryptionmethod| PROTOCOL (parameter in `server`) |
615615
| tnsnamesfile | TNS_ADMIN (environment variable supported on the self-hosted integration runtime)  |
@@ -625,7 +625,7 @@ Here are steps that help you upgrade the Oracle connector:
625625
| cryptoprotocolversion | SSL_VERSION (parameter in `server`) |
626626
| truststore | WALLET_LOCATION (parameter in `server`) |
627627

628-
For example, if you use `alternateservers` in version 1.0, you can set the `DESCRIPTION_LIST` parameter in the server property in version 2.0:
628+
For example, if you use `alternateservers` in version 1.0, you can set the `DESCRIPTION_LIST` parameter in the server property in version 2.0 (Preview):
629629

630630
Version 1.0 linked service using `alternateservers`:
631631

@@ -641,7 +641,7 @@ Here are steps that help you upgrade the Oracle connector:
641641
}
642642
```
643643

644-
Identical version 2.0 linked service using `DESCRIPTION_LIST` parameter in **Connector Descriptor**:
644+
Identical version 2.0 (Preview) linked service using `DESCRIPTION_LIST` parameter in **Connector Descriptor**:
645645

646646
```json
647647
{
@@ -659,15 +659,15 @@ Here are steps that help you upgrade the Oracle connector:
659659
}
660660
```
661661

662-
2. The data type mapping for the Oracle linked service version 2.0 is different from that for the version 1.0. To learn the latest data type mapping, see [Data type mapping for Oracle](#data-type-mapping-for-oracle).
662+
2. The data type mapping for the Oracle linked service version 2.0 (Preview) is different from that for the version 1.0. To learn the latest data type mapping, see [Data type mapping for Oracle](#data-type-mapping-for-oracle).
663663

664-
An additional connection property `supportV1DataTypes` in version 2.0 can reduce upgrade difficulties caused by data type changes. Setting this property to `true` ensures that the data type in version 2.0 remains consistent with version 1.0.
664+
An additional connection property `supportV1DataTypes` in version 2.0 (Preview) can reduce upgrade difficulties caused by data type changes. Setting this property to `true` ensures that the data type in version 2.0 (Preview) remains consistent with version 1.0.
665665

666-
## Differences between Oracle version 2.0 and version 1.0
666+
## Differences between Oracle version 2.0 (Preview) and version 1.0
667667

668-
The Oracle connector version 2.0 offers new functionalities and is compatible with most features of version 1.0. The following table shows the feature differences between version 2.0 and version 1.0.
668+
The Oracle connector version 2.0 (Preview) offers new functionalities and is compatible with most features of version 1.0. The following table shows the feature differences between version 2.0 (Preview) and version 1.0.
669669

670-
| Version 2.0 | Version 1.0  |
670+
| Version 2.0 (Preview) | Version 1.0  |
671671
|:--- |:--- |
672672
|The following mappings are used from Oracle data types to interim service data types used by the service internally. <br><br>NUMBER(p,s) -> Int16, Int32, Int64, Double, Single, Decimal <br>FLOAT(p)-> Double or Decimal based on its precision <br>NUMBER -> Decimal <br>TIMESTAMP WITH TIME ZONE -> DateTimeOffset <br>INTERVAL YEAR TO MONTH -> Int64 <br>INTERVAL DAY TO SECOND -> TimeSpan |The following mappings are used from Oracle data types to interim service data types used by the service internally. <br><br>NUMBER(p,s) -> Decimal or String based on its precision <br>FLOAT(p)-> Double <br>NUMBER -> Double <br>TIMESTAMP WITH TIME ZONE -> DateTime <br>INTERVAL YEAR TO MONTH -> String <br>INTERVAL DAY TO SECOND -> String |
673673
| Support convertDecimalToInteger in copy source when `supportV1DataTypes` is set to `true`. | Support convertDecimalToInteger in copy source.  |

articles/logic-apps/.openpublishing.redirection.logic-apps.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/logic-apps/monitor-b2b-messages-log-analytics.md",
5+
"redirect_url": "/azure/logic-apps/monitor-track-b2b-messages-consumption",
6+
"redirect_document_id": true
7+
},
8+
{
9+
"source_path_from_root": "/articles/logic-apps/tracking-schemas-as2-x12-custom.md",
10+
"redirect_url": "/azure/logic-apps/tracking-schemas-consumption",
11+
"redirect_document_id": true
12+
},
313
{
414
"source_path_from_root": "/articles/logic-apps/install-on-premises-data-gateway.md",
515
"redirect_url": "/data-integration/gateway/service-gateway-install",
@@ -552,17 +562,17 @@
552562
},
553563
{
554564
"source_path_from_root": "/articles/app-service-logic/app-service-logic-track-integration-account-as2-tracking-shemas.md",
555-
"redirect_url": "/azure/logic-apps/tracking-schemas-as2-x12-custom",
565+
"redirect_url": "/azure/logic-apps/tracking-schemas-consumption",
556566
"redirect_document_id": false
557567
},
558568
{
559569
"source_path_from_root": "/articles/app-service-logic/app-service-logic-track-integration-account-custom-tracking-shema.md",
560-
"redirect_url": "/azure/logic-apps/tracking-schemas-as2-x12-custom",
570+
"redirect_url": "/azure/logic-apps/tracking-schemas-consumption",
561571
"redirect_document_id": false
562572
},
563573
{
564574
"source_path_from_root": "/articles/app-service-logic/app-service-logic-track-integration-account-x12-tracking-shemas.md",
565-
"redirect_url": "/azure/logic-apps/tracking-schemas-as2-x12-custom",
575+
"redirect_url": "/azure/logic-apps/tracking-schemas-consumption",
566576
"redirect_document_id": false
567577
},
568578
{
@@ -967,17 +977,17 @@
967977
},
968978
{
969979
"source_path_from_root": "/articles/logic-apps/logic-apps-track-integration-account-as2-tracking-schemas.md",
970-
"redirect_url": "/azure/logic-apps/tracking-schemas-as2-x12-custom",
980+
"redirect_url": "/azure/logic-apps/tracking-schemas-consumption",
971981
"redirect_document_id": false
972982
},
973983
{
974984
"source_path_from_root": "/articles/logic-apps/logic-apps-track-integration-account-x12-tracking-schema.md",
975-
"redirect_url": "/azure/logic-apps/tracking-schemas-as2-x12-custom",
985+
"redirect_url": "/azure/logic-apps/tracking-schemas-consumption",
976986
"redirect_document_id": false
977987
},
978988
{
979989
"source_path_from_root": "/articles/logic-apps/logic-apps-track-integration-account-custom-tracking-schema.md",
980-
"redirect_url": "/azure/logic-apps/tracking-schemas-as2-x12-custom",
990+
"redirect_url": "/azure/logic-apps/tracking-schemas-consumption",
981991
"redirect_document_id": false
982992
}
983993
]
66.8 KB
Loading

0 commit comments

Comments
 (0)