Skip to content

Commit 0b1c432

Browse files
committed
set 3
1 parent 0c8573f commit 0b1c432

27 files changed

+76
-91
lines changed

articles/sql-database/sql-database-quickstart-r-create-script.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ In this quickstart, you create and run a set of R scripts using Machine Learning
2525
## Prerequisites
2626

2727
- 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).
28-
- An [Azure SQL database](sql-database-single-database-get-started.md) with a [server-level firewall rule](sql-database-server-level-firewall-rule.md)
28+
- A [database in Azure SQL Database](sql-database-single-database-get-started.md) with a [server-level firewall rule](sql-database-server-level-firewall-rule.md)
2929
- [Machine Learning Services](sql-database-machine-learning-services-overview.md) with R enabled.
3030
- [SQL Server Management Studio](/sql/ssms/sql-server-management-studio-ssms) (SSMS)
3131

articles/sql-database/sql-database-quickstart-r-train-score-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ In this quickstart, you create and train a predictive model using R, save the mo
2525
## Prerequisites
2626

2727
- 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).
28-
- An [Azure SQL database](sql-database-single-database-get-started.md) with a [server-level firewall rule](sql-database-server-level-firewall-rule.md)
28+
- A [databae in Azure SQL Database](sql-database-single-database-get-started.md) with a [server-level firewall rule](sql-database-server-level-firewall-rule.md)
2929
- [Machine Learning Services](sql-database-machine-learning-services-overview.md) with R enabled.
3030
- [SQL Server Management Studio](/sql/ssms/sql-server-management-studio-ssms) (SSMS)
3131

articles/sql-database/sql-database-recovery-using-backups.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ You can restore a deleted database to the deletion time, or an earlier point in
9797
9898
### Deleted database restore by using the Azure portal
9999

100-
You restore deleted databases from the Azure portal from the server and instance resource.
100+
You restore deleted databases from the Azure portal from the server or managed instance resource.
101101

102102
#### SQL Database
103103

104104
To recover a single or pooled deleted database to the deletion time by using the Azure portal, open the server overview page, and select **Deleted databases**. Select a deleted database that you want to restore, and type the name for the new database that will be created with data restored from the backup.
105105

106-
![Screenshot of restore deleted Azure SQL database](./media/sql-database-recovery-using-backups/restore-deleted-sql-database-annotated.png)
106+
![Screenshot of restore deleted database](./media/sql-database-recovery-using-backups/restore-deleted-sql-database-annotated.png)
107107

108108
#### SQL Managed Instance
109109

@@ -117,7 +117,7 @@ Use the following sample scripts to restore a deleted database for either SQL Da
117117

118118
#### SQL Database
119119

120-
For a sample PowerShell script showing how to restore a deleted Azure SQL database, see [Restore a SQL database using PowerShell](scripts/sql-database-restore-database-powershell.md).
120+
For a sample PowerShell script showing how to restore a deleted database in Azure SQL Database, see [Restore a SQL database using PowerShell](scripts/sql-database-restore-database-powershell.md).
121121

122122
#### SQL Managed Instance
123123

@@ -128,7 +128,7 @@ For a sample PowerShell script showing how to restore a deleted instance databas
128128
129129
## Geo-restore
130130

131-
You can restore a database (single, pooled, or managed instance) on any server in any Azure region from the most recent geo-replicated backups. Geo-restore uses a geo-replicated backup as its source. You can request geo-restore even if the database or datacenter is inaccessible due to an outage.
131+
You can restore a database on any SQL Database server or an instance database on any Managed Instance in any Azure region from the most recent geo-replicated backups. Geo-restore uses a geo-replicated backup as its source. You can request geo-restore even if the database or datacenter is inaccessible due to an outage.
132132

133133
Geo-restore is the default recovery option when your database is unavailable because of an incident in the hosting region. You can restore the database to a server in any other region. There is a delay between when a backup is taken and when it is geo-replicated to an Azure blob in a different region. As a result, the restored database can be up to one hour behind the original database. The following illustration shows a database restore from the last available backup in another region.
134134

