Merge pull request #36008 from rwestMSFT/rw-1204-editions

Minor editions tweak for consistency

Author: prmerger-automator[bot]

docs/linux/sql-server-linux-editions-and-components-2017.md

@@ -166,7 +166,7 @@ The Developer edition continues to support only one client for [SQL Server Distr
 | --- | :---: | :---: | :---: | :---: |
 | Dedicated admin connection | Yes | Yes | Yes | Yes <sup>1</sup> |
 | PowerShell scripting support | Yes | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | Yes | No |
 | Performance data collector | Yes | Yes | Yes | No |
 | Standard performance reports | Yes | Yes | Yes | No |

docs/linux/sql-server-linux-editions-and-components-2019.md

@@ -164,7 +164,7 @@ The Developer edition continues to support only one client for [SQL Server Distr
 | --- | :---: | :---: | :---: | :---: |
 | Dedicated admin connection | Yes | Yes | Yes | Yes <sup>1</sup> |
 | PowerShell scripting support | Yes | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | Yes | No |
 | Performance data collector | Yes | Yes | Yes | No |
 | Standard performance reports | Yes | Yes | Yes | No |

docs/linux/sql-server-linux-editions-and-components-2022.md

@@ -167,7 +167,7 @@ The Developer edition continues to support only one client for [SQL Server Distr
 | --- | :---: | :---: | :---: | :---: |
 | Dedicated admin connection | Yes | Yes | Yes | Yes <sup>1</sup> |
 | PowerShell scripting support | Yes | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | Yes | No |
 | Performance data collector | Yes | Yes | Yes | No |
 | Standard performance reports | Yes | Yes | Yes | No |

docs/linux/sql-server-linux-editions-and-components-2025.md

@@ -170,7 +170,7 @@ The Developer editions continue to support only one client for [SQL Server Distr
 | --- | :---: | :---: | :---: |
 | Dedicated admin connection | Yes | Yes | Yes <sup>1</sup> |
 | PowerShell scripting support | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | No |
 | Performance data collector | Yes | Yes | No |
 | Standard performance reports | Yes | Yes | No |

docs/sql-server/editions-and-components-of-sql-server-2016.md

@@ -239,7 +239,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Create new endpoints | Yes | Yes | Yes | No | No |
 | SysPrep support <sup>1</sup> | Yes | Yes | Yes | Yes | Yes |
 | PowerShell scripting support | Yes | Yes | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | Yes | No | No |
 | Performance data collector | Yes | Yes | Yes | No | No |
 | Able to enroll as a managed instance in multi-instance management | Yes | Yes | Yes | No | No |

docs/sql-server/editions-and-components-of-sql-server-2017.md

@@ -242,7 +242,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Create new endpoints | Yes | Yes | Yes | No | No |
 | SysPrep support <sup>1</sup> | Yes | Yes | Yes | Yes | Yes |
 | PowerShell scripting support <sup>2</sup> | Yes | Yes | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | Yes | No | No |
 | Performance data collector | Yes | Yes | Yes | No | No |
 | Able to enroll as a managed instance in multi-instance management | Yes | Yes | Yes | No | No |

docs/sql-server/editions-and-components-of-sql-server-2019.md

@@ -263,7 +263,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Create new endpoints | Yes | Yes | Yes | No | No |
 | SysPrep support <sup>2</sup> | Yes | Yes | Yes | Yes | Yes |
 | PowerShell scripting support <sup>3</sup> | Yes | Yes | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | Yes | No | No |
 | Performance data collector | Yes | Yes | Yes | No | No |
 | Able to enroll as a managed instance in multi-instance management | Yes | Yes | Yes | No | No |

docs/sql-server/editions-and-components-of-sql-server-2022.md

@@ -277,7 +277,7 @@ SQL Server 2022 includes features for connecting to [Azure Synapse Analytics](/a
 | Create new endpoints | Yes | Yes | Yes | No | No |
 | SysPrep support <sup>2</sup> | Yes | Yes | Yes | Yes | Yes |
 | PowerShell scripting support <sup>3</sup> | Yes | Yes | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | Yes | No | No |
 | Performance data collector | Yes | Yes | Yes | No | No |
 | Able to enroll as a managed instance in multi-instance management | Yes | Yes | Yes | No | No |

docs/sql-server/editions-and-components-of-sql-server-2025.md

@@ -259,7 +259,7 @@ For features supported by Enterprise Developer and Evaluation editions, see feat
 | Create new endpoints | Yes | Yes | No |
 | SysPrep support <sup>2</sup> | Yes | Yes | Yes |
 | PowerShell scripting support <sup>3</sup> | Yes | Yes | Yes |
-| Support for data-tier application component operations - extract, deploy, upgrade, delete | Yes | Yes | Yes |
+| Support for data-tier application component operations (extract, deploy, upgrade, delete) | Yes | Yes | Yes |
 | Policy automation (check on schedule and change) | Yes | Yes | No |
 | Performance data collector | Yes | Yes | No |
 | Able to enroll as a managed instance in multi-instance management | Yes | Yes | No |
@@ -295,6 +295,7 @@ For features supported by Enterprise Developer and Evaluation editions, see feat
 | Native XML support | Yes | Yes | Yes |
 | XML indexing | Yes | Yes | Yes |
 | XML compression | Yes | Yes | Yes |
+| `MERGE` and upsert capabilities | Yes | Yes | Yes |
 | UTF-8 and UTF-16 support | Yes | Yes | Yes |
 | Graph tables | Yes | Yes | Yes |
 | Temporal tables | Yes | Yes | Yes |