Skip to content

Commit 90b3d2c

Browse files
author
msebolt
committed
further changes per @kraigb 
1 parent 6b01509 commit 90b3d2c

File tree

4 files changed

+48
-41
lines changed

4 files changed

+48
-41
lines changed

‎articles/sql-database/sql-database-connect-query-java.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,9 @@ In this quickstart, you use Java to connect to an Azure SQL database and use T-S
1818

1919
## Prerequisites
2020

21-
- an Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
21+
- An Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
2222

23-
- an [Azure SQL database](sql-database-single-database-get-started.md)
24-
25-
> [!IMPORTANT]
26-
> The scripts in this article are written to use the **Adventure Works** database.
27-
28-
> [!NOTE]
29-
> You can optionally choose to use an Azure SQL managed instance.
30-
>
31-
> To create and configure, use the [Azure Portal](sql-database-managed-instance-get-started.md), [PowerShell](scripts/sql-database-create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](sql-database-managed-instance-configure-p2s.md) or [VM](sql-database-managed-instance-configure-vm.md) connectivity.
32-
>
33-
> To load data, see [restore with BACPAC](sql-database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](sql-database-managed-instance-get-started-restore.md).
23+
- An [Azure SQL database](sql-database-single-database-get-started.md)
3424

3525
- [Java](/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server)-related software
3626

@@ -48,6 +38,16 @@ In this quickstart, you use Java to connect to an Azure SQL database and use T-S
4838

4939
---
5040

41+
> [!IMPORTANT]
42+
> The scripts in this article are written to use the **Adventure Works** database.
43+
44+
> [!NOTE]
45+
> You can optionally choose to use an Azure SQL managed instance.
46+
>
47+
> To create and configure, use the [Azure Portal](sql-database-managed-instance-get-started.md), [PowerShell](scripts/sql-database-create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](sql-database-managed-instance-configure-p2s.md) or [VM](sql-database-managed-instance-configure-vm.md) connectivity.
48+
>
49+
> To load data, see [restore with BACPAC](sql-database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](sql-database-managed-instance-get-started-restore.md).
50+
5151
## Get SQL server connection information
5252

5353
Get the connection information you need to connect to the Azure SQL database. You'll need the fully qualified server name or host name, database name, and login information for the upcoming procedures.

‎articles/sql-database/sql-database-connect-query-nodejs.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,9 @@ In this quickstart, you use Node.js to connect to an Azure SQL database and use
1818

1919
## Prerequisites
2020

21-
- an Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
21+
- An Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
2222

23-
- an [Azure SQL database](sql-database-single-database-get-started.md)
24-
25-
> [!IMPORTANT]
26-
> The scripts in this article are written to use the **Adventure Works** database.
27-
28-
> [!NOTE]
29-
> You can optionally choose to use an Azure SQL managed instance.
30-
>
31-
> To create and configure, use the [Azure Portal](sql-database-managed-instance-get-started.md), [PowerShell](scripts/sql-database-create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](sql-database-managed-instance-configure-p2s.md) or [VM](sql-database-managed-instance-configure-vm.md) connectivity.
32-
>
33-
> To load data, see [restore with BACPAC](sql-database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](sql-database-managed-instance-get-started-restore.md).
23+
- An [Azure SQL database](sql-database-single-database-get-started.md)
3424

