Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into 20210201-alter-authorization-for-databases

Author: MikeRayMSFT

docs/connect/php/how-to-retrieve-date-and-time-type-as-strings-using-the-sqlsrv-driver.md

@@ -33,7 +33,7 @@ The following example shows the syntax specifying to retrieve date and time type
 ```php
 <?php
 $serverName = "MyServer";
-$connectionInfo = array("Database"=>"AdventureWorks", 'ReturnDatesAsStrings '=> true);
+$connectionInfo = array("Database"=>"AdventureWorks", 'ReturnDatesAsStrings'=> true);
 $conn = sqlsrv_connect($serverName, $connectionInfo);
 if ($conn === false) {
    echo "Could not connect.\n";

docs/includes/odbc-latest-release.md

@@ -1,2 +1,2 @@
-Version: 17.6.1.1
-Date: July 31st 2020
+Version: 17.7.1.1
+Date: January 29th 2021

docs/relational-databases/backup-restore/view-the-data-and-log-files-in-a-backup-set-sql-server.md

@@ -22,7 +22,7 @@ ms.author: chadam
 # View the data and log files in a backup set (SQL Server)
  [!INCLUDE [SQL Server](../../includes/applies-to-version/sqlserver.md)]
 
-  This topic describes how to view the data and log files in a backup set in [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] by using [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] or [!INCLUDE[tsql](../../includes/tsql-md.md)].  
+  This topic describes how to view the data and log files in a backup set in [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] by using [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] or [!INCLUDE[tsql](../../includes/tsql-md.md)].  
 
  **In This Topic**  
 

docs/relational-databases/backup-restore/view-the-properties-and-contents-of-a-logical-backup-device-sql-server.md

@@ -25,7 +25,7 @@ ms.author: chadam
 # View the Properties and Contents of a Logical Backup Device (SQL Server)
  [!INCLUDE [SQL Server](../../includes/applies-to-version/sqlserver.md)]
 
-  This topic describes how to view the properties and contents of a logical backup device in [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] by using [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] or [!INCLUDE[tsql](../../includes/tsql-md.md)].  
+  This topic describes how to view the properties and contents of a logical backup device in [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] by using [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] or [!INCLUDE[tsql](../../includes/tsql-md.md)].  
 
  **In This Topic**  
 

docs/relational-databases/blob/enable-and-configure-filestream.md

@@ -22,7 +22,7 @@ ms.author: mikeray
 
 #### To enable and change FILESTREAM settings  
 
-1.  On the **Start** menu, point to **All Programs**, point to [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)], point to **Configuration Tools**, and then click **SQL Server Configuration Manager**.  
+1.  On the **Start** menu, point to **All Programs**, point to [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)], point to **Configuration Tools**, and then click **SQL Server Configuration Manager**.  
 
 2.  In the list of services, right-click **SQL Server Services**, and then click **Open**.  
 

docs/relational-databases/blob/filestream-compatibility-with-other-sql-server-features.md

@@ -66,7 +66,7 @@ ms.author: mikeray
  A **varbinary(max)** column that has the FILESTREAM attribute enabled at the Publisher can be replicated to a Subscriber with or without the FILESTREAM attribute. To specify the way in which the column is replicated, use the **Article Properties - \<Article>** dialog box or the @schema_option parameter of [sp_addarticle](../../relational-databases/system-stored-procedures/sp-addarticle-transact-sql.md) or [sp_addmergearticle](../../relational-databases/system-stored-procedures/sp-addmergearticle-transact-sql.md). Data that is replicated to a **varbinary(max)** column that does not have the FILESTREAM attribute must not exceed the 2-GB limit for that data type; otherwise, a run-time error is generated. We recommend that you replicate the FILESTREAM attribute, unless you are replicating data to [!INCLUDE[ssVersion2005](../../includes/ssversion2005-md.md)]. Replicating tables that have FILESTREAM columns to [!INCLUDE[ssVersion2000](../../includes/ssversion2000-md.md)] Subscribers is not supported, regardless of the schema option that is specified.  
 
 > [!NOTE]  
->  Replicating large data values from [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] to [!INCLUDE[ssVersion2005](../../includes/ssversion2005-md.md)] Subscribers is limited to a maximum of 256 MB data values. For more information, see [Maximum Capacity Specifications](../../sql-server/maximum-capacity-specifications-for-sql-server.md).  
+>  Replicating large data values from [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] to [!INCLUDE[ssVersion2005](../../includes/ssversion2005-md.md)] Subscribers is limited to a maximum of 256 MB data values. For more information, see [Maximum Capacity Specifications](../../sql-server/maximum-capacity-specifications-for-sql-server.md).  
   
 ### Considerations for Transactional Replication  
  If you use FILESTREAM columns in tables that are published for transactional replication, note the following considerations:  

docs/relational-databases/clr-integration-database-objects-types-net-framework/mapping-clr-parameter-data.md

@@ -45,9 +45,9 @@ ms.author: "jroth"
 |**DATETIMEOFFSET**|**None**|**DateTimeOffset, Nullable\<DateTimeOffset>**|  
 |**decimal**|**SqlDecimal**|**Decimal, Nullable\<Decimal>**|  
 |**float**|**SqlDouble**|**Double, Nullable\<Double>**|  
-|**geography**|**SqlGeography**<br /><br /> **SqlGeography** is defined in Microsoft.SqlServer.Types.dll, which is installed with SQL Server and can be downloaded from the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] [feature pack](https://www.microsoft.com/download/details.aspx?id=100430).|None|  
-|**geometry**|**SqlGeometry**<br /><br /> **SqlGeometry** is defined in Microsoft.SqlServer.Types.dll, which is installed with SQL Server and can be downloaded from the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] [feature pack](https://www.microsoft.com/download/details.aspx?id=100430).|None|  
-|**hierarchyid**|**SqlHierarchyId**<br /><br /> **SqlHierarchyId** is defined in Microsoft.SqlServer.Types.dll, which is installed with SQL Server and can be downloaded from the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] [feature pack](https://www.microsoft.com/download/details.aspx?id=100430).|None|  
+|**geography**|**SqlGeography**<br /><br /> **SqlGeography** is defined in Microsoft.SqlServer.Types.dll, which is installed with SQL Server and can be downloaded from the [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] [feature pack](https://www.microsoft.com/download/details.aspx?id=100430).|None|  
+|**geometry**|**SqlGeometry**<br /><br /> **SqlGeometry** is defined in Microsoft.SqlServer.Types.dll, which is installed with SQL Server and can be downloaded from the [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] [feature pack](https://www.microsoft.com/download/details.aspx?id=100430).|None|  
+|**hierarchyid**|**SqlHierarchyId**<br /><br /> **SqlHierarchyId** is defined in Microsoft.SqlServer.Types.dll, which is installed with SQL Server and can be downloaded from the [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] [feature pack](https://www.microsoft.com/download/details.aspx?id=100430).|None|  
 |**image**|None|None|  
 |**int**|**SqlInt32**|**Int32, Nullable\<Int32>**|  
 |**money**|**SqlMoney**|**Decimal, Nullable\<Decimal>**|  

docs/relational-databases/collations/collation-and-unicode-support.md

@@ -540,7 +540,7 @@ The following table compares the behavior of some string functions and string op
 ## <a name="GB18030"></a> GB18030 support    
 GB18030 is a separate standard that's used in the People's Republic of China for encoding Chinese characters. In GB18030, characters can be 1, 2, or 4 bytes in length. [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] provides support for GB18030-encoded characters by recognizing them when they enter the server from a client-side application and converting and storing them natively as Unicode characters. After they're stored in the server, they're treated as Unicode characters in any subsequent operations. 
 
-You can use any Chinese collation, preferably the latest 100 version. All \_100 level collations support linguistic sorting with GB18030 characters. If the data includes supplementary characters (surrogate pairs), you can use the SC collations that are available in [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] to improve searching and sorting.    
+You can use any Chinese collation, preferably the latest 100 version. All \_100 level collations support linguistic sorting with GB18030 characters. If the data includes supplementary characters (surrogate pairs), you can use the SC collations that are available in [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] to improve searching and sorting.    
 
 > [!NOTE]
 > Ensure that your client tools, such as [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)], use the Dengxian font to correctly display strings that contain GB18030-encoded characters.

docs/relational-databases/collations/view-collation-information.md

@@ -66,7 +66,7 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
     EXECUTE sp_helpsort;  
     ```  
 
