fixing things

Author: MashaMSFT

articles/azure-sql/database/connect-excel.md

@@ -38,7 +38,7 @@ You'll also need a copy of Excel. This article uses [Microsoft Excel 2016](https
    ![Type the server name and login credentials](./media/connect-excel/connect-to-server.png)
 
    > [!TIP]
-   > Depending on your network environment, you may not be able to connect or you may lose the connection if the server doesn't allow traffic from your client IP address. Go to the [Azure portal](https://portal.azure.com/), click SQL servers, click your server, click firewall under settings and add your client IP address. See [How to configure firewall settings](sql-database-configure-firewall-settings.md) for details.
+   > Depending on your network environment, you may not be able to connect or you may lose the connection if the server doesn't allow traffic from your client IP address. Go to the [Azure portal](https://portal.azure.com/), click SQL servers, click your server, click firewall under settings and add your client IP address. See [How to configure firewall settings](firewall-configure.md) for details.
 
 5. In the **Navigator**, select the database you want to work with from the list, select the tables or views you want to work with (we chose **vGetAllCategories**), and then select **Load** to move the data from your database to your Excel spreadsheet.
 

articles/azure-sql/database/connect-query-content-reference-guide.md

@@ -86,7 +86,7 @@ The following table lists examples of object-relational mapping (ORM) frameworks
 - For connectivity architecture information, see [Azure SQL Database Connectivity Architecture](connectivity-architecture.md).
 - Find [SQL Server drivers](https://msdn.microsoft.com/library/mt654049.aspx) that are used to connect from client applications
 - Connect to SQL Database:
-  - [Connect to SQL Database by using .NET (C#)](sql-database-connect-query-dotnet.md)
+  - [Connect to SQL Database by using .NET (C#)](connect-query-dotnet-core.md)
   - [Connect to SQL Database by using PHP](connect-query-php.md)
   - [Connect to SQL Database by using Node.js](connect-query-nodejs.md)
   - [Connect to SQL Database by using Java](connect-query-java.md)

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

@@ -42,9 +42,9 @@ In this quickstart, you use Java to connect to an Azure SQL Database and use T-S
 > [!NOTE]
 > You can optionally choose to use an Azure SQL Managed Instance.
 >
-> To create and configure, use the [Azure Portal](../../sql-database/sql-database-managed-instance-get-started.md), [PowerShell](../../sql-database/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/sql-database-managed-instance-configure-vm.md) connectivity.
+> To create and configure, use the [Azure Portal](../../sql-database/sql-database-managed-instance-get-started.md), [PowerShell](../../sql-database/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/sql-database-managed-instance-configure-p2s.md) or [VM](../../sql-database/sql-database-managed-instance-configure-vm.md) connectivity.
 >
-> To load data, see [restore with BACPAC](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).
+> To load data, see [restore with BACPAC](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/sql-database-managed-instance-get-started-restore.md).
 
 ## Get SQL server connection information
 

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

@@ -42,9 +42,9 @@ In this quickstart, you use Node.js to connect to an Azure SQL Database and use
 > [!NOTE]
 > You can optionally choose to use an Azure SQL Managed Instance.
 >
-> To create and configure, use the [Azure Portal](../../sql-database/sql-database-managed-instance-get-started.md), [PowerShell](../../sql-database/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/sql-database-managed-instance-configure-vm.md) connectivity.
+> To create and configure, use the [Azure Portal](../../sql-database/sql-database-managed-instance-get-started.md), [PowerShell](../../sql-database/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/sql-database-managed-instance-configure-p2s.md) or [VM](../../sql-database/sql-database-managed-instance-configure-vm.md) connectivity.
 >
-> To load data, see [restore with BACPAC](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).
+> To load data, see [restore with BACPAC](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/sql-database-managed-instance-get-started-restore.md).
 
 ## Get SQL server connection information
 

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

@@ -50,9 +50,9 @@ In this quickstart, you use Python to connect to an Azure SQL Database and use T
 > [!NOTE]
 > You can optionally choose to use an Azure SQL Managed Instance.
 >
-> To create and configure, use the [Azure Portal](../../sql-database/sql-database-managed-instance-get-started.md), [PowerShell](../../sql-database/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/sql-database-managed-instance-configure-vm.md) connectivity.
+> To create and configure, use the [Azure Portal](../../sql-database/sql-database-managed-instance-get-started.md), [PowerShell](../../sql-database/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/sql-database-managed-instance-configure-p2s.md) or [VM](../../sql-database/sql-database-managed-instance-configure-vm.md) connectivity.
 >
-> To load data, see [restore with BACPAC](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).
+> To load data, see [restore with BACPAC](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/sql-database-managed-instance-get-started-restore.md).
 
 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).
 

articles/azure-sql/database/develop-cplusplus-simple.md

@@ -52,7 +52,7 @@ Copy the contents of the **ODBC (Includes Node.js) [SQL authentication]** string
 
 ## <a id="Firewall"></a>Step 3:  Add your IP to the firewall
 
-Go to the firewall section for your server and add your [client IP to the firewall using these steps](sql-database-configure-firewall-settings.md) to make sure we can establish a successful connection:
+Go to the firewall section for your server and add your [client IP to the firewall using these steps](firewall-configure.md) to make sure we can establish a successful connection:
 
 ![AddyourIPWindow](./media/develop-cplusplus-simple/ip.png)
 
@@ -78,7 +78,7 @@ Congratulations! You have now successfully connected to Azure SQL using C++ and
 
 ## <a id="Linux"></a>Step 5: Connecting from a Linux C/C++ application
 
-In case you haven't heard the news yet, Visual Studio now allows you to develop C++ Linux application as well. You can read about this new scenario in the [Visual C++ for Linux Development](https://blogs.msdn.microsoft.com/vcblog/20../../visual-c-for-linux-development/) blog. To build for Linux, you need a remote machine where your Linux distro is running. If you don't have one available, you can set one up quickly using [Linux Azure Virtual machines](../virtual-machines/linux/quick-create-cli.md?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+In case you haven't heard the news yet, Visual Studio now allows you to develop C++ Linux application as well. You can read about this new scenario in the [Visual C++ for Linux Development](https://blogs.msdn.microsoft.com/vcblog/20../../visual-c-for-linux-development/) blog. To build for Linux, you need a remote machine where your Linux distro is running. If you don't have one available, you can set one up quickly using [Linux Azure Virtual machines](../../virtual-machines/linux/quick-create-cli.md?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
 
 For this tutorial, let us assume that you have an Ubuntu 16.04 Linux distribution set up. The steps here should also apply to Ubuntu 15.10, Red Hat 6, and Red Hat 7.
 
@@ -136,5 +136,5 @@ You can find the GetStarted solution that contains all the samples in this artic
 
 ## Additional resources
 
-* [Design Patterns for Multi-tenant SaaS Applications with Azure SQL Database](sql-database-design-patterns-multi-tenancy-saas-applications.md)
+* [Design Patterns for Multi-tenant SaaS Applications with Azure SQL Database](saas-tenancy-app-design-patterns.md)
 * Explore all the [capabilities of SQL Database](https://azure.microsoft.com/services/sql-database/)

articles/azure-sql/database/high-availability-sla.md

@@ -16,7 +16,7 @@ ms.date: 04/02/2020
 
 # High-availability for Azure SQL Database & SQL Managed Instance
 
-The goal of the high availability architecture in Azure SQL Database and SQL Managed Instance is to guarantee that your database is up and running minimum of 99.99% of time (For more information regarding specific SLA for different tiers, Please refer [SLA for Azure SQL Database & SQL Managed Instance](https://azure.microsoft.com/support/legal/sla/sql-database/)), without worrying about the impact of maintenance operations and outages. Azure automatically handles critical servicing tasks, such as patching, backups, Windows and SQL upgrades, as well as unplanned events such as underlying hardware, software, or network failures.  When the underlying SQL instance is patched or fails over, the downtime is not noticeable if you [employ retry logic](../azure-sql/database/develop-overview.md#resiliency) in your app. SQL Database and SQL Managed Instance can quickly recover even in the most critical circumstances ensuring that your data is always available.
+The goal of the high availability architecture in Azure SQL Database and SQL Managed Instance is to guarantee that your database is up and running minimum of 99.99% of time (For more information regarding specific SLA for different tiers, Please refer [SLA for Azure SQL Database & SQL Managed Instance](https://azure.microsoft.com/support/legal/sla/sql-database/)), without worrying about the impact of maintenance operations and outages. Azure automatically handles critical servicing tasks, such as patching, backups, Windows and SQL upgrades, as well as unplanned events such as underlying hardware, software, or network failures.  When the underlying SQL instance is patched or fails over, the downtime is not noticeable if you [employ retry logic](develop-overview.md#resiliency) in your app. SQL Database and SQL Managed Instance can quickly recover even in the most critical circumstances ensuring that your data is always available.
 
 The high availability solution is designed to ensure that committed data is never lost due to failures, that maintenance operations do not affect your workload, and that the database will not be a single point of failure in your software architecture. There are no maintenance windows or downtimes that should require you to stop the workload while the database is upgraded or maintained.
 

articles/azure-sql/database/job-automation-overview.md

@@ -201,7 +201,7 @@ For the current preview, an existing Azure SQL Database (S0 or higher) is requir
 
 The *Job database* doesn't literally need to be new, but should be a clean, empty, S0 or higher service objective. The recommended service objective of the *Job database* is S1 or higher, but the optimal choice depends on the performance needs of your job(s): the number of job steps, the number of job targets, and how frequently jobs are run. For example, an S0 database might be sufficient for a job agent that runs few jobs an hour targeting less than ten databases, but running a job every minute might not be fast enough with an S0 database, and a higher service tier might be better.
 
-If operations against the job database are slower than expected, [monitor](../../sql-database/sql-database-monitor-tune-overview.md#azure-sql-database-and-azure-sql-managed-instance-resource-monitoring) database performance and the resource utilization in the job database during periods of slowness using Azure portal or the [sys.dm_db_resource_stats](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-db-resource-stats-azure-sql-database) DMV. If utilization of a resource, such as CPU, Data IO, or Log Write approaches 100% and correlates with periods of slowness, consider incrementally scaling the database to higher service objectives (either in the [DTU model](../azure-sql/database/dtu-service-tiers.md) or in the [vCore model](../../sql-database/sql-database-service-tiers-vcore.md)) until job database performance is sufficiently improved.
+If operations against the job database are slower than expected, [monitor](../../sql-database/sql-database-monitor-tune-overview.md#azure-sql-database-and-azure-sql-managed-instance-resource-monitoring) database performance and the resource utilization in the job database during periods of slowness using Azure portal or the [sys.dm_db_resource_stats](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-db-resource-stats-azure-sql-database) DMV. If utilization of a resource, such as CPU, Data IO, or Log Write approaches 100% and correlates with periods of slowness, consider incrementally scaling the database to higher service objectives (either in the [DTU model](dtu-service-tiers.md) or in the [vCore model](../../sql-database/sql-database-service-tiers-vcore.md)) until job database performance is sufficiently improved.
 
 ##### Job database permissions