@@ -149,7 +149,7 @@ To geo-restore a single SQL database from the Azure portal in the region and ser
149149

150150
![Screenshot of Create SQL Database options](./media/sql-database-recovery-using-backups/geo-restore-azure-sql-database-list-annotated.png)
151151

152-
Complete the process of creating a new database from the backup. When you create the single Azure SQL database, it contains the restored geo-restore backup.
152+
Complete the process of creating a new database from the backup. When you create a database in Azure SQL Database, it contains the restored geo-restore backup.
153153

154154
#### SQL Managed Instance
155155

articles/sql-database/sql-database-release-notes.md

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,20 @@
11
---
2-
title: What's new with Azure SQL Database & Azure SQL Managed Instance?
3-
titleSuffix:
4-
description: Learn about new features and improvements for Azure SQL Database & Azure SQL Managed Instance
2+
title: What's new?
3+
titleSuffix: Azure SQL Database & SQL Managed Instance
4+
description: Learn about the new features and improvements for the Azure SQL Database & SQL Managed Instance service and documentation
55
services: sql-database
66
author: stevestein
77
ms.service: sql-database
88
ms.subservice: service
99
ms.custom: sqldbrb=2
1010
ms.devlang:
1111
ms.topic: conceptual
12-
ms.date: 05/20/2020
12+
ms.date: 05/04/2020
1313
ms.author: sstein
1414
---
15-
# What's new in Azure SQL Database & Azure SQL Managed Instance?
16-
17-
This article lists features in public preview and current known issues with Azure SQL Database and Azure SQL Managed Instance.
18-
19-
For SQL Database and SQL Managed Instance updates and improvements, see [SQL Database & SQL Managed Instance service updates](https://azure.microsoft.com/updates/?product=sql-database).
20-
21-
## What's new?
22-
23-
Documentation for Azure SQL Database and Azure SQL Managed Instance has been split into separate sections. We've also updated how we refer to a managed instance from *Azure SQL Database managed instance* to *Azure SQL Managed Instance*.
24-
25-
We've done this because some features and functionality vary greatly between a single database and managed instance, and it's become increasingly more of a challenge to explain complex nuances between Azure SQL Database and Azure SQL Database Managed Instance in individual 'shared' articles.
26-
27-
This clarification between the different Azure SQL options should simplify and streamline the process of working with SQL in Azure, whether that be a single managed database in Azure SQL Database, a fully-fledged managed instance hosting multiple databases in Azure SQL Managed Instance, or the familiar on-premises SQL Server product but hosted on a virtual machine in Azure.
28-
29-
Consider that this is a work in progress and not every document has been updated yet. For example, Transact-SQL (T-SQL) statements, stored procedures, and many features shared between Azure SQL Database and Azure SQL Managed Instance are not yet complete, so please bear with us!
30-
31-
> [!NOTE]
32-
> The features, functionalities, and capabilities of the product are entirely unchanged. You are still able to deploy the same SQL Managed Instance from the same [Azure portal](https://portal.azure.com), and you can still leverage all of the features and functionalities that were previously available prior to the name change.
15+
# What's new in Azure SQL Database & SQL Managed Instance?
3316

17+
This article lists Azure SQL Database and Azure SQL Managed Instance features that are currently in public preview. For SQL Database and SQL Managed Instance updates and improvements, see [SQL Database & SQL Managed Instance service updates](https://azure.microsoft.com/updates/?product=sql-database). For updates and improvements to other Azure services, see [Service updates](https://azure.microsoft.com/updates).
3418

3519
## Features in public preview
3620

articles/sql-database/sql-database-reserved-capacity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.date: 08/29/2019
1717

1818
Save money with Azure SQL Database and SQL Managed Instance by committing to a reservation for compute resources compared to pay-as-you-go prices. With reserved capacity, you make a commitment for SQL Database and/or SQL Managed Instance use for a period of one or three years to get a significant discount on the compute costs. To purchase reserved capacity, you need to specify the Azure region, deployment type, performance tier, and term.
1919

20-
You do not need to assign the reservation to specific SQL Database, or SQL Managed Instance. Matching existing deployments that are already running or ones that are newly deployed, will automatically get the benefit. By purchasing a reservation, you commit to usage for the compute costs for a period of one or three years. As soon as you buy a reservation, the compute charges that match the reservation attributes are no longer charged at the pay-as-you go rates. A reservation does not cover software, networking, or storage charges associated with the service. At the end of the reservation term, the billing benefit expires and the SQL Database or SQL Managed Instance are billed at the pay-as-you go price. Reservations do not auto-renew. For pricing information, see the [reserved capacity offering](https://azure.microsoft.com/pricing/details/sql-database/managed/).
20+
You do not need to assign the reservation to specific SQL Database, or SQL Managed Instance. Matching existing deployments that are already running or ones that are newly deployed automatically get the benefit. By purchasing a reservation, you commit to usage for the compute costs for a period of one or three years. As soon as you buy a reservation, the compute charges that match the reservation attributes are no longer charged at the pay-as-you go rates. A reservation does not cover software, networking, or storage charges associated with the service. At the end of the reservation term, the billing benefit expires and the SQL Database or SQL Managed Instance are billed at the pay-as-you go price. Reservations do not auto-renew. For pricing information, see the [reserved capacity offering](https://azure.microsoft.com/pricing/details/sql-database/managed/).
2121

2222
You can buy reserved capacity in the [Azure portal](https://portal.azure.com). Pay for the reservation [up front or with monthly payments](../cost-management-billing/reservations/monthly-payments-reservations.md). To buy reserved capacity:
2323

@@ -66,7 +66,7 @@ vCore size flexibility helps you scale up or down within a performance tier and
6666

6767
## Limitation
6868

69-
You cannot reserve DTU-based (basic, standard, or premium) SQL databases.
69+
You cannot reserve DTU-based (basic, standard, or premium) databases in SQL Database.
7070

7171
## Need help? Contact us
7272

articles/sql-database/sql-database-security-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ For all steps in the tutorial, sign in to [Azure portal](https://portal.azure.co
5353

5454
## Create firewall rules
5555

56-
SQL databases are protected by firewalls in Azure. By default, all connections to the server and database are rejected. To learn more, see [server-level and database-level firewall rules](sql-database-firewall-configure.md).
56+
Databases in SQL Database are protected by firewalls in Azure. By default, all connections to the server and database are rejected. To learn more, see [server-level and database-level firewall rules](sql-database-firewall-configure.md).
5757

5858
Set **Allow access to Azure services** to **OFF** for the most secure configuration. Then, create a [reserved IP (classic deployment)](../virtual-network/virtual-networks-reserved-public-ip.md) for the resource that needs to connect, such as an Azure VM or cloud service, and only allow that IP address access through the firewall. If you're using the [resource manager](/azure/virtual-network/virtual-network-ip-addresses-overview-arm) deployment model, a dedicated public IP address is required for each resource.
5959

@@ -106,7 +106,7 @@ To setup a database-level firewall rule:
106106

107107
## Create an Azure AD admin
108108

109-
Make sure you're using the appropriate Azure Active Directory (AD) managed domain. To select the AD domain, use the upper-right corner of the Azure portal. This process confirms the same subscription is used for both Azure AD and the logical SQL server hosting your Azure SQL database or data warehouse.
109+
Make sure you're using the appropriate Azure Active Directory (AD) managed domain. To select the AD domain, use the upper-right corner of the Azure portal. This process confirms the same subscription is used for both Azure AD and the logical SQL server hosting your database or data warehouse.
110110
111111
![choose-ad](./media/sql-database-security-tutorial/8choose-ad.png)
112112

articles/sql-database/sql-database-server-level-firewall-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Sign in to the [Azure portal](https://portal.azure.com/).
3535
3636
Follow these steps to create a server-level IP firewall rule for your client's IP address and enable external connectivity through the Azure SQL Database firewall for your IP address only.
3737

38-
1. After the [prerequisite Azure SQL database](#prerequisites) deployment completes, select **SQL databases** from the left-hand menu and then choose **mySampleDatabase** on the **SQL databases** page. The overview page for your database opens, showing you the fully qualified server name (such as **mynewserver-20170824.database.windows.net**) and provides options for further configuration.
38+
1. After the [database](#prerequisites) deployment completes, select **SQL databases** from the left-hand menu and then choose **mySampleDatabase** on the **SQL databases** page. The overview page for your database opens, showing you the fully qualified server name (such as **mynewserver-20170824.database.windows.net**) and provides options for further configuration.
3939

4040
2. Copy this fully qualified server name to use when connecting to your server and its databases in other quickstarts.
4141

articles/sql-database/sql-database-servers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To create a server (without a database, elastic pool, or data warehouse database
5050

5151
### Create a blank or sample SQL database in Azure SQL Database
5252

53-
To create an Azure SQL database using the [Azure portal](https://portal.azure.com), navigate to a blank SQL Database form and provide the requested information. You can create the resource group and server ahead of time or while creating the database itself. You can create a blank database or create a sample database based on Adventure Works LT.
53+
To create a database in SQL Database using the [Azure portal](https://portal.azure.com), navigate to a blank SQL Database form and provide the requested information. You can create the resource group and server ahead of time or while creating the database itself. You can create a blank database or create a sample database based on Adventure Works LT.
5454

5555
![create database-1](./media/sql-database-get-started-portal/create-database-1.png)
5656

@@ -70,7 +70,7 @@ To manage an existing database, navigate to the **SQL databases** page and click
7070
> [!IMPORTANT]
7171
> To configure performance properties for a database, see [DTU-based purchasing model](sql-database-service-tiers-dtu.md) and [vCore-based purchasing model](sql-database-service-tiers-vcore.md).
7272
> [!TIP]
73-
> For an Azure portal quickstart, see [Create an Azure SQL database in the Azure portal](sql-database-single-database-get-started.md).
73+
> For an Azure portal quickstart, see [Create a database in SQL Database in the Azure portal](sql-database-single-database-get-started.md).
7474
7575
## Manage servers, databases, and firewalls using PowerShell
7676

@@ -142,7 +142,7 @@ To create and manage servers, databases, and firewalls with Transact-SQL, use th
142142
| --- | --- |
143143
|[CREATE DATABASE (Azure SQL Database)](/sql/t-sql/statements/create-database-transact-sql?view=azuresqldb-current) | Creates a new database in Azure SQL Database. You must be connected to the master database to create a new database.|
144144
|[CREATE DATABASE (Azure Synapse)](/sql/t-sql/statements/create-database-transact-sql?view=azure-sqldw-latest) | Creates a new data warehouse database in Azure Synapse. You must be connected to the master database to create a new database.|
145-
| [ALTER DATABASE (Azure SQL Database)](/sql/t-sql/statements/alter-database-transact-sql?view=azuresqldb-current) |Modifies an Azure SQL database or elastic pool. |
145+
| [ALTER DATABASE (Azure SQL Database)](/sql/t-sql/statements/alter-database-transact-sql?view=azuresqldb-current) |Modifies database or elastic pool. |
146146
|[ALTER DATABASE (Azure SQL Data Warehouse)](/t-sql/statements/alter-database-transact-sql?view=azure-sqldw-latest)|Modifies a data warehouse database in Azure Synapse.|
147147
|[DROP DATABASE (Transact-SQL)](/sql/t-sql/statements/drop-database-transact-sql)|Deletes a database.|
148148
|[sys.database_service_objectives (Azure SQL Database)](/sql/relational-databases/system-catalog-views/sys-database-service-objectives-azure-sql-database)|Returns the edition (service tier), service objective (pricing tier), and elastic pool name, if any, for a database. If logged on to the master database for a server, returns information on all databases. For Azure Synapse, you must be connected to the master database.|

0 commit comments

Comments
 (0)