- **To view all collations supported by [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)]**  
+ **To view all collations supported by [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)]**  
 
 1.  In Object Explorer, connect to an instance of the [!INCLUDE[ssDE](../../includes/ssde-md.md)] and on the toolbar, click **New Query**.  
 

docs/relational-databases/data-collection/data-collection.md

@@ -17,16 +17,16 @@ ms.author: mathoma
 ---
 # Data Collection
  [!INCLUDE [SQL Server](../../includes/applies-to-version/sqlserver.md)]
-  The Data Collector is a component of [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] that collects different sets of data. Data collection either runs constantly or on a user-defined schedule. The data collector stores the collected data in a relational database known as the management data warehouse.  
+  The Data Collector is a component of [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] that collects different sets of data. Data collection either runs constantly or on a user-defined schedule. The data collector stores the collected data in a relational database known as the management data warehouse.  
 
 ## What is Data Collector? 
- The data collector is a core component of the data collection platform for [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] and the tools that are provided by [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]. The data collector provides one central point for data collection across your database servers and applications. This collection point can obtain data from a variety of sources and is not limited to performance data, unlike SQL Trace.  
+ The data collector is a core component of the data collection platform for [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] and the tools that are provided by [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]. The data collector provides one central point for data collection across your database servers and applications. This collection point can obtain data from a variety of sources and is not limited to performance data, unlike SQL Trace.  
 
  The data collector enables you to adjust the scope of data collection to suit your test and production environments. The data collector also uses a data warehouse, a relational database that enables you to manage the data that you collect by setting different retention periods for your data.  
 
  The data collector supports dynamic tuning for data collection and is extensible through its API. For more information, see [Data Collector Programming](../system-functions/data-collector-functions-transact-sql.md).  
 
- The following illustration shows how the data collector fits in the overall strategy for data collection and data management in [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)].  
+ The following illustration shows how the data collector fits in the overall strategy for data collection and data management in [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)].  
 
  ![The Data Collector's Role in Data Management](../../relational-databases/data-collection/media/datacollectorroleindatastrategy.gif "The Data Collector's Role in Data Management")