Merge branch 'master' into sqlnew

jeannt · web-flow · commit 67de488c1818 · 2017-09-14T15:54:59.000-07:00
diff --git a/docs/breadcrumb/toc.yml b/docs/breadcrumb/toc.yml
@@ -567,7 +567,7 @@
         homepage: /sql/relational-databases/graphs/sql-graph-overview
       - name: Import and export
         href: /sql/relational-databases/import-export/
-        homepage: /sql/relational-databases/import-export/bulk-import-and-export-of-data-sql-server
+        homepage: /sql/relational-databases/import-export/overview-import-export
       - name: In-memory OLTP
         href: /sql/relational-databases/in-memory-oltp/
         homepage: /sql/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization
diff --git a/docs/integration-services/data-flow/cdc-flow-components.md b/docs/integration-services/data-flow/cdc-flow-components.md
@@ -37,41 +37,33 @@ manager: "jhubbard"
 ## Installation  
  This section describes the installation procedures for the CDC Components for Microsoft [!INCLUDE[ssISCurrent](../../includes/ssiscurrent-md.md)].  
   
- The CDC Components for SSIS are packaged with the Microsoft® Change Data Capture Designer and Service for Oracle by Attunity for Microsoft SQL Server® 2016. This download is part of the SQL Server 2016 Feature Pack. Download components of the Feature Pack from the [SQL Server 2016 Feature Pack web page](http://go.microsoft.com/fwlink/?LinkId=746297).  
+ The CDC Components for SSIS are packaged with the Microsoft® Change Data Capture Designer and Service for Oracle by Attunity for Microsoft SQL Server®. This download is part of the SQL Server Feature Pack. Download components of the Feature Pack from the [SQL Server 2016 Feature Pack web page](http://go.microsoft.com/fwlink/?LinkId=746297).  
   
-### Version Support  
- The following Microsoft [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] products are supported by the CDC components for SSIS:  
+### Version Support
+
+#### SQL Server version support
+
+The CDC components for SSIS are supported on all the supported versions of Microsoft SQL Server. Currently, the supported versions of SQL Server include SQL Server 2012 through SQL Server 2017.
+
+#### Operating system version support
   
--   Microsoft [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)]  
-  
--   Microsoft [!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)] for Visual Studio 2015  
-  
- These versions are supported on the following operating systems and platforms:  
-  
--   Windows Vista with Service Pack 2  
-  
--   Windows 7  
+The CDC components for SSIS are supported on the following operating systems and platforms:  
   
+-   Windows 8  and 8.1
 -   Windows 10  
-  
--   Windows Server 2008 with Service Pack 2  
-  
--   Windows Server 2008 R2  
-  
--   Windows Server 2012  
+-   Windows Server 2012 and 2012 R2
+-   Windows Server 2016
   
 ### Running the Installation Program  
  Before you run the installation wizard, be sure that the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)][!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)] is closed. Then follow the directions in the installation wizard.  
   
-### Restart SSIS  
- After you install the CDC components, you must restart the SSIS service to be sure that that the components work correctly when developing packages in the SQL [!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)].  
+### Restart SSIS Service 
+After you install the CDC components, you must restart the SSIS service to be sure that the components work correctly when developing packages in the SQL [!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)].  
   
- A message is displayed after you install the components. Click **Yes** when prompted.  
+A message is displayed after you install the components. Click **Yes** when prompted.  
   
 ### Uninstalling the Microsoft CDC Components  
- You uninstall the CDC source, CDC splitter, or CDC Control task, by using the uninstall wizard. Before you uninstall the components you must make sure of the following:  
-  
- If you are using the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)][!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)] for package development, make sure the [!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)] is closed before running the uninstall wizard.  
+ You uninstall the CDC source, CDC splitter, or CDC Control task, by using the uninstall wizard. If you are using the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)][!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)] for package development, make sure the [!INCLUDE[ssBIDevStudio](../../includes/ssbidevstudio-md.md)] is closed before running the uninstall wizard.  
   
 ## Benefits  
  The CDC Components for [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)][!INCLUDE[ssISnoversion](../../includes/ssisnoversion-md.md)] components allow SSIS developers to easily build SSIS packages that process change data. These components enhance the ability of SSIS developers to deal with CDC and reduce the complexity of CDC packages.  
@@ -81,7 +73,7 @@ manager: "jhubbard"
  The SSIS CDC components are designed to work with the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] CDC feature with change tables that are in the same [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] database.  
   
 ## Getting Started with the Change Data Capture Components  
- A typical CDC package processes changes to a group of tables. The basic control flow part of this type of CDC package is shown in the figure below. This package is called a trickle-feed processing package.  
+ A typical CDC package processes changes to a group of tables. The basic control flow part of this type of CDC package is shown in the following figure. This package is called a trickle-feed processing package.  
   
  ![Trickle Feed Processing Package Control Flow](../../integration-services/data-flow/media/tricklefeedprocessing.gif "Trickle Feed Processing Package Control Flow")  
   
