Merge pull request #153647 from savjani/master

Quick updates

Author: v-ccolin

articles/mariadb/concepts-pricing-tiers.md

@@ -41,10 +41,14 @@ The storage you provision is the amount of storage capacity available to your Az
 | Storage attributes   | Basic | General Purpose | Memory Optimized |
 |:---|:----------|:--------------------|:---------------------|
 | Storage type | Basic Storage | General Purpose Storage | General Purpose Storage |
-| Storage size | 5 GB to 1 TB | 5 GB to 4 TB | 5 GB to 4 TB |
+| Storage size | 5 GB to 1 TB | 5 GB to 16 TB | 5 GB to 16 TB |
 | Storage increment size | 1 GB | 1 GB | 1 GB |
 | IOPS | Variable |3 IOPS/GB<br/>Min 100 IOPS<br/>Max 6000 IOPS | 3 IOPS/GB<br/>Min 100 IOPS<br/>Max 6000 IOPS |
 
+>[!IMPORTANT]
+> Storage up to 16TB and 20,000 IOPS is supported in the following regions: East US, East US 2, Central US, Brazil South, West US, North Central US, South Central US, North Europe, West Europe, UK South, UK West, Southeast Asia, East Asia, Japan East, Japan West, Korea Central, Korea South, Australia East, Australia South East, West US 2, West Central US, Canada East, and Canada Central.
+> All other regions support up to 4TB of storage and up to 6000 IOPS.
+
 You can add additional storage capacity during and after the creation of the server, and allow the system to grow storage automatically based on the storage consumption of your workload.
 
 >[!NOTE]
@@ -54,23 +58,6 @@ The Basic tier does not provide an IOPS guarantee. In the General Purpose and Me
 
 You can monitor your I/O consumption in the Azure portal or by using Azure CLI commands. The relevant metrics to monitor are [storage limit, storage percentage, storage used, and IO percent](concepts-monitoring.md).
 
-### Large storage (Preview)
-
-We are increasing the storage limits in our General Purpose and Memory Optimized tiers. Newly created servers that opt-in to the preview can provision up to 16 TB of storage. The IOPS scale at a 3:1 ratio up to 20,000 IOPS. As with the current generally available storage, you can add additional storage capacity after the creation of the server, and allow the system to grow storage automatically based on the storage consumption of your workload.
-
-| Storage attributes | General Purpose | Memory Optimized |
-|:-------------|:--------------------|:---------------------|
-| Storage type | Azure Premium Storage | Azure Premium Storage |
-| Storage size | 32 GB to 16 TB| 32 to 16 TB |
-| Storage increment size | 1 GB | 1 GB |
-| IOPS | 3 IOPS/GB<br/>Min 100 IOPS<br/>Max 20,000 IOPS| 3 IOPS/GB<br/>Min 100 IOPS<br/>Max 20,000 IOPS |
-
-> [!IMPORTANT]
-> Large storage is currently in public preview in the following regions: East US, East US 2, Brazil South, Central US, West US, North Central US, South Central US, North Europe, West Europe, UK South, UK West, Southeast Asia, East Asia, Japan East, Japan West, Korea Central, Korea South, Australia East, Australia South East, West US 2, West Central US, Canada East, and Canada Central.
->
-> All other regions support up to 4TB of storage and up to 6000 IOPS.
->
-
 ### Reaching the storage limit
 
 Servers with less than equal to 100 GB provisioned storage are marked read-only if the free storage is less than 5% of the provisioned storage size. Servers with more than 100 GB provisioned storage are marked read only when the free storage is less than 5 GB.
@@ -107,4 +94,4 @@ For the most up-to-date pricing information, see the service [pricing page](http
 
 ## Next steps
 - Learn about the [service limitations](concepts-limits.md).
-- Learn how to [create a MariaDB server in the Azure portal](quickstart-create-mariadb-server-database-using-azure-portal.md).
+- Learn how to [create a MariaDB server in the Azure portal](quickstart-create-mariadb-server-database-using-azure-portal.md).

articles/mysql/concepts-compatibility.md

@@ -8,8 +8,11 @@ ms.topic: conceptual
 ms.date: 3/18/2020
 ---
 # MySQL drivers and management tools compatible with Azure Database for MySQL
-[!INCLUDE[applies-to-single-flexible-server](includes/applies-to-single-flexible-server.md)]
-This article describes the drivers and management tools that are compatible with Azure Database for MySQL.
+
+This article describes the drivers and management tools that are compatible with Azure Database for MySQL Single Server.
+
+>[!NOTE]
+>This article is only applicable to Azure Database for MySQL Single Server to ensure drivers are compatible with [connectivity architecture](concepts-connectivity-architecture.md) of Single Server service. [Azure Database for MySQL Flexible Server](/../flexible-server/overview.md) is compatible with all the drivers and tools supported and compatible with MySQL community edition. 
 
 ## MySQL Drivers
 Azure Database for MySQL uses the world's most popular community edition of MySQL database. Therefore, it is compatible with a wide variety of programming languages and drivers. The goal is to support the three most recent versions MySQL drivers, and efforts with authors from the open source community to constantly improve the functionality and usability of MySQL drivers continue. A list of drivers that have been tested and found to be compatible with Azure Database for MySQL 5.6 and 5.7 is provided in the following table: