Bringing even with master.

v-alje · v-alje · commit b4ff73ccd781 · 2018-05-11T11:37:27.000-07:00
diff --git a/docs/advanced-analytics/python/install-additional-python-packages-on-sql-server.md b/docs/advanced-analytics/python/install-additional-python-packages-on-sql-server.md
@@ -120,13 +120,13 @@ import cntk as cntk
 cntk._version_
 ```
 
-##  How to view installed packages using conda
+## List installed packages using conda
 
 There are different ways that you can get a list of installed packages. For example, you can view the installed packages in the **Python Environments** windows of Visual Studio.
 
-If you are using the Python command line, you can use the **conda** package manager, which is included with the Anaconda Python environment added by SQL Server setup.
+If you are using the Python command line, you can use either **Pip** or the **conda** package manager, included with the Anaconda Python environment added by SQL Server setup.
 
-Assuming you added the Scripts folder to the PATH environment variable, run this command from an administrator's command prompt to list the packages in your Python environment.
+Assuming you added the Scripts folder to the PATH environment variable, run this command from an administrator's command prompt to list the packages in your Python environment. Otherwise, see [Get R and Python package information](../r/determine-which-packages-are-installed-on-sql-server.md#pip-conda) for pointers on how to run the Python tools in SQL Server.
 
 ```python
 conda list
diff --git a/docs/advanced-analytics/r/determine-which-packages-are-installed-on-sql-server.md b/docs/advanced-analytics/r/determine-which-packages-are-installed-on-sql-server.md
@@ -11,7 +11,7 @@ author: HeidiSteen
 ms.author: heidist
 manager: cgronlun
 ---
-#  Get R and Python package information on SQL Server Machine Learning
+#  Get R and Python package information on SQL Server
 [!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md-winonly](../../includes/appliesto-ss-xxxx-xxxx-xxx-md-winonly.md)]
 
 Sometimes when you are working with multiple environments or installations of R or Python, you need to verify that the code you are running is using the expected environment for Python, or the correct workspace for R. For example, if you have upgraded the machine learning components using binding, the path to the R library might be in a different folder than the default. Also, if you install R Client or an instance of the Standalone server, you might have multiple R libraries on your computer.
@@ -80,7 +80,7 @@ C:\Program Files\Microsoft SQL Server\MSSQL14.MSSQLSERVER\PYTHON_SERVICES\lib\si
 
 For more information about the variable `sys.path` and how it is used to set the interpreter’s search path for modules, see the [Python documentation](https://docs.python.org/2/tutorial/modules.html#the-module-search-path)
 
-## Generate a package list
+## List all packages
 
 There are multiple ways that you can get a complete list of the packages currently installed. One advantage of running package list commands from sp_execute_external_script is that you are guaranteed to get packages installed in the instance library.
 
@@ -123,7 +123,7 @@ WITH RESULT SETS (( PackageVersion nvarchar (150) ))
 
 When running `pip` from the command line, there are many other useful functions: `pip list` gets all packages that are installed, whereas `pip freeze` lists the packages installed by `pip`, and doesn't list packages that pip itself depends on. You can also use `pip freeze` to generate a dependency file.
 
-## Check whether a package is installed with an instance
+## Find a single package
 
 If you have installed a package and want to make sure that it is available to a particular SQL Server instance, you can execute the following stored procedure call to load the package and return only messages.
 
@@ -207,11 +207,7 @@ Type a module name at the help prompt to get the package contents, version, and
 
 Anaconda includes Python tools for managing packages. On a default instance, Pip, Conda, and other tools can be found at \Program Files\Microsoft SQL Server\MSSQL14.MSSQLSERVER\PYTHON_SERVICES\Scripts.
 
-SQL Server Setup does not add Pip or Conda to the system path and on a production SQL Server instance, keeping non-essential executables out of the path is a best practice. However, for development and test environments, you could add Conda to the system:
-
-    C:\Program Files\Microsoft SQL Server\MSSQL14.MSSQLSERVER\PYTHON_SERVICES\Scripts
-
-Alternatively, you can run commands from the Scripts folder to get package information:
+SQL Server Setup does not add Pip or Conda to the system path and on a production SQL Server instance, keeping non-essential executables out of the path is a best practice. However, for development and test environments, you could add the Scripts folder to the system PATH environment variable to run both Pip and Conda on command from any location.
 
 1. Go to C:\Program Files\Microsoft SQL Server\MSSQL14.MSSQLSERVER\PYTHON_SERVICES\Scripts
 
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
@@ -304,9 +304,9 @@ If you find folders with a name like this, you can remove it after installation
 
 <a name="sqlbinder-error-codes"><a/>
 
-### Errors
+## Binding errors
 
-The tool returns the following error messages:
+MLS Installer and SqlBindR both return the following error codes and messages.
 
 |Error code  | Message           | Details               |
 |------------|-------------------|-----------------------|
@@ -316,7 +316,7 @@ The tool returns the following error messages:
 |Bind error 3 | Invalid instance | An instance exists, but is not valid for binding. |
 |Bind error 4 | Not bindable | |
 |Bind error 5 | Already bound | You ran the *bind* command, but the specified instance is already bound. |
-|Bind error 6 | Bind failed | An error occurred while unbinding the instance. This error can occur if you run the MLS installer without selecting any features.|
+|Bind error 6 | Bind failed | An error occurred while unbinding the instance. This error can occur if you run the MLS installer without selecting any features. Binding requires that you select both an MSSQL instance and R and Python, assuming the instance is SQL Server 2017.|
 |Bind error 7 | Not bound | The database engine instance has R Services or SQL Server Machine Learning Services. The instance is not bound to Microsoft Machine Learning Server. |
 |Bind error 8 | Unbind failed | An error occurred while unbinding the instance. |
 |Bind error 9 | No instances found | No database engine instances were found on this computer. |
diff --git a/docs/docfx.json b/docs/docfx.json
@@ -29,6 +29,7 @@
           "breadcrumb/toc.yml"
         ],
         "exclude": [
+          "2014",
           "**/includes/**",
           "**/mref/**",
           "**/obj/**",
@@ -62,6 +63,7 @@
           "**/*.jpg"
         ],
         "exclude": [
+          "2014",
           "**/obj/**"
         ]
       }
diff --git a/docs/relational-databases/replication/administration/frequently-asked-questions-for-replication-administrators.md b/docs/relational-databases/replication/administration/frequently-asked-questions-for-replication-administrators.md
@@ -159,7 +159,7 @@ manager: craigg
 ## Database Maintenance  
   
 ### Why can't I run TRUNCATE TABLE on a published table?  
- TRUNCATE TABLE is a non-logged operation that does not fire triggers. It is not permitted because replication cannot track the changes caused by the operation: transactional replication tracks changes through the transaction log; merge replication tracks changes through triggers on published tables.  
+ TRUNCATE TABLE is a DDL statement that does not log individual row deletions and does not fire DML triggers. It is not permitted because replication cannot track the changes caused by the operation: transactional replication tracks changes through the transaction log; merge replication tracks changes through DML triggers on published tables.  
   
 ### What is the effect of running a bulk insert command on a replicated database?  
  For transactional replication, bulk inserts are tracked and replicated like other inserts. For merge replication, you must ensure that change tracking metadata is updated properly.  
diff --git a/docs/t-sql/statements/alter-database-transact-sql-compatibility-level.md b/docs/t-sql/statements/alter-database-transact-sql-compatibility-level.md
@@ -103,17 +103,16 @@ To view the current compatibility level of a database, query the **compatibility
 
 ## Compatibility Levels and SQL Server Upgrades  
 Database compatibility level is a valuable tool to assist in database modernization, by allowing the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] to be upgraded, while keeping connecting applications functional status by maintaining the same pre-upgrade database compatibility level. 