@@ -95,9 +87,9 @@ manager: "jhubbard"
   
  The steps illustrated in this figure are:  
   
--   **Changes for Table X** is a CDC source that reads changes made to table X that where made in the CDC processing range determined in the parent control flow.  
+-   **Changes for Table X** is a CDC source that reads changes made to table X that were made in the CDC processing range determined in the parent control flow.  
   
--   **CDC Splitter X** is used to split the changes into inserts, deletes and updates. In this scenario it is assumed that the CDC Source is configured to produce Net changes so that different change types can be processed in parallel.  
+-   **CDC Splitter X** is used to split the changes into inserts, deletes, and updates. In this scenario, it is assumed that the CDC Source is configured to produce Net changes so that different change types can be processed in parallel.  
   
 -   The specific changes are then further processed downstream. In this illustration, the changes are inserted into tables using multiple ODBC Destinations but in actual cases the processing may be different.  
   
@@ -137,7 +129,7 @@ manager: "jhubbard"
   
  Passing the state of the CDC processing from the initial load package to the trickle feed package and between different tasks within each package occurs by means of a special SSIS package string variable. The value of this variable is referred to as the CDC State, which reflects the current state of CDC processing for the groups of tables being handled by the initial load and trickle-feed packages.  
   
- The value of the CDC State variable needs to be maintained in a persistent storage, it should be read before starting CDC processing and should be saved with the current state after processing completed. The task of loading and storing of the CDC state can be handled by the SSIS developer but the CDC Control component can automate this task by maintaining the CDC State value in a database table.  
+ The value of the CDC State variable needs to be maintained in persistent storage. It should be read before starting CDC processing and should be saved with the current state after processing completed. The task of loading and storing of the CDC state can be handled by the SSIS developer but the CDC Control component can automate this task by maintaining the CDC State value in a database table.  
   
 ## Security Considerations  
  This section lists some security considerations related to the use of the CDC components in SSIS.  
@@ -146,15 +138,15 @@ manager: "jhubbard"
  Trickle-feed update packages need access to [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] CDC functions. Such access is granted, by default, to members of the **db_owner** fixed database role. Because the **db_owner** is a powerful role, when defining capture instances within [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] it is recommended to associate a gating security role to each capture instance that allows the SSIS CDC package to use a much more restricted user for processing the changes.  
   
 ### Access to CDC Database Current LSN  
- The CDC Control task operations for marking the start LSN for change processing must be able to find the CDC Database current LSN. This is done using the procedure **sp_replincrementlsn** from the master database. Execute permission on this procedure must be given to the login used for connecting to the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] CDC database.  
+ The CDC Control task operations for marking the start LSN for change processing must be able to find the CDC Database current LSN. The components find the LSN by using the procedure **sp_replincrementlsn** from the master database. Execute permission on this procedure must be given to the login used for connecting to the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] CDC database.  
   
 ### Access to CDC States Table  
  The CDC States table is used for automatically persisting CDC States that need to be updatable by the login used for connecting to the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] CDC database. As this table is created by the SSIS developer, set the [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] system administrator as a user who is authorized to create [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] databases and perform administrative and maintenance tasks. In addition, a [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] system administrator who works with CDC enabled databases must be knowledgeable about [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)] CDC technology and implementation.  
   
 ## Grouping Tables for CDC Processing  
  Database projects range in size from several tables to many thousands of tables. When designing initial load and CDC packages, it is beneficial to group tables in much smaller groups for easier management and efficiency. This section lists various considerations that impact the sorting of tables into small groups, where the tables in each are initially loaded and then updated as a group.  
   
- The CDC patterns supported by the CDC components assume that this grouping is already determined. Each group defines a separate CDC context that is maintained separately from other groups. For each group, initial-load and a trickle-feed update packages are created. Trickle-feed updates are scheduled for periodic runs based on the rate of change processing constraints (for example, CPU and IO consumption, impact on other systems) and the desired latency.  
+ The CDC patterns supported by the CDC components assume that this grouping is already determined. Each group defines a separate CDC context that is maintained separately from other groups. For each group, initial-load and trickle-feed update packages are created. Trickle-feed updates are scheduled for periodic runs based on the rate of change processing constraints (for example, CPU and IO consumption, impact on other systems) and the desired latency.  
   
  Tables are grouped based on the following considerations:  
   
@@ -186,7 +178,7 @@ manager: "jhubbard"
 |6-TFREDO (Reprocessing-Trickle-Feed-Updates)|This is the state on a **GetProcessingRange** that occurs after TFSTART. This indicates that the previous run did not complete successfully.<br /><br /> If using the __$reprocessing column, it is set to 1 to indicate that the package may be reprocessing rows already at the target.|  
 |7-ERROR|The CDC group is in an ERROR state.|  
   
- The following is the state diagram for the CDC components. An ERROR state is reached when a state is reached that is not expected. The expected states are illustrated in the diagram below, however the diagram does not show the ERROR state.  
+ Here is the state diagram for the CDC components. An ERROR state is reached when a state is reached that is not expected. The expected states are illustrated in the following diagram. However the diagram does not show the ERROR state.  
   
  For example, at the end of an initial load package, when trying to set the state to ILEND, if the state is TFSTART then the CDC group is in an error state and the Trickle-Feed Update package does not run (the Initial Load package does run).  
   
diff --git a/docs/relational-databases/TOC.md b/docs/relational-databases/TOC.md
@@ -45,7 +45,7 @@
 # [Extended events](../relational-databases/extended-events/extended-events.md)
 # [Graphs](../relational-databases/graphs/sql-graph-overview.md)
 # [Hierarchical Data](hierarchical-data-sql-server.md)  
-# [Import and export](../relational-databases/import-export/bulk-import-and-export-of-data-sql-server.md)
+# [Import and export](../relational-databases/import-export/overview-import-export.md)
 # [In-memory OLTP](../relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization.md)
 # [Indexes](../relational-databases/indexes/indexes.md)
 # [JSON](../relational-databases/json/json-data-sql-server.md)
diff --git a/docs/sql-server/what-s-new-in-sql-server-2017.md b/docs/sql-server/what-s-new-in-sql-server-2017.md
@@ -111,11 +111,12 @@ SQL Server developers now have access to the extensive Python ML and AI librarie
 - **Package management** - T-SQL now supports the CREATE EXTERNAL LIBRARY statement, to give DBAs greater management over R packages. Use roles to control prviate or shared package access, store R packages in the database and share them among users.
 - **Performance improvements** - The stored procedure `sp_execute_external_script` has been optimized to support batch mode execution for columnstore data.
 
+
 For more information, see [What's new in SQL Server Machine Learning Services](~/advanced-analytics/what-s-new-in-sql-server-machine-learning-services.md).
 
 ## Next steps
 - See the [SQL Server 2017 Release Notes](sql-server-2017-release-notes.md).
 - Find out [What's new for SQL Server 2017 on Linux](https://docs.microsoft.com/sql/linux/sql-server-linux-whats-new).
 - Find out [What's new in SQL Server 2016](what-s-new-in-sql-server-2016.md).
 
-[!INCLUDE[get-help-options](../includes/paragraph-content/get-help-options.md)]
+[!INCLUDE[get-help-options](../includes/paragraph-content/get-help-options.md)]
diff --git a/docs/t-sql/data-types/data-types-transact-sql.md b/docs/t-sql/data-types/data-types-transact-sql.md
@@ -1,7 +1,7 @@
 ---
 title: "Data types (Transact-SQL) | Microsoft Docs"
 ms.custom: ""
-ms.date: "07/23/2017"
+ms.date: "09/13/2017"
 ms.prod: "sql-non-specified"
 ms.reviewer: ""
 ms.suite: ""
@@ -104,7 +104,8 @@ In [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], based on their sto
 |[cursor](../../t-sql/data-types/cursor-transact-sql.md)|[timestamp](../../t-sql/data-types/rowversion-transact-sql.md)|  
 |[hierarchyid](../../t-sql/data-types/hierarchyid-data-type-method-reference.md)|[uniqueidentifier](../../t-sql/data-types/uniqueidentifier-transact-sql.md)|  
 |[sql_variant](../../t-sql/data-types/sql-variant-transact-sql.md)|[xml](../../t-sql/xml/xml-transact-sql.md)|  
-|[table](../../t-sql/data-types/table-transact-sql.md)|[Spatial Types](http://msdn.microsoft.com/library/d1715574-34b1-4ce5-a29f-25e35027a54c)|  
+|[Spatial Geometry Types](../../t-sql/spatial-geometry/spatial-types-geometry-transact-sql.md) |[Spatial Geography Types](../../t-sql/spatial-geography/spatial-types-geography.md)|  
+|[table](../../t-sql/data-types/table-transact-sql.md) | |
   
 ## See also
 [CREATE PROCEDURE &#40;Transact-SQL&#41;](../../t-sql/statements/create-procedure-transact-sql.md)  
diff --git a/docs/t-sql/language-elements/rollback-transaction-transact-sql.md b/docs/t-sql/language-elements/rollback-transaction-transact-sql.md
diff --git a/docs/t-sql/statements/backup-transact-sql.md b/docs/t-sql/statements/backup-transact-sql.md