3525
- [Node.js](https://nodejs.org)-related software
3626

@@ -48,6 +38,16 @@ In this quickstart, you use Node.js to connect to an Azure SQL database and use
4838

4939
---
5040

41+
> [!IMPORTANT]
42+
> The scripts in this article are written to use the **Adventure Works** database.
43+
44+
> [!NOTE]
45+
> You can optionally choose to use an Azure SQL managed instance.
46+
>
47+
> To create and configure, use the [Azure Portal](sql-database-managed-instance-get-started.md), [PowerShell](scripts/sql-database-create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](sql-database-managed-instance-configure-p2s.md) or [VM](sql-database-managed-instance-configure-vm.md) connectivity.
48+
>
49+
> To load data, see [restore with BACPAC](sql-database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](sql-database-managed-instance-get-started-restore.md).
50+
5151
## Get SQL server connection information
5252

5353
Get the connection information you need to connect to the Azure SQL database. You'll need the fully qualified server name or host name, database name, and login information for the upcoming procedures.

‎articles/sql-database/sql-database-connect-query-python.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ In this quickstart, you use Python to connect to an Azure SQL database and use T
1818

1919
## Prerequisites
2020

21-
- an Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
21+
- An Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
2222

23-
- an [Azure SQL database](sql-database-single-database-get-started.md)
23+
- An [Azure SQL database](sql-database-single-database-get-started.md)
2424

2525
> [!IMPORTANT]
2626
> The scripts in this article are written to use the **Adventure Works** database.
@@ -55,7 +55,17 @@ In this quickstart, you use Python to connect to an Azure SQL database and use T
5555
For further information, see [Microsoft ODBC Driver](/sql/connect/odbc/microsoft-odbc-driver-for-sql-server).
5656

5757
---
58-
58+
59+
> [!IMPORTANT]
60+
> The scripts in this article are written to use the **Adventure Works** database.
61+
62+
> [!NOTE]
63+
> You can optionally choose to use an Azure SQL managed instance.
64+
>
65+
> To create and configure, use the [Azure Portal](sql-database-managed-instance-get-started.md), [PowerShell](scripts/sql-database-create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](sql-database-managed-instance-configure-p2s.md) or [VM](sql-database-managed-instance-configure-vm.md) connectivity.
66+
>
67+
> To load data, see [restore with BACPAC](sql-database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](sql-database-managed-instance-get-started-restore.md).
68+
5969
To further explore Python and the Azure SQL database, see [Azure SQL database libraries for Python](/python/api/overview/azure/sql), the [pyodbc repository](https://github.com/mkleehammer/pyodbc/wiki/), and a [pyodbc sample](https://github.com/mkleehammer/pyodbc/wiki/Getting-started).
6070

6171
## Get SQL server connection information

‎articles/sql-database/sql-database-connect-query-r.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,23 @@ In this quickstart, you use R with Machine Learning Services to connect to an Az
2222

2323
## Prerequisites
2424

25-
- an Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
25+
- An Azure account with an active subscription - [create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
2626

27-
- an [Azure SQL database](sql-database-single-database-get-started.md)
28-
29-
> [!IMPORTANT]
30-
> The scripts in this article are written to use the **Adventure Works** database.
31-
32-
> [!NOTE]
33-
> During the preview of Azure SQL Database Machine Learning Services with R, the managed instance deployment option is not supported.
27+
- An [Azure SQL database](sql-database-single-database-get-started.md)
3428

3529
- [Machine Learning Services](sql-database-machine-learning-services-overview.md) with R enabled - [sign up for the preview](sql-database-machine-learning-services-overview.md#signup)
3630

37-
> [!NOTE]
38-
> During the public preview, Microsoft will onboard you and enable machine learning for your existing or new database.
31+
- [SQL Server Management Studio](/sql/ssms/sql-server-management-studio-ssms) (SSMS)
3932

40-
Machine Learning Services with R is a feature of Azure SQL database used for executing in-database R scripts.
41-
42-
For more information, see the [R Project](https://www.r-project.org/).
33+
> [!IMPORTANT]
34+
> The scripts in this article are written to use the **Adventure Works** database.
4335
44-
- [SQL Server Management Studio](/sql/ssms/sql-server-management-studio-ssms) (SSMS)
36+
> [!NOTE]
37+
> During the public preview, Microsoft will onboard you and enable machine learning for your existing or new database, however the managed instance deployment option is currently not supported.
38+
39+
Machine Learning Services with R is a feature of Azure SQL database used for executing in-database R scripts.
40+
41+
For more information, see the [R Project](https://www.r-project.org/).
4542

4643
## Get SQL server connection information
4744

0 commit comments

Comments
 (0)