-As long as the application does not need to leverage enhancements that are only available in a higher database compatibility level, it is a valid approach to upgrade the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] and maintain the previous database compatibility level.
-For more information on using compatibility level for backward compatibility, see the [Using Compatibility Level for Backward Compatibility](#using-compatibility-level-for-backward-compatibility) later in this article.  
-For more details on upgrading the database compatibility level, see the [Best Practices for upgrading Database Compatibility Level](#best-practices-for-upgrading-database-compatibility-level) later in the article.     
-For more information about differences between compatibility levels, see the appropriate sections later in this article. 
+As long as the application does not need to leverage enhancements that are only available in a higher database compatibility level, it is a valid approach to upgrade the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] and maintain the previous database compatibility level. For more information on using compatibility level for backward compatibility, see the [Using Compatibility Level for Backward Compatibility](#using-compatibility-level-for-backward-compatibility) later in this article.    
+
+For new development work, or when an existing application requires use of new features, as well as performance improvements done in the query optimizer space, plan to upgrade the database compatibility level to the latest available in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], and certify your application to work with that compatibility level. For more details on upgrading the database compatibility level, see the [Best Practices for upgrading Database Compatibility Level](#best-practices-for-upgrading-database-compatibility-level) later in the article.     
 
 > [!TIP] 
 > If an application was tested and certified on a given [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] version, then it was implicitly tested and certified on that [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] version native database compatibility level.
 > 
 > So, database compatibility level provides an easy certification path for an existing application, when using the database compatibility level corresponding to the tested [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] version.
-> 
-> For an existing application to leverage an enhancement only available in a higher database compatibility level, or for new development work, plan to use the latest database compatibility level available in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], and certify your application to work with that compatibility level.
+>
+> For more information about differences between compatibility levels, see the appropriate sections later in this article. 
 
 To upgrade the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] to the latest version, while maintaining the database compatibility level that existed before the upgrade and its supportability status, it is recommended to perform static functional surface area validation of the application code in the database, by using the [Microsoft Data Migration Assistant](http://www.microsoft.com/download/details.aspx?id=53595) tool (DMA). The absence of errors in the DMA tool output, about missing or incompatible functionality, protects application from any functional regressions on the new target version. For more information on the DMA tool, see [here](http://blogs.msdn.microsoft.com/datamigration/dma).
 
@@ -132,12 +131,10 @@ To upgrade the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] to
 
 ## Using Compatibility Level for Backward Compatibility  
 The *database compatibility level* setting affects behaviors only for the specified database, not for the entire server. Database compatibility level provides only partial backward compatibility with earlier versions of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].   
-Starting with compatibility mode 130, any new query plan affecting features have been intentionaly added only to the new compatibility level. This has been done in order to minimize the risk during upgrades that arise from performance degradation due to query plan changes.   
+Starting with compatibility mode 130, any new query plan affecting features have been intentionally added only to the new compatibility level. This has been done in order to minimize the risk during upgrades that arise from performance degradation due to query plan changes.   
 From an application perspective, the goal should still be to upgrade to the latest compatibility level at some point in time, in order to inherit some of the new features, as well as performance improvements done in the query optimizer space, but to do so in a controlled way. Use the lower compatibility level as a safer migration aid to work around version differences, in the behaviors that are controlled by the relevant compatibility level setting. 
 For more details, including the recommended workflow for upgrading database compatibility level, see the [Best Practices for upgrading Database Compatibility Level](#best-practices-for-upgrading-database-compatibility-evel) later in the article.  
   
-If existing [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] applications are affected by behavioral differences in your version of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], convert the application to work seamlessly with the new compatibility mode. Then use `ALTER DATABASE` to change the compatibility level to 130. The new compatibility setting for a database takes effect when a `USE <database>` is issued or a new login is processed with that database as the default database.  
- 
 > [!IMPORTANT]
 > Discontinued functionality introduced in a given [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] version is not protected by compatibility level. This refers to fucntionality that was removed from the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)].
 > 
