Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into nomi

Author: markingmyname

docs/analysis-services/languages-and-collations-analysis-services.md

@@ -62,7 +62,7 @@ manager: kfile
 
 -   0x0416 or 1046 for **Portuguese (Brazil)**.  
 
- To view a longer list, see [Locale IDs Assigned by Microsoft](http://msdn.microsoft.com/goglobal/bb964664.aspx). For more background, see [Encoding and Code Pages](http://msdn.microsoft.com/goglobal/bb688114.aspx).  
+ To view a longer list, see [Locale IDs Assigned by Microsoft](http://msdn.microsoft.com/goglobal/bb964664.aspx). For more background, see [Encoding and Code Pages](/globalization/encoding/encoding-overview).  
 
 > [!NOTE]  
 >  The **Language** property does not determine the language for returning system messages, or which strings appear in the user interface. Errors, warnings, and messages are localized into all languages supported in Office and Office 365 and are used automatically when the client connection specifies one of the supported locales.  

docs/connect/ado-net/step-3-proof-of-concept-connecting-to-sql-using-ado-net.md

@@ -25,7 +25,7 @@ This C# code example should be considered a proof of concept only. The sample co
 The method **SqlConnection.Open** is used to connect to your SQL database.  
 
 
-```CSharp  
+```C#  
     // C# , ADO.NET  
     using System;
     using QC = System.Data.SqlClient;  // System.Data.dll  
@@ -68,7 +68,7 @@ The method SqlCommand.ExecuteReader:
 
 
 
-```CSharp  
+```C#  
     using System;  // C# , ADO.NET  
     using DT = System.Data;            // System.Data.dll  
     using QC = System.Data.SqlClient;  // System.Data.dll  
@@ -156,7 +156,7 @@ This example demonstrates how to:
 
 
 
-```CSharp  
+```C#  
     using System;  // C# , ADO.NET  
     using DT = System.Data;            // System.Data.dll  
     using QC = System.Data.SqlClient;  // System.Data.dll  

docs/connect/ado-net/step-4-connect-resiliently-to-sql-with-ado-net.md

@@ -62,7 +62,7 @@ Then you must edit the strings for server name, password, and so on. You can fin
 NOTE: The connection string for server name is geared toward Azure SQL Database, because it includes the four character prefix of **tcp:**. But you can adjust the server string to connect to your Microsoft SQL Server.  
 
 
-```CSharp  
+```C#  
     using System;  // C#  
     using CG = System.Collections.Generic;  
     using QC = System.Data.SqlClient;  

docs/connect/jdbc/connecting-to-an-azure-sql-database.md

@@ -27,7 +27,7 @@ This article discusses issues when using the [!INCLUDE[jdbcNoVersion](../../incl
 ## Details
 
 When connecting to a [!INCLUDE[ssAzure](../../includes/ssazure_md.md)], you should connect to the master database to call **SQLServerDatabaseMetaData.getCatalogs**.  
-[!INCLUDE[ssAzure](../../includes/ssazure_md.md)] doesn't support returning the entire set of catalogs from a user database. **SQLServerDatabaseMetaData.getCatalogs** use the sys.databases view to get the catalogs. Please refer to the discussion of permissions in [sys.databases (SQL Azure Database)](https://go.microsoft.com/fwlink/?LinkId=217396) to understand **SQLServerDatabaseMetaData.getCatalogs** behavior on a [!INCLUDE[ssAzure](../../includes/ssazure_md.md)].  
+[!INCLUDE[ssAzure](../../includes/ssazure_md.md)] doesn't support returning the entire set of catalogs from a user database. **SQLServerDatabaseMetaData.getCatalogs** use the sys.databases view to get the catalogs. Please refer to the discussion of permissions in [sys.databases (Transact-SQL)](../../relational-databases/system-catalog-views/sys-databases-transact-sql.md) to understand **SQLServerDatabaseMetaData.getCatalogs** behavior on a [!INCLUDE[ssAzure](../../includes/ssazure_md.md)].  
 
 ## Connections Dropped
 

docs/connect/jdbc/reference/getcatalogs-method-sqlserverdatabasemetadata.md

@@ -39,7 +39,7 @@ public java.sql.ResultSet getCatalogs()
  This getCatalogs method is specified by the getCatalogs method in the java.sql.DatabaseMetaData interface.  
 
 > [!NOTE]  
->  On SQL Azure, you should connect to the master database to call **SQLServerDatabaseMetaData.getCatalogs**. SQL Azure does not support returning the entire set of catalogs from a user database. **SQLServerDatabaseMetaData.getCatalogs** uses the sys.databases view to get the catalogs. Please refer to the discussion of permissions in [sys.databases (SQL Azure Database)](https://go.microsoft.com/fwlink/?LinkId=217396) to understand **SQLServerDatabaseMetaData.getCatalogs** behavior on SQL Azure.  
+>  On SQL Azure, you should connect to the master database to call **SQLServerDatabaseMetaData.getCatalogs**. SQL Azure does not support returning the entire set of catalogs from a user database. **SQLServerDatabaseMetaData.getCatalogs** uses the sys.databases view to get the catalogs. Please refer to the discussion of permissions in [sys.database_usage (Azure SQL Database)](../../../relational-databases/system-catalog-views/sys-database-usage-azure-sql-database.md) to understand **SQLServerDatabaseMetaData.getCatalogs** behavior on SQL Azure.  
   
  The result set returned by the getCatalogs method will contain the following information:  
 

docs/connect/odbc/linux-mac/data-access-tracing-with-the-odbc-driver-on-linux.md

@@ -59,7 +59,7 @@ SQLLEN Size........: 8
 SQLSETPOSIROW Size.: 8
 ```
 
-The [unixODBC documentation](https://www.unixodbc.org/doc/UserManual/) explains the differences between user and system DSNs. In summary:
+The [unixODBC documentation](http://www.unixodbc.org/doc/UserManual/) explains the differences between user and system DSNs. In summary:
 
 - User DSNs --- these are DSNs which are only available to a specific user. Users can connect using, add, modify, and remove their own user DSNs. User DSNs are stored in a file in the user's home directory, or a subdirectory thereof.
 

docs/connect/odbc/linux-mac/installing-the-driver-manager.md

@@ -46,7 +46,7 @@ To install the driver manager:
 
 5.  When you are ready to install, and if your computer can access an external site via FTP, execute the following command: **./build_dm.sh**.
 
-If your computer cannot access an external site via FTP, get `unixODBC-2.3.0.tar.gz`. You can get `unixODBC-2.3.0.tar.gz` from [https://www.unixodbc.org](https://www.unixodbc.org/). Click the **Download** link on the left side of the page to go to the download page. Then click the appropriate link to download unixODBC-2.3.0 (not unixODBC-2.3.1). unixODBC-2.3.1 is not supported with this release of the [!INCLUDE[msCoName](../../../includes/msconame_md.md)] ODBC Driver 11 for [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)]. Execute the following command to begin the unixODBC Driver Manager installation: **./build_dm.sh --download-url=file://unixODBC-2.3.0.tar.gz**.  
+If your computer cannot access an external site via FTP, get `unixODBC-2.3.0.tar.gz`. You can get `unixODBC-2.3.0.tar.gz` from [http://www.unixodbc.org](http://www.unixodbc.org/). Click the **Download** link on the left side of the page to go to the download page. Then click the appropriate link to download unixODBC-2.3.0 (not unixODBC-2.3.1). unixODBC-2.3.1 is not supported with this release of the [!INCLUDE[msCoName](../../../includes/msconame_md.md)] ODBC Driver 11 for [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)]. Execute the following command to begin the unixODBC Driver Manager installation: **./build_dm.sh --download-url=file://unixODBC-2.3.0.tar.gz**.  
 
 6.  Type **YES** to proceed with unpacking the files. This part of the process can take up to five minutes to complete.  
 
@@ -60,7 +60,7 @@ If the installation script is unable to complete, configure and build the proper
 
 1.  Remove any older installed version of unixODBC (for example, unixODBC 2.2.11). On Red Hat Enterprise Linux 5 or 6, execute the following command: **yum remove unixODBC**. On SUSE Linux Enterprise, **zypper remove unixODBC**.  
 
-2.  Go to [https://www.unixodbc.org](https://www.unixodbc.org/). Click the **Download** link on the left side of the page to go to the download page. Then click the appropriate link to save the file unixODBC-2.3.0.tar.gz to your computer. UnixODBC-2.3.1 is not supported with this release of the [!INCLUDE[msCoName](../../../includes/msconame_md.md)] ODBC Driver 11 for [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)].  
+2.  Go to [http://www.unixodbc.org](http://www.unixodbc.org/). Click the **Download** link on the left side of the page to go to the download page. Then click the appropriate link to save the file unixODBC-2.3.0.tar.gz to your computer. UnixODBC-2.3.1 is not supported with this release of the [!INCLUDE[msCoName](../../../includes/msconame_md.md)] ODBC Driver 11 for [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)].  
 
 3.  On your Linux computer, execute the command: **tar xvzf unixODBC-2.3.0.tar.gz**.  
 

docs/connect/odbc/linux-mac/using-integrated-authentication.md

@@ -61,7 +61,7 @@ Logging in to [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] uses
 
 To audit activities in [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] on behalf of users other than the system account, the application must use [!INCLUDE[tsql](../../../includes/tsql-md.md)] **EXECUTE AS**.  
 
-To improve application performance, an application can use connection pooling with Integrated Authentication and auditing. However, combining connection pooling, Integrated Authentication, and auditing creates a security risk because the unixODBC driver manager permits different users to reuse pooled connections. For more information, see [ODBC Connection Pooling](https://www.unixodbc.org/doc/conn_pool.html).  
+To improve application performance, an application can use connection pooling with Integrated Authentication and auditing. However, combining connection pooling, Integrated Authentication, and auditing creates a security risk because the unixODBC driver manager permits different users to reuse pooled connections. For more information, see [ODBC Connection Pooling](http://www.unixodbc.org/doc/conn_pool.html).  
 
 Before reuse, an application must reset pooled connections by executing `sp_reset_connection`.  
 

docs/connect/php/connection-resiliency.md

@@ -13,7 +13,7 @@ manager: "v-hakaka"
 # Idle Connection Resiliency
 [!INCLUDE[Driver_PHP_Download](../../includes/driver_php_download.md)]
 
-[Connection resiliency](https://msdn.microsoft.com/library/dn632678.aspx) is the principle that a broken idle connection can be reestablished, within certain constraints. If a connection to Microsoft SQL Server fails, connection resiliency allows the client to automatically attempt to reestablish the connection. Connection resiliency is a property of the data source; only SQL Server 2014 and later and Azure SQL Database support connection resiliency.
+[Connection resiliency](../odbc/windows/connection-resiliency-in-the-windows-odbc-driver.md) is the principle that a broken idle connection can be reestablished, within certain constraints. If a connection to Microsoft SQL Server fails, connection resiliency allows the client to automatically attempt to reestablish the connection. Connection resiliency is a property of the data source; only SQL Server 2014 and later and Azure SQL Database support connection resiliency.
 
 Connection resiliency is implemented with two connection keywords that can be added to connection strings: **ConnectRetryCount** and **ConnectRetryInterval**.
 
@@ -125,4 +125,4 @@ Statement 2 successful.
 ```
 
 ## See Also
-[Connection Resiliency in the Windows ODBC Driver](https://docs.microsoft.com/sql/connect/odbc/windows/connection-resiliency-in-the-windows-odbc-driver)
+[Connection Resiliency in the Windows ODBC Driver](../odbc/windows/connection-resiliency-in-the-windows-odbc-driver.md)

docs/connect/php/support-resources-for-the-php-sql-driver.md

@@ -41,9 +41,9 @@ For peer-to-peer support, visit the [IIS Forums](https://forums.iis.net/).
 ## PHP Support Resources  
 [PHP for Windows Documentation](https://windows.php.net/)  
 
-For the latest information about PHP, visit [https://www.php.net/](https://www.php.net).  
+For the latest information about PHP, visit [http://www.php.net/](http://www.php.net).  
 
-For PHP documentation, visit [https://www.php.net/docs.php](https://www.php.net/docs.php).  
+For PHP documentation, visit [http://www.php.net/docs.php](http://www.php.net/docs.php).  
 
 ## Microsoft Customer Support  
 For support questions related to the [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)], you can contact [Microsoft Support](https://support.microsoft.com/contactus/), or ask on the [Github project page](https://github.com/Microsoft/msphpsql/issues).