Bringing even with master.

v-alje · v-alje · commit 577bad1fe87d · 2018-01-11T11:21:38.000-08:00
diff --git a/docs/advanced-analytics/r/use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md b/docs/advanced-analytics/r/use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md
@@ -35,7 +35,7 @@ If at any time you want to stop upgrading on the Machine Learning Server schedul
 
 The process of upgrading the machine learning components is referred to as **binding**, because it changes the support model for SQL Server machine learning components to use the new Modern Software Lifecycle Policy. 
 
-In general, switching to the new licensing model ensures that your data scientists can always use the latest version of R or Python. For more information about the terms of the Modern Lifecycle Policy, see [Support Timeline for Microsoft R Server](https://docs.microsoft.com/machine-learning-server/resources-servicing-support).
+In general, switching to the new servicing model ensures that your data scientists can always use the latest version of R or Python. For more information about the terms of the Modern Lifecycle Policy, see [Support Timeline for Microsoft R Server](https://docs.microsoft.com/machine-learning-server/resources-servicing-support).
 
 > [!NOTE]
 > The upgrade does not change the support model for the SQL Server database and doesn't change the version of SQL Server.
diff --git a/docs/docfx.json b/docs/docfx.json
@@ -34,7 +34,7 @@
     "globalMetadata": {
       "layout": "Conceptual",
       "breadcrumb_path": "~/breadcrumb/toc.yml",
-      "contributors_to_exclude": ["hexiaokai", "openpublishingbuild","sudeepku","saldana"],
+      "contributors_to_exclude": ["hexiaokai", "openpublishingbuild","sudeepku","saldana","iRaindrop"],
       "searchScope": ["sql"],
       "_op_documentIdPathDepotMapping": {
         "linux/": {
diff --git a/docs/integration-services/change-data-capture/review-and-generate-supplemental-logging-scripts.md b/docs/integration-services/change-data-capture/review-and-generate-supplemental-logging-scripts.md
@@ -43,7 +43,7 @@ ms.workload: "Inactive"
   
 2.  When you run the supplemental logging scripts, the Oracle Credentials for Running Script dialog box opens where you provide a valid Oracle user name and password. For information on how to provide the proper Oracle credentials, see [Oracle Credentials for Running Script](../../integration-services/change-data-capture/oracle-credentials-for-running-script.md).  
   
- You can also run the scripts manually using SQL * Plus, if necessary.  
+ You can also run the scripts manually using SQL\*Plus, if necessary.  
   
 ### To run the scripts manually  
   
diff --git a/docs/linux/sql-server-linux-setup-ssis.md b/docs/linux/sql-server-linux-setup-ssis.md
@@ -127,7 +127,7 @@ The following example does the following things:
 -   Runs an unattended installation by specifying the `-n` (no prompt) option.
 
 ```
-sudo SSIS_PID= Developer ACCEPT_EULA=Y /opt/ssis/bin/ssis-conf -n setup 
+sudo SSIS_PID=Developer ACCEPT_EULA=Y /opt/ssis/bin/ssis-conf -n setup 
 ```
 
 ### Environment variables for unattended installation
diff --git a/docs/relational-databases/blob/filestream-sql-server.md b/docs/relational-databases/blob/filestream-sql-server.md
@@ -1,7 +1,7 @@
 ---
 title: "FILESTREAM (SQL Server) | Microsoft Docs"
 ms.custom: ""
-ms.date: "10/17/2016"
+ms.date: "01/11/2018"
 ms.prod: "sql-non-specified"
 ms.prod_service: "database-engine"
 ms.service: ""
@@ -24,7 +24,6 @@ manager: "jhubbard"
 ms.workload: "On Demand"
 ---
 # FILESTREAM (SQL Server)
-[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
 [!INCLUDE[tsql-appliesto-sslinux-only](../../includes/tsql-appliesto-sswindows-only.md)]
 
 FILESTREAM enables [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]-based applications to store unstructured data, such as documents and images, on the file system. Applications can leverage the rich streaming APIs and performance of the file system and at the same time maintain transactional consistency between the unstructured data and corresponding structured data.  
diff --git a/docs/relational-databases/databases/security-best-practices-with-contained-databases.md b/docs/relational-databases/databases/security-best-practices-with-contained-databases.md
@@ -22,7 +22,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Security Best Practices with Contained Databases
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
 
   Contained databases have some unique threats that should be understood and mitigated by [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] administrators. Most of the threats are related to the **USER WITH PASSWORD** authentication process, which moves the authentication boundary from the [!INCLUDE[ssDE](../../includes/ssde-md.md)] level to the database level.  
   
diff --git a/docs/relational-databases/native-client/features/filestream-support.md b/docs/relational-databases/native-client/features/filestream-support.md
@@ -3,7 +3,7 @@ title: "FILESTREAM Support | Microsoft Docs"
 ms.custom: ""
 ms.date: "03/17/2017"
 ms.prod: "sql-non-specified"
-ms.prod_service: "database-engine, sql-database, sql-data-warehouse, pdw"
+ms.prod_service: "database-engine"
 ms.service: ""
 ms.component: "native-client|features"
 ms.reviewer: ""
@@ -23,7 +23,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # FILESTREAM Support
-[!INCLUDE[appliesto-ss-asdb-asdw-pdw-md](../../../includes/appliesto-ss-asdb-asdw-pdw-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
 [!INCLUDE[SNAC_Deprecated](../../../includes/snac-deprecated.md)]
 
   FILESTREAM provides a way to store and access large binary values, either through [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] or by direct access to the Windows file system. A large binary value is a value larger than 2 gigabytes (GB). For more information about enhanced FILESTREAM support, see [FILESTREAM &#40;SQL Server&#41;](../../../relational-databases/blob/filestream-sql-server.md).  
diff --git a/docs/relational-databases/native-client/odbc/filestream-support-odbc.md b/docs/relational-databases/native-client/odbc/filestream-support-odbc.md
@@ -3,7 +3,7 @@ title: "FILESTREAM Support (ODBC) | Microsoft Docs"
 ms.custom: ""
 ms.date: "03/17/2017"
 ms.prod: "sql-non-specified"
-ms.prod_service: "database-engine, sql-database, sql-data-warehouse, pdw"
+ms.prod_service: "database-engine"
 ms.service: ""
 ms.component: "native-client|ODBC"
 ms.reviewer: ""
@@ -23,7 +23,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # FILESTREAM Support (ODBC)
-[!INCLUDE[appliesto-ss-asdb-asdw-pdw-md](../../../includes/appliesto-ss-asdb-asdw-pdw-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
 [!INCLUDE[SNAC_Deprecated](../../../includes/snac-deprecated.md)]
 
   ODBC in [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] Native Client supports the enhanced FILESTREAM feature. For more information about this feature, see [FILESTREAM Support](../../../relational-databases/native-client/features/filestream-support.md). For a sample demonstrating ODB support for FILESTREAM, see [Send and Receive Data Incrementally with FILESTREAM &#40;ODBC&#41;](../../../relational-databases/native-client-odbc-how-to/send-and-receive-data-incrementally-with-filestream-odbc.md).  
diff --git a/docs/relational-databases/native-client/ole-db/filestream-support-ole-db.md b/docs/relational-databases/native-client/ole-db/filestream-support-ole-db.md
@@ -3,7 +3,7 @@ title: "FILESTREAM Support (OLE DB) | Microsoft Docs"
 ms.custom: ""
 ms.date: "03/17/2017"
 ms.prod: "sql-non-specified"
-ms.prod_service: "database-engine, sql-database, sql-data-warehouse, pdw"
+ms.prod_service: "database-engine"
 ms.service: ""
 ms.component: "native-client-ole-db"
 ms.reviewer: ""
@@ -23,7 +23,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # FILESTREAM Support (OLE DB)
-[!INCLUDE[appliesto-ss-asdb-asdw-pdw-md](../../../includes/appliesto-ss-asdb-asdw-pdw-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
 [!INCLUDE[SNAC_Deprecated](../../../includes/snac-deprecated.md)]
 
   Beginning with [!INCLUDE[ssKatmai](../../../includes/sskatmai-md.md)] and [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] Native Client 10.0, OLE DB supports the enhanced FILESTREAM feature. For more information about this feature, see [FILESTREAM Support](../../../relational-databases/native-client/features/filestream-support.md). For samples, see [Filestream and OLE DB](../../../relational-databases/native-client-ole-db-how-to/filestream/filestream-and-ole-db.md).  
diff --git a/docs/relational-databases/partitions/create-partitioned-tables-and-indexes.md b/docs/relational-databases/partitions/create-partitioned-tables-and-indexes.md
@@ -3,7 +3,7 @@ title: "Create Partitioned Tables and Indexes | Microsoft Docs"
 ms.custom: ""
 ms.date: "03/14/2017"
 ms.prod: "sql-non-specified"
-ms.prod_service: "database-engine"
+ms.prod_service: "database-engine, sql-database"
 ms.service: ""
 ms.component: "partitions"
 ms.reviewer: ""
@@ -38,7 +38,7 @@ manager: "jhubbard"
 ms.workload: "Active"
 ---
 # Create Partitioned Tables and Indexes
-[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
   You can create a partitioned table or index in [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] by using [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] or [!INCLUDE[tsql](../../includes/tsql-md.md)]. The data in partitioned tables and indexes is horizontally divided into units that can be spread across more than one filegroup in a database. Partitioning can make large tables and indexes more manageable and scalable.  
   
  Creating a partitioned table or index typically happens in four parts:  
diff --git a/docs/relational-databases/partitions/modify-a-partition-function.md b/docs/relational-databases/partitions/modify-a-partition-function.md
@@ -3,7 +3,7 @@ title: "Modify a Partition Function | Microsoft Docs"
 ms.custom: ""
 ms.date: "03/14/2017"
 ms.prod: "sql-non-specified"
-ms.prod_service: "database-engine"
+ms.prod_service: "database-engine, sql-database"
 ms.service: ""
 ms.component: "partitions"
 ms.reviewer: ""
@@ -20,7 +20,7 @@ manager: "jhubbard"
 ms.workload: "On Demand"
 ---
 # Modify a Partition Function
-[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
   You can change the way a table or index is partitioned in [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] by adding or subtracting the number of partitions specified, in increments of 1, in the partition function of the partitioned table or index by using [!INCLUDE[tsql](../../includes/tsql-md.md)]. When you add a partition, you do so by "splitting" an existing partition into two partitions and redefining the boundaries of the new partitions. When you drop a partition, you do so by "merging" the boundaries of two partitions into one. This last action repopulates one partition and leaves the other partition unassigned.  
   
 > [!CAUTION]  
diff --git a/docs/relational-databases/partitions/modify-a-partition-scheme.md b/docs/relational-databases/partitions/modify-a-partition-scheme.md
@@ -3,7 +3,7 @@ title: "Modify a Partition Scheme | Microsoft Docs"
 ms.custom: ""
 ms.date: "03/14/2017"
 ms.prod: "sql-non-specified"
-ms.prod_service: "database-engine"
+ms.prod_service: "database-engine, sql-database"
 ms.service: ""
 ms.component: "partitions"
 ms.reviewer: ""
@@ -20,7 +20,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Modify a Partition Scheme
-[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
   You can modify a partition scheme in [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] by designating a filegroup to hold the next partition that is added to a partitioned table using [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] or [!INCLUDE[tsql](../../includes/tsql-md.md)]. You do this by assigning the NEXT USED property to a filegroup. You can assign the NEXT USED property to an empty filegroup or to one that already holds a partition. In other words, a filegroup can hold more than one partition.  
   
  **In This Topic**  
diff --git a/docs/relational-databases/partitions/partitioned-tables-and-indexes.md b/docs/relational-databases/partitions/partitioned-tables-and-indexes.md
@@ -3,7 +3,7 @@ title: "Partitioned Tables and Indexes | Microsoft Docs"
 ms.custom: ""
 ms.date: "01/20/2016"
 ms.prod: "sql-non-specified"
-ms.prod_service: "database-engine"
+ms.prod_service: "database-engine, sql-database"
 ms.service: ""
 ms.component: "partitions"
 ms.reviewer: ""
@@ -25,7 +25,7 @@ manager: "jhubbard"
 ms.workload: "Active"
 ---
 # Partitioned Tables and Indexes
-[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
   [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] supports table and index partitioning. The data of partitioned tables and indexes is divided into units that can be spread across more than one filegroup in a database. The data is partitioned horizontally, so that groups of rows are mapped into individual partitions. All partitions of a single index or table must reside in the same database. The table or index is treated as a single logical entity when queries or updates are performed on the data. Prior to [!INCLUDE[ssSQL15_md](../../includes/sssql15-md.md)] SP1, partitioned tables and indexes were not available in every edition of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]. For a list of features that are supported by the editions of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], see [Editions and Supported Features for SQL Server 2016](../../sql-server/editions-and-supported-features-for-sql-server-2016.md).  
   
 > [!IMPORTANT]  
diff --git a/docs/relational-databases/search/enable-semantic-search-on-tables-and-columns.md b/docs/relational-databases/search/enable-semantic-search-on-tables-and-columns.md
@@ -22,7 +22,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Enable Semantic Search on Tables and Columns
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
   Describes how to enable or disable statistical semantic indexing on selected columns that contain documents or text.  
   
  Statistical Semantic Search uses the indexes that are created by Full-Text Search, and creates additional indexes. As a result of this dependency on full-text search, you create a new semantic index when you define a new full-text index, or when you alter an existing full-text index. You can create a new semantic index by using [!INCLUDE[tsql](../../includes/tsql-md.md)] statements, or by using the Full-Text Indexing Wizard and other dialog boxes in [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)], as described in this topic.  
diff --git a/docs/relational-databases/search/find-key-phrases-in-documents-with-semantic-search.md b/docs/relational-databases/search/find-key-phrases-in-documents-with-semantic-search.md
@@ -22,7 +22,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Find Key Phrases in Documents with Semantic Search
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
   Describes how to find the key phrases in documents or text columns that are configured for statistical semantic indexing.  
 
 ##  <a name="howtofind"></a> Find the key phrases in documents with SEMANTICKEYPHRASETABLE  
diff --git a/docs/relational-databases/search/find-similar-and-related-documents-with-semantic-search.md b/docs/relational-databases/search/find-similar-and-related-documents-with-semantic-search.md
@@ -22,7 +22,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Find Similar and Related Documents with Semantic Search
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
   Describes how to find similar or related documents or text values, and information about how they are similar or related, in columns that are configured for statistical semantic indexing.  
    
 ##  <a name="HowToQuerySimilar"></a> Find similar or related documents with SEMANTICSIMILARITYTABLE  
diff --git a/docs/relational-databases/search/install-and-configure-semantic-search.md b/docs/relational-databases/search/install-and-configure-semantic-search.md
@@ -23,7 +23,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Install and Configure Semantic Search
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
   Describes the prerequisites for statistical semantic search and how to install or check them.  
   
 ## Install Semantic Search  
diff --git a/docs/relational-databases/search/manage-and-monitor-semantic-search.md b/docs/relational-databases/search/manage-and-monitor-semantic-search.md
@@ -23,7 +23,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Manage and Monitor Semantic Search
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
   Describes the process of semantic indexing and the tasks related to managing and monitoring the indexes.  
   
 ##  <a name="HowToMonitorStatus"></a> Check the status of semantic indexing  
diff --git a/docs/relational-databases/search/semantic-search-ddl-functions-stored-procedures-and-views.md b/docs/relational-databases/search/semantic-search-ddl-functions-stored-procedures-and-views.md
@@ -22,7 +22,7 @@ manager: "jhubbard"
 ms.workload: "Inactive"
 ---
 # Semantic Search DDL, Functions, Stored Procedures, and Views
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
   Lists the Transact-SQL statements and the database objects that support statistical semantic search in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].  
   
  For the list of statements and database objects that support full-text search, see [Full-Text Search DDL, Functions, Stored Procedures, and Views](../../relational-databases/search/full-text-search-ddl-functions-stored-procedures-and-views.md).  
diff --git a/docs/relational-databases/search/semantic-search-sql-server.md b/docs/relational-databases/search/semantic-search-sql-server.md
@@ -25,7 +25,7 @@ manager: "jhubbard"
 ms.workload: "On Demand"
 ---
 # Semantic Search (SQL Server)
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
 Statistical Semantic Search provides deep insight into unstructured documents stored in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] databases by extracting and indexing statistically relevant *key phrases*. Then it uses these key phrases to identify and index *documents that are similar or related*.  
   
 ##  <a name="whatcanido"></a> What can you do with Semantic Search?  
diff --git a/docs/relational-databases/security/contained-database-users-making-your-database-portable.md b/docs/relational-databases/security/contained-database-users-making-your-database-portable.md
@@ -23,7 +23,7 @@ manager: "craigg"
 ms.workload: "On Demand"
 ---
 # Contained Database Users - Making Your Database Portable
-[!INCLUDE[appliesto-ss-asdb-asdw-pdw-md](../../includes/appliesto-ss-asdb-asdw-pdw-md.md)]
+[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
 
   Use contained database users to authenticate [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] and [!INCLUDE[ssSDS](../../includes/sssds-md.md)] connections at the database level. A contained database is a database that is isolated from other databases and from the instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]/[!INCLUDE[ssSDS](../../includes/sssds-md.md)] (and the master database) that hosts the database. [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] supports contained database users for both Windows and [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] authentication. When using [!INCLUDE[ssSDS](../../includes/sssds-md.md)], combine contained database users with database level firewall rules. This topic reviews the differences and benefits of using the contained database model compared to traditional login/user model and Windows or server-level firewall rules. Specific scenarios, manageability or application business logic may still require use of traditional login/user model and server-level firewall rules.  
   
