Merge pull request #260765 from v-thepet/terms4

[SCOPED] Azure Database for MySQL flexible server naming - connect and howto articles

Author: denrea

articles/mysql/flexible-server/concepts-maintenance.md

@@ -12,7 +12,7 @@ ms.date: 05/24/2022
 
 # Scheduled maintenance in Azure Database for MySQL - Flexible Server
 
-[[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
+[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
 
 Azure Database for MySQL flexible server performs periodic maintenance to keep your managed database secure, stable, and up-to-date. During maintenance, the server gets new features, updates, and patches.
 > [!IMPORTANT]

articles/mysql/flexible-server/connect-azure-cli.md

@@ -12,22 +12,22 @@ ms.date: 05/03/2023
 
 # Quickstart: Connect with Azure Database for MySQL - Flexible Server by using Azure CLI
 
-[[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
+[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
 
-This quickstart demonstrates how to connect to an Azure Database for MySQL - Flexible Server using Azure CLI with ```az mysql flexible-server connect``` and execute single query or sql file with ```az mysql flexible-server execute``` command. This command allows you test connectivity to your database server and run queries. You can also run multiple queries using the interactive mode.
+This quickstart demonstrates how to connect to Azure Database for MySQL flexible server using Azure CLI with `az mysql flexible-server connect` and execute single query or sql file with the `az mysql flexible-server execute` command. This command allows you test connectivity to your database server and run queries. You can also run multiple queries using the interactive mode.
 
 ## Prerequisites
 
 - An Azure account with an active subscription. 
 
     [!INCLUDE [flexible-server-free-trial-note](../includes/flexible-server-free-trial-note.md)]
 - Install [Azure CLI](/cli/azure/install-azure-cli) latest version (2.20.0 or higher)
-- Log in using Azure CLI with ```az login``` command
-- Turn on parameter persistence with ```az config param-persist on```. Parameter persistence helps you use local context without having to repeat numerous arguments like resource group or location etc.
+- Log in using Azure CLI with the `az login` command
+- Turn on parameter persistence with `az config param-persist on`. Parameter persistence helps you use local context without having to repeat numerous arguments like resource group or location.
 
 ## Create a MySQL Flexible Server
 
-The first thing we create is a managed MySQL server. In [Azure Cloud Shell](https://shell.azure.com/), run the following script and make a note of the **server name**, **username** and  **password** generated from this command.
+The first thing to create is a managed Azure Database for MySQL flexible server instance. In [Azure Cloud Shell](https://shell.azure.com/), run the following script and make a note of the **server name**, **username** and  **password** generated from this command.
 
 ```azurecli-interactive
 az mysql flexible-server create --public-access <your-ip-address>
@@ -162,7 +162,7 @@ test   200
 
 ## Run SQL File
 
-You can execute a sql file with the command using ```--file-path``` argument, ```-q```.
+You can execute a sql file with the command using `--file-path` argument, `-q`.
 
 ```azurecli-interactive
 az mysql flexible-server execute -n <server-name> -u <username> -p "<password>" -d <database-name> --file-path "<file-path>"
@@ -186,5 +186,5 @@ Closed the connection to mysqldemoserver.
 ## Next Steps
 
 > [!div class="nextstepaction"]
-* [Connect to Azure Database for MySQL - Flexible Server with encrypted connections](how-to-connect-tls-ssl.md)
+* [Connect to Azure Database for MySQL flexible server with encrypted connections](how-to-connect-tls-ssl.md)
 * [Manage the server](./how-to-manage-server-cli.md)

articles/mysql/flexible-server/connect-csharp.md

@@ -13,9 +13,9 @@ ms.date: 05/03/2023
 
 # Quickstart: Use .NET (C#) to connect and query data in Azure Database for MySQL - Flexible Server
 
-[[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
+[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
 
-This quickstart demonstrates how to connect to an Azure Database for MySQL by using a C# application. It shows how to use SQL statements to query, insert, update, and delete data in the database.
+This quickstart demonstrates how to connect to an Azure Database for MySQL flexible server instance by using a C# application. It shows how to use SQL statements to query, insert, update, and delete data in the database.
 
 ## Prerequisites
 
@@ -24,7 +24,7 @@ For this quickstart you need:
 - An Azure account with an active subscription.
 
     [!INCLUDE [flexible-server-free-trial-note](../includes/flexible-server-free-trial-note.md)]
-- Create an Azure Database for MySQL - Flexible Server using [Azure portal](./quickstart-create-server-portal.md) <br/> or [Azure CLI](./quickstart-create-server-cli.md) if you do not have one.
+- Create an Azure Database for MySQL flexible server instance by using the [Azure portal](./quickstart-create-server-portal.md) <br/> or [Azure CLI](./quickstart-create-server-cli.md) if you do not have one.
 - Based on whether you are using public or private access, complete **ONE** of the actions below to enable connectivity.
 - [Create a database and non-admin user](../single-server/how-to-create-users.md)
 - Install the [.NET SDK for your platform](https://dotnet.microsoft.com/download) (Windows, Ubuntu Linux, or macOS) for your platform.
@@ -44,13 +44,13 @@ dotnet add package MySqlConnector
 
 ## Get connection information
 
-Get the connection information needed to connect to the Azure Database for MySQL. You need the fully qualified server name and login credentials.
+Get the connection information needed to connect to the Azure Database for MySQL flexible server instance. You need the fully qualified server name and login credentials.
 
 1. Log in to the [Azure portal](https://portal.azure.com/).
 2. From the left-hand menu in Azure portal, select **All resources**, and then search for the server you have created (such as **mydemoserver**).
 3. Select the server name.
 4. From the server's **Overview** panel, make a note of the **Server name** and **Server admin login name**. If you forget your password, you can also reset the password from this panel.
- :::image type="content" source="./media/connect-csharp/server-overview-name-login.png" alt-text="Azure Database for MySQL server name":::
+ :::image type="content" source="./media/connect-csharp/server-overview-name-login.png" alt-text="Azure Database for MySQL flexible server instance name":::
 
 ## Step 1: Connect and insert data
 
@@ -312,7 +312,7 @@ az group delete \
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Manage Azure Database for MySQL server using Portal](./how-to-manage-server-portal.md)<br/>
+> [Manage Azure Database for MySQL flexible server using the portal](./how-to-manage-server-portal.md)<br/>
 
 > [!div class="nextstepaction"]
-> [Manage Azure Database for MySQL server using CLI](./how-to-manage-server-cli.md)
+> [Manage Azure Database for MySQL flexible server using Azure CLI](./how-to-manage-server-cli.md)

articles/mysql/flexible-server/connect-java.md

@@ -13,15 +13,15 @@ ms.date: 05/03/2023
 
 # Use Java and JDBC with Azure Database for MySQL - Flexible Server
 
-[[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
+[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
 
-This topic demonstrates creating a sample application that uses Java and [JDBC](https://en.wikipedia.org/wiki/Java_Database_Connectivity) to store and retrieve information in [Azure Database for MySQL - Flexible Server](../index.yml).
+This topic demonstrates creating a sample application that uses Java and [JDBC](https://en.wikipedia.org/wiki/Java_Database_Connectivity) to store and retrieve information in [Azure Database for MySQL flexible server](../index.yml).
 
 JDBC is the standard Java API to connect to traditional relational databases.
 
 In this article, we'll include two authentication methods: Microsoft Entra authentication and MySQL authentication. The **Passwordless** tab shows the Microsoft Entra authentication and the **Password** tab shows the MySQL authentication.
 
-Microsoft Entra authentication is a mechanism for connecting to Azure Database for MySQL using identities defined in Microsoft Entra ID. With Microsoft Entra authentication, you can manage database user identities and other Microsoft services in a central location, which simplifies permission management.
+Microsoft Entra authentication is a mechanism for connecting to Azure Database for MySQL flexible server using identities defined in Microsoft Entra ID. With Microsoft Entra authentication, you can manage database user identities and other Microsoft services in a central location, which simplifies permission management.
 
 MySQL authentication uses accounts stored in MySQL. If you choose to use passwords as credentials for the accounts, these credentials will be stored in the `user` table. Because these passwords are stored in MySQL, you'll need to manage the rotation of the passwords by yourself.
 
@@ -51,7 +51,7 @@ export CURRENT_USER_OBJECTID=$(az ad signed-in-user show --query id -o tsv)
 
 Replace the placeholders with the following values, which are used throughout this article:
 
-- `<YOUR_DATABASE_NAME>`: The name of your MySQL server, which should be unique across Azure.
+- `<YOUR_DATABASE_NAME>`: The name of your Azure Database for MySQL flexible server instance, which should be unique across Azure.
 - `<YOUR_AZURE_REGION>`: The Azure region you'll use. You can use `eastus` by default, but we recommend that you configure a region closer to where you live. You can see the full list of available regions by entering `az account list-locations`.
 - `<YOUR_USER_ASSIGNED_MANAGED_IDENTITY_NAME>`: The name of your user assigned managed identity server, which should be unique across Azure.
 
@@ -69,7 +69,7 @@ export AZ_MYSQL_NON_ADMIN_PASSWORD=<YOUR_MYSQL_NON_ADMIN_PASSWORD>
 
 Replace the placeholders with the following values, which are used throughout this article:
 
-- `<YOUR_DATABASE_NAME>`: The name of your MySQL server, which should be unique across Azure.
+- `<YOUR_DATABASE_NAME>`: The name of your Azure Database for MySQL flexible server instance, which should be unique across Azure.
 - `<YOUR_AZURE_REGION>`: The Azure region you'll use. You can use `eastus` by default, but we recommend that you configure a region closer to where you live. You can see the full list of available regions by entering `az account list-locations`.
 - `<YOUR_MYSQL_ADMIN_PASSWORD>` and `<YOUR_MYSQL_NON_ADMIN_PASSWORD>`: The password of your MySQL database server. That password should have a minimum of eight characters. The characters should be from three of the following categories: English uppercase letters, English lowercase letters, numbers (0-9), and non-alphanumeric characters (!, $, #, %, and so on).
 
@@ -86,12 +86,12 @@ az group create \
 
 ## Create an Azure Database for MySQL instance
 
-### Create a MySQL server and set up admin user
+### Create Azure Database for MySQL flexible server instance and set up an admin user
 
-The first thing you'll create is a managed MySQL server.
+The first thing you create is a managed Azure Database for MySQL flexible server instance.
 
 > [!NOTE]
-> You can read more detailed information about creating MySQL servers in [Create an Azure Database for MySQL server by using the Azure portal](./quickstart-create-server-portal.md).
+> You can read more detailed information about creating MySQL servers in [Create an Azure Database for MySQL flexible server instance by using the Azure portal](./quickstart-create-server-portal.md).
 
 #### [Passwordless connection (Recommended)](#tab/passwordless)
 
@@ -123,7 +123,7 @@ az identity create \
 > [!IMPORTANT]
 > After creating the user-assigned identity, ask your *Global Administrator* or *Privileged Role Administrator* to grant the following permissions for this identity: `User.Read.All`, `GroupMember.Read.All`, and `Application.Read.ALL`. For more information, see the [Permissions](./concepts-azure-ad-authentication.md#permissions) section of [Active Directory authentication](./concepts-azure-ad-authentication.md).
 
-Run the following command to assign the identity to MySQL server for creating Microsoft Entra admin:
+Run the following command to assign the identity to Azure Database for MySQL flexible server for creating Microsoft Entra admin:
 
 ```azurecli-interactive
 az mysql flexible-server identity assign \
@@ -144,9 +144,9 @@ az mysql flexible-server ad-admin create \
 ```
 
 > [!IMPORTANT]
-> When setting the administrator, a new user is added to the Azure Database for MySQL server with full administrator permissions. Only one Microsoft Entra admin can be created per MySQL server and selection of another one will overwrite the existing Microsoft Entra admin configured for the server.
+> When setting the administrator, a new user is added to the Azure Database for MySQL flexible server instance with full administrator permissions. Only one Microsoft Entra admin can be created per Azure Database for MySQL flexible server instance and selection of another one will overwrite the existing Microsoft Entra admin configured for the server.
 
-This command creates a small MySQL server and sets the Active Directory admin to the signed-in user.
+This command creates a small Azure Database for MySQL flexible server instance and sets the Active Directory admin to the signed-in user.
 
 #### [Password](#tab/password)
 
@@ -161,21 +161,21 @@ az mysql flexible-server create \
     --output tsv
 ```
 
-This command creates a small MySQL server.
+This command creates a small Azure Database for MySQL flexible server instance.
 
 ---
 
-The MySQL server that you created has an empty database called `flexibleserverdb`.
+The Azure Database for MySQL flexible server instance that you created has an empty database called `flexibleserverdb`.
 
 [Having any issues? Let us know.](https://github.com/MicrosoftDocs/azure-docs/issues)
 
-### Configure a firewall rule for your MySQL server
+### Configure a firewall rule for your Azure Database for MySQL flexible server instance
 
-Azure Database for MySQL instances are secured by default. They have a firewall that doesn't allow any incoming connection.
+Azure Database for MySQL flexible server instances are secured by default. They have a firewall that doesn't allow any incoming connection.
 
 You can skip this step if you're using Bash because the `flexible-server create` command already detected your local IP address and set it on MySQL server.
 
-If you're connecting to your MySQL server from Windows Subsystem for Linux (WSL) on a Windows computer, you'll need to add the WSL host ID to your firewall. Obtain the IP address of your host machine by running the following command in WSL:
+If you're connecting to your Azure Database for MySQL flexible server instance from Windows Subsystem for Linux (WSL) on a Windows computer, you'll need to add the WSL host ID to your firewall. Obtain the IP address of your host machine by running the following command in WSL:
 
 ```bash
 sudo cat /etc/resolv.conf
@@ -464,7 +464,7 @@ public class DemoApplication {
 
 [Having any issues? Let us know.](https://github.com/MicrosoftDocs/azure-docs/issues)
 
-This Java code will use the *database.properties* and the *schema.sql* files that you created earlier, in order to connect to the MySQL server and create a schema that will store your data.
+This Java code will use the *database.properties* and the *schema.sql* files that you created earlier, in order to connect to the Azure Database for MySQL flexible server instance and create a schema that will store your data.
 
 In this file, you can see that we commented methods to insert, read, update and delete data: you'll code those methods in the rest of this article, and you'll be able to uncomment them one after each other.
 
@@ -480,7 +480,7 @@ You can now execute this main class with your favorite tool:
 - Using your IDE, you should be able to right-click on the *DemoApplication* class and execute it.
 - Using Maven, you can run the application by executing: `mvn exec:java -Dexec.mainClass="com.example.demo.DemoApplication"`.
 
-The application should connect to the Azure Database for MySQL, create a database schema, and then close the connection, as you should see in the console logs:
+The application should connect to the Azure Database for MySQL flexible server instance, create a database schema, and then close the connection, as you should see in the console logs:
 
 ```output
 [INFO   ] Loading application properties
@@ -642,7 +642,7 @@ Executing the main class should now produce the following output:
 
 [Having any issues? Let us know.](https://github.com/MicrosoftDocs/azure-docs/issues)
 
-### Updating data in Azure Database for MySQL
+### Updating data in Azure Database for MySQL flexible server
 
 Next, update the data you previously inserted.
 
@@ -686,7 +686,7 @@ Executing the main class should now produce the following output:
 [INFO   ] Closing database connection
 ```
 
-### Deleting data in Azure Database for MySQL
+### Deleting data in Azure Database for MySQL flexible server
 
 Finally, delete the data you previously inserted.
 
@@ -729,7 +729,7 @@ Executing the main class should now produce the following output:
 
 ## Clean up resources
 
-Congratulations! You've created a Java application that uses JDBC to store and retrieve data from Azure Database for MySQL.
+Congratulations! You've created a Java application that uses JDBC to store and retrieve data from Azure Database for MySQL flexible server.
 
 To clean up all resources used during this quickstart, delete the resource group using the following command: