fixing more things

MashaMSFT · MashaMSFT · commit 77418e5bc83d · 2020-05-13T21:47:24.000-07:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -52629,7 +52629,7 @@
         },
         {
             "source_path": "articles/sql-database/sql-database-single-databases-manage.md",
-            "redirect_url": "/azure/azure-sql/database/single-databases-manage",
+            "redirect_url": "/azure/azure-sql/database/single-database-manage",
             "redirect_document_id": true
         },
         {
diff --git a/articles/azure-sql/database/logical-servers.md b/articles/azure-sql/database/logical-servers.md
@@ -65,7 +65,7 @@ To manage an existing server, navigate to the server using a number of methods -
 
 To manage an existing database, navigate to the **SQL databases** page and click the database you wish to manage. The following screenshot shows how to begin setting a server-level firewall for a database from the **Overview** page for a database.
 
-   ![server firewall rule](./media/sql-database-get-started-portal/server-firewall-rule.png)
+   ![server firewall rule](./media/quickstart-create-single-database/server-firewall-rule.png)
 
 > [!IMPORTANT]
 > To configure performance properties for a database, see [DTU-based purchasing model](dtu-service-tiers.md) and [vCore-based purchasing model](../../sql-database/sql-database-service-tiers-vcore.md).
diff --git a/articles/azure-sql/database/media/single-database-manage/create-database-1.png b/articles/azure-sql/database/media/single-database-manage/create-database-1.png
diff --git a/articles/azure-sql/database/media/single-database-manage/create-logical-sql-server.png b/articles/azure-sql/database/media/single-database-manage/create-logical-sql-server.png
diff --git a/articles/azure-sql/database/media/single-database-manage/server-firewall-rule.png b/articles/azure-sql/database/media/single-database-manage/server-firewall-rule.png
diff --git a/articles/azure-sql/database/media/single-database-scale/cancel-ongoing-operation.png b/articles/azure-sql/database/media/single-database-scale/cancel-ongoing-operation.png
diff --git a/articles/azure-sql/database/media/single-database-scale/ongoing-operations.png b/articles/azure-sql/database/media/single-database-scale/ongoing-operations.png
diff --git a/articles/azure-sql/database/network-access-controls-overview.md b/articles/azure-sql/database/network-access-controls-overview.md
@@ -152,5 +152,5 @@ Private Link allows you to connect to a server via a **private endpoint**. A pri
 - For an overview of Azure SQL Database security, see [Securing your database](../../sql-database/sql-database-security-overview.md)
 
 <!--Image references-->
-[1]: ../../sql-database/media/sql-database-get-started-portal/new-server2.png
-[2]: ../../sql-database/media/sql-database-get-started-portal/manage-server-firewall.png
+[1]: ../../sql-database/media/quickstart-create-single-database/new-server2.png
+[2]: ../../sql-database/media/quickstart-create-single-database/manage-server-firewall.png
diff --git a/articles/azure-sql/database/private-endpoint-overview.md b/articles/azure-sql/database/private-endpoint-overview.md
@@ -180,9 +180,9 @@ PolyBase is commonly used to load data into Azure Synapse Analytics from Azure S
 - For an overview of Azure SQL Database connectivity, see [Azure SQL Connectivity Architecture](connectivity-architecture.md)
 
 <!--Image references-->
-[1]: ../../sql-database/media/sql-database-get-started-portal/pe-connect-overview.png
-[2]: ../../sql-database/media/sql-database-get-started-portal/telnet-result.png
-[3]: ../../sql-database/media/sql-database-get-started-portal/pec-list-before.png
-[4]: ../../sql-database/media/sql-database-get-started-portal/pec-approve.png
-[5]: ../../sql-database/media/sql-database-get-started-portal/pec-list-after.png
-[6]: ../../sql-database/media/sql-database-get-started-portal/pec-select.png
+[1]: ../../sql-database/media/quickstart-create-single-database/pe-connect-overview.png
+[2]: ../../sql-database/media/quickstart-create-single-database/telnet-result.png
+[3]: ../../sql-database/media/quickstart-create-single-database/pec-list-before.png
+[4]: ../../sql-database/media/quickstart-create-single-database/pec-approve.png
+[5]: ../../sql-database/media/quickstart-create-single-database/pec-list-after.png
+[6]: ../../sql-database/media/quickstart-create-single-database/pec-select.png
diff --git a/articles/azure-sql/database/scale-single-database.md b/articles/azure-sql/database/scale-single-database.md
diff --git a/articles/azure-sql/database/single-database-scale.md b/articles/azure-sql/database/single-database-scale.md
@@ -101,8 +101,8 @@ else {
 - If you are upgrading to a higher service tier or compute size, the database max size does not increase unless you explicitly specify a larger size (maxsize).
 - To downgrade a database, the database used space must be smaller than the maximum allowed size of the target service tier and compute size.
 - When downgrading from **Premium** to the **Standard** tier, an extra storage cost applies if both (1) the max size of the database is supported in the target compute size, and (2) the max size exceeds the included storage amount of the target compute size. For example, if a P1 database with a max size of 500 GB is downsized to S3, then an extra storage cost applies since S3 supports a max size of 1 TB and its included storage amount is only 250 GB. So, the extra storage amount is 500 GB – 250 GB = 250 GB. For pricing of extra storage, see [Azure SQL Database pricing](https://azure.microsoft.com/pricing/details/sql-database/). If the actual amount of space used is less than the included storage amount, then this extra cost can be avoided by reducing the database max size to the included amount.
-- When upgrading a database with [geo-replication](sql-database-geo-replication-portal.md) enabled, upgrade its secondary databases to the desired service tier and compute size before upgrading the primary database (general guidance for best performance). When upgrading to a different edition, it is a requirement that the secondary database is upgraded first.
-- When downgrading a database with [geo-replication](sql-database-geo-replication-portal.md) enabled, downgrade its primary databases to the desired service tier and compute size before downgrading the secondary database (general guidance for best performance). When downgrading to a different edition, it is a requirement that the primary database is downgraded first.
+- When upgrading a database with [geo-replication](active-geo-replication-configure-portal.md) enabled, upgrade its secondary databases to the desired service tier and compute size before upgrading the primary database (general guidance for best performance). When upgrading to a different edition, it is a requirement that the secondary database is upgraded first.
+- When downgrading a database with [geo-replication](active-geo-replication-configure-portal.md) enabled, downgrade its primary databases to the desired service tier and compute size before downgrading the secondary database (general guidance for best performance). When downgrading to a different edition, it is a requirement that the primary database is downgraded first.
 - The restore service offerings are different for the various service tiers. If you are downgrading to the **Basic** tier, there is a lower backup retention period. See [Azure SQL Database Backups](../../sql-database/sql-database-automated-backups.md).
 - The new properties for the database are not applied until the changes are complete.
 
diff --git a/articles/azure-sql/database/sql-data-sync-data-sql-server-sql-database.md b/articles/azure-sql/database/sql-data-sync-data-sql-server-sql-database.md
diff --git a/articles/azure-sql/database/sql-data-sync-update-sync-schema.md b/articles/azure-sql/database/sql-data-sync-update-sync-schema.md
@@ -25,7 +25,7 @@ This article introduces a solution to automatically replicate schema changes to
 This article uses ALTER TABLE as an example of a schema change, but this solution also works for other types of schema changes.
 
 > [!IMPORTANT]
-> We recommend that you read this article carefully, especially the sections about [Troubleshooting](#troubleshoot) and [Other considerations](#other), before you start to implement automated schema change replication in your sync environment. We also recommend that you read [Sync data across multiple cloud and on-premises databases with SQL Data Sync](../azure-sql/database/sql-data-sync-data-sql-server-sql-database). Some database operations may break the solution described in this article. Additional domain knowledge of SQL Server and Transact-SQL may be required to troubleshoot those issues.
+> We recommend that you read this article carefully, especially the sections about [Troubleshooting](#troubleshoot) and [Other considerations](#other), before you start to implement automated schema change replication in your sync environment. We also recommend that you read [Sync data across multiple cloud and on-premises databases with SQL Data Sync](sql-data-sync-data-sql-server-sql-database.md). Some database operations may break the solution described in this article. Additional domain knowledge of SQL Server and Transact-SQL may be required to troubleshoot those issues.
 
 ![Automating the replication of schema changes](./media/sql-data-sync-update-sync-schema/automate-schema-changes.png)
 
@@ -215,15 +215,15 @@ If you want to clean up the records in the schema change tracking table, use DEL
 
 For more info about SQL Data Sync, see:
 
--   Overview - [Sync data across multiple cloud and on-premises databases with Azure SQL Data Sync](../azure-sql/database/sql-data-sync-data-sql-server-sql-database)
+-   Overview - [Sync data across multiple cloud and on-premises databases with Azure SQL Data Sync](sql-data-sync-data-sql-server-sql-database.md)
 -   Set up Data Sync
     - In the portal - [Tutorial: Set up SQL Data Sync to sync data between Azure SQL Database and SQL Server on-premises](data-sync-sql-server-configure.md)
     - With PowerShell
         -  [Use PowerShell to sync between multiple Azure SQL databases](scripts/sql-data-sync-sync-data-between-sql-databases.md)
         -  [Use PowerShell to sync between an Azure SQL Database and a SQL Server on-premises database](scripts/sql-data-sync-sync-data-between-azure-onprem.md)
 -   Data Sync Agent - [Data Sync Agent for Azure SQL Data Sync](data-sync-agent.md)
 -   Best practices - [Best practices for Azure SQL Data Sync](sql-data-sync-best-practices.md)
--   Monitor - [Monitor SQL Data Sync with Azure Monitor logs](../azure-sql/database/sql-data-sync-monitor-sync)
+-   Monitor - [Monitor SQL Data Sync with Azure Monitor logs](sql-data-sync-monitor-sync)
 -   Troubleshoot - [Troubleshoot issues with Azure SQL Data Sync](sql-data-sync-troubleshoot.md)
 -   Update the sync schema
     -   With PowerShell - [Use PowerShell to update the sync schema in an existing sync group](scripts/update-sync-schema-in-sync-group.md)
diff --git a/articles/azure-sql/database/tutorial-add-single-database-failover-group.md b/articles/azure-sql/database/tutorial-add-single-database-failover-group.md
@@ -377,7 +377,7 @@ This portion of the tutorial uses the following Az CLI cmdlets:
 
 # [PowerShell](#tab/azure-powershell)
 
-[!code-powershell-interactive[main](../../../../powershell_scripts/sql-database/failover-groups/add-single-db-to-failover-group-az-ps.ps1 "Add database to a failover group")]
+[!code-powershell-interactive[main](../../../powershell_scripts/sql-database/failover-groups/add-single-db-to-failover-group-az-ps.ps1 "Add database to a failover group")]
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
@@ -396,7 +396,7 @@ This script uses the following commands. Each command in the table links to comm
 
 # [Azure CLI](#tab/azure-cli)
 
-[!code-azurecli-interactive[main](../../../../cli_scripts/sql-database/failover-groups/add-single-db-to-failover-group-az-cli.sh "Add database to a failover group")]
+[!code-azurecli-interactive[main](../../../cli_scripts/sql-database/failover-groups/add-single-db-to-failover-group-az-cli.sh "Add database to a failover group")]
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
diff --git a/articles/azure-sql/database/vnet-service-endpoint-rule-overview.md b/articles/azure-sql/database/vnet-service-endpoint-rule-overview.md
@@ -88,7 +88,7 @@ When using service endpoints for Azure SQL Database, review the following consid
 
 ### ExpressRoute
 
-If you are using [ExpressRoute](../../expressroute/expressroute-introduction.md?toc=%2fazure%2fvirtual-network%2ftoc.json) from your premises, for public peering or Microsoft peering, you will need to identify the NAT IP addresses that are used. For public peering, each ExpressRoute circuit by default uses two NAT IP addresses applied to Azure service traffic when the traffic enters the Microsoft Azure network backbone. For Microsoft peering, the NAT IP address(es) that are used are either customer provided or are provided by the service provider. To allow access to your service resources, you must allow these public IP addresses in the resource IP firewall setting. To find your public peering ExpressRoute circuit IP addresses, [open a support ticket with ExpressRoute](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview) via the Azure portal. Learn more about [NAT for ExpressRoute public and Microsoft peering.](../expressroute/expressroute-nat.md?toc=%2fazure%2fvirtual-network%2ftoc.json#nat-requirements-for-azure-public-peering)
+If you are using [ExpressRoute](../../expressroute/expressroute-introduction.md?toc=%2fazure%2fvirtual-network%2ftoc.json) from your premises, for public peering or Microsoft peering, you will need to identify the NAT IP addresses that are used. For public peering, each ExpressRoute circuit by default uses two NAT IP addresses applied to Azure service traffic when the traffic enters the Microsoft Azure network backbone. For Microsoft peering, the NAT IP address(es) that are used are either customer provided or are provided by the service provider. To allow access to your service resources, you must allow these public IP addresses in the resource IP firewall setting. To find your public peering ExpressRoute circuit IP addresses, [open a support ticket with ExpressRoute](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview) via the Azure portal. Learn more about [NAT for ExpressRoute public and Microsoft peering.](../../expressroute/expressroute-nat.md?toc=%2fazure%2fvirtual-network%2ftoc.json#nat-requirements-for-azure-public-peering)
   
 To allow communication from your circuit to Azure SQL Database, you must create IP network rules for the public IP addresses of your NAT.
 
diff --git a/articles/azure-sql/database/xevent-code-event-file.md b/articles/azure-sql/database/xevent-code-event-file.md
@@ -38,7 +38,7 @@ This topic presents a two-phase code sample:
 - An Azure account and subscription. You can sign up for a [free trial](https://azure.microsoft.com/pricing/free-trial/).
 - Any database you can create a table in.
   
-  - Optionally you can [create an **AdventureWorksLT** demonstration database](sql-database-get-started.md) in minutes.
+  - Optionally you can [create an **AdventureWorksLT** demonstration database](quickstart-create-single-database.md) in minutes.
 
 - SQL Server Management Studio (ssms.exe), ideally its latest monthly update version.
   You can download the latest ssms.exe from:
diff --git a/articles/azure-sql/database/xevent-db-diff-from-svr.md b/articles/azure-sql/database/xevent-db-diff-from-svr.md
@@ -178,7 +178,7 @@ The **Event File** target might experience network latency or failures while per
 - [Using Azure PowerShell with Azure Storage](/powershell/module/az.storage/).
 - [Azure Storage Cmdlets](https://docs.microsoft.com/powershell/module/Azure.Storage)
 - [Using Azure PowerShell with Azure Storage](/powershell/module/az.storage/)
-- [How to use Blob storage from .NET](../storage/blobs/storage-dotnet-how-to-use-blobs.md)
+- [How to use Blob storage from .NET](../../storage/blobs/storage-quickstart-blobs-dotnet.md)
 - [CREATE CREDENTIAL (Transact-SQL)](https://msdn.microsoft.com/library/ms189522.aspx)
 - [CREATE EVENT SESSION (Transact-SQL)](https://msdn.microsoft.com/library/bb677289.aspx)
 - [Jonathan Kehayias' blog posts about extended events in Microsoft SQL Server](https://www.sqlskills.com/blogs/jonathan/category/extended-events/)
diff --git a/articles/sql-database/import-export-from-vm.md b/articles/sql-database/import-export-from-vm.md
@@ -76,11 +76,11 @@ The following steps create a server-level IP firewall rule for your virtual mach
 
 2. Copy this fully qualified server name to use when connecting to your server and its databases.
 
-   ![server name](./media/sql-database-get-started-portal/server-name.png)
+   ![server name](../azure-sql/database/media/quickstart-create-single-database/server-name.png)
 
 3. Select **Set server firewall** on the toolbar. The **Firewall settings** page for the server opens.
 
-   ![server-level IP firewall rule](./media/sql-database-get-started-portal/server-firewall-rule.png)
+   ![server-level IP firewall rule](../azure-sql/database/media/quickstart-create-single-database/server-firewall-rule.png)
 
 4. Choose **Add client IP** on the toolbar to add your virtual machine's public IP address to a new server-level IP firewall rule. A server-level IP firewall rule can open port 1433 for a single IP address or a range of IP addresses.
 
diff --git a/articles/sql-database/sql-database-cli-samples.md b/articles/sql-database/sql-database-cli-samples.md
@@ -50,7 +50,7 @@ The following table includes links to Azure CLI script examples to manage single
 | [Import a database from a bacpac file](scripts/sql-database-import-from-bacpac-cli.md)| Imports a database to SQL Database from a *.bacpac* file. |
 |||
 
-Learn more about the [single database Azure CLI API](../azure-sql/database/single-databases-manage.md#azure-cli).
+Learn more about the [single database Azure CLI API](../azure-sql/database/single-database-manage.md#azure-cli).
 
 # [Azure SQL Managed Instance](#tab/managed-instance)
 
diff --git a/articles/sql-database/sql-database-powershell-samples.md b/articles/sql-database/sql-database-powershell-samples.md
@@ -52,7 +52,7 @@ The following table includes links to sample Azure PowerShell scripts for Azure
 | [Update the SQL Data Sync sync schema](../azure-sql/database/scripts/update-sync-schema-in-sync-group.md?toc=%2fpowershell%2fmodule%2ftoc.json) | This PowerShell script adds or removes items from the Data Sync sync schema. |
 |||
 
-Learn more about the [Single Database Azure PowerShell API](../azure-sql/database/single-databases-manage.md#powershell).
+Learn more about the [Single Database Azure PowerShell API](../azure-sql/database/single-database-manage.md#powershell). 
 
 ## [Azure SQL Managed Instance](#tab/managed-instance)
 
diff --git a/articles/sql-database/sql-database-purchase-models.md b/articles/sql-database/sql-database-purchase-models.md
@@ -23,7 +23,7 @@ Azure SQL Database & SQL Managed Instan lets you easily purchase a fully managed
 There are two purchasing models:
 
 - [vCore-based purchasing model](sql-database-service-tiers-vcore.md) is available for both [Azure SQL Database](sql-database-technical-overview.md) and [Azure SQL Managed Instance](sql-database-managed-instance.md). The [Hyperscale service tier](../azure-sql/database/service-tier-hyperscale.md) is available for single SQL Databases that are using the [vCore-based purchasing model](sql-database-service-tiers-vcore.md).
-- [DTU-based purchasing model](../azure-sql/database/dtu-service-tiers.md) is available for [Azure SQL Database](../azure-sql/database/single-databases-manage.md).
+- [DTU-based purchasing model](../azure-sql/database/dtu-service-tiers.md) is available for [Azure SQL Database](../azure-sql/database/single-database-manage.md).
 
 The following table and chart compare and contrast the vCore-based and the DTU-based purchasing models:
 
diff --git a/articles/synapse-analytics/data-integration/data-integration-sql-pool.md b/articles/synapse-analytics/data-integration/data-integration-sql-pool.md
@@ -19,7 +19,7 @@ In this article you will learn how to ingest data from an Azure Data Lake Gen 2
 
 * **Azure subscription**: If you don't have an Azure subscription, create a [free Azure account](https://azure.microsoft.com/free/) before you begin.
 * **Azure storage account**: You use Azure Data Lake Storage Gen 2 as a *source* data store. If you don't have a storage account, see [Create an Azure Storage account](../../storage/blobs/data-lake-storage-quickstart-create-account.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json) for steps to create one.
-* **Azure Synapse Analytics**: You use a SQL pool as a *sink* data store. If you don't have an Azure Synapse Analytics instance, see [Create a SQL pool](../../sql-database/sql-database-get-started-portal.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json) for steps to create one.
+* **Azure Synapse Analytics**: You use a SQL pool as a *sink* data store. If you don't have an Azure Synapse Analytics instance, see [Create a SQL pool](../../azure-sql/database/quickstart-create-single-database.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json) for steps to create one.
 
 ## Create linked services
 

Original file line number	Diff line number	Diff line change
`@@ -52629,7 +52629,7 @@`
`52629`	`52629`	`},`
`52630`	`52630`	`{`
`52631`	`52631`	`"source_path": "articles/sql-database/sql-database-single-databases-manage.md",`
`52632`		`- "redirect_url": "/azure/azure-sql/database/single-databases-manage",`
	`52632`	`+ "redirect_url": "/azure/azure-sql/database/single-database-manage",`
`52633`	`52633`	`"redirect_document_id": true`
`52634`	`52634`	`},`
`52635`	`52635`	`{`