Merge pull request #7239 from MikeRayMSFT/release-sqlseattle

Resolving merge conflict.

Author: MikeRayMSFT

.openpublishing.redirection.json

@@ -95,11 +95,6 @@
             "redirect_url": "/sql/advanced-analytics/r/set-up-a-data-science-client",
             "redirect_document_id": false
         },
-        {
-            "source_path": "docs/advanced-analytics/python/index.md",
-            "redirect_url": "/sql/advanced-analytics/what-is-sql-server-machine-learning",
-            "redirect_document_id": false
-        },
         {
             "source_path": "docs/advanced-analytics/r/index.md",
             "redirect_url": "/sql/advanced-analytics/what-is-sql-server-machine-learning",

docs/advanced-analytics/python/index.md

@@ -0,0 +1,3 @@
+--- 
+redirect_url: /sql/advanced-analytics/python/dmvs-for-python
+--- 

docs/advanced-analytics/python/toc.yml

@@ -0,0 +1,13 @@
+- name: Python and SQL analytics
+  expanded: true
+  items:
+  - name: Dynamic Management Views (DMVs) for Python
+    href: dmvs-for-python.md
+  - name: Extended events for Python in SQL Server Machine Learning
+    href: extended-events-for-python.md
+  - name: How to create a resource pool for Python
+    href: how-to-create-a-resource-pool-for-python.md
+  - name: Python API reference for SQL Server Machine Learning Services
+    href: machine-learning-services-python-reference.md
+  - name: Resource governance for Python
+    href: resource-governance-for-python.md

docs/advanced-analytics/r/use-revoscaler-to-manage-r-packages.md

@@ -24,7 +24,7 @@ The following table describes the functions used for R package installation and
 |----------|-------------|
 | [rxSqlLibPaths](https://docs.microsoft.com/machine-learning-server/r-reference/revoscaler/rxsqllibpaths) | Determine the path of the instance library on the remote SQL Server. |
 | [rxFindPackage](https://docs.microsoft.com/machine-learning-server/r-reference/revoscaler/rxfindpackage) | Gets the path for one or more packages on the remote SQL Server. |
-| [rxInstallPackages](https://docs.microsoft.com/en-us/machine-learning-server/r-reference/revoscaler/rxinstallpackages) | Call this function from a remote R client to install packages in a SQL Server compute context, either from a specified repository, or by reading locally saved zipped packages. This function checks for dependencies and ensures that any related packages can be installed to SQL Server, just like R package installation in the local compute context. To use this option, you must have enabled package management on the server and database. Both client and server environments must have the same version of RevoScaleR. |
+| [rxInstallPackages](https://docs.microsoft.com/machine-learning-server/r-reference/revoscaler/rxinstallpackages) | Call this function from a remote R client to install packages in a SQL Server compute context, either from a specified repository, or by reading locally saved zipped packages. This function checks for dependencies and ensures that any related packages can be installed to SQL Server, just like R package installation in the local compute context. To use this option, you must have enabled package management on the server and database. Both client and server environments must have the same version of RevoScaleR. |
 | [rxInstalledPackages](https://docs.microsoft.com/machine-learning-server/r-reference/revoscaler/rxinstalledpackages) | Gets a list of packages installed in the specified compute context. |
 | [rxSyncPackages](https://docs.microsoft.com/machine-learning-server/r-reference/revoscaler/rxsyncpackages) | Copy information about a package library between the file system and database, for the specified compute context. |
 | [rxRemovePackages](https://docs.microsoft.com/machine-learning-server/r-reference/revoscaler/rxremovepackages) | Removes packages from a specified compute context. It also computes dependencies and ensures that packages that are no longer used by other packages on SQL Server are removed, to free up resources. |

docs/advanced-analytics/r/use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md

@@ -15,7 +15,7 @@ manager: cgronlun
 
 R and Python integration in SQL Server includes open-source and Microsoft-proprietary packages. Under standard SQL Server servicing, R and Python packages are updated according to the SQL Server release cycle, with bug fixes to existing packages at the current version. 
 
-Most data scientists are accustomed to working with newer packages as they become available. For both SQL Server 2017 Machine Learning Services (In-Database) and SQL Server 2016 R Services (In-Database), you can get newer versions of R and Python by changing the *binding* from SQL Server servicing to [Microsoft Machine Learning Server](https://docs.microsoft.com/en-us/machine-learning-server/index) and the [Modern Lifecycle Support policy](https://support.microsoft.com/help/30881/modern-lifecycle-policy).
+Most data scientists are accustomed to working with newer packages as they become available. For both SQL Server 2017 Machine Learning Services (In-Database) and SQL Server 2016 R Services (In-Database), you can get newer versions of R and Python by changing the *binding* from SQL Server servicing to [Microsoft Machine Learning Server](https://docs.microsoft.com/machine-learning-server/index) and the [Modern Lifecycle Support policy](https://support.microsoft.com/help/30881/modern-lifecycle-policy).
 
 Binding does not change the fundamentals of your installation: R and Python integration is still part of a database engine instance, licensing is unchanged (no additional costs associated with binding), and SQL Server support policies still hold for the database engine. But rebinding does change how R and Python packages are serviced. The rest of this article explains the binding mechanism and how it works for each version of SQL Server.
 

docs/advanced-analytics/toc.yml

@@ -153,7 +153,7 @@
         href: tutorials/sqldev-py5-train-and-save-a-model-using-t-sql.md
       - name: Operationalize the model
         href: tutorials/sqldev-py6-operationalize-the-model.md
-- name: Samples
+- name: Samples (stored on GitHub.com)
   href: https://github.com/Microsoft/sql-server-samples
 - name: Solutions
   href: tutorials/data-science-scenarios-and-solution-templates.md
@@ -163,9 +163,17 @@
     href: concepts/extensibility-framework.md
   - name: R extension
     href: concepts/extension-r.md
+    items:
+    - name: Creating BI Workflows with R
+      href: r/creating-workflows-that-use-r-in-sql-server.md
+    - name: Operationalize R code (Machine Learning Services)
+      href: r/operationalizing-your-r-code.md
   - name: Python extension
     href: concepts/extension-python.md
-- name: How-to guides
+    items:
+    - name: Dynamic Management Views (DMVs) for Python +
+      href: python/dmvs-for-python.md
+- name: How To
   href: r/sql-server-machine-learning-tasks.md
   items:
   - name: Package management

docs/advanced-analytics/tutorials/deepdive-data-science-deep-dive-using-the-revoscaler-packages.md

@@ -55,7 +55,7 @@ You should also be comfortable with [!INCLUDE[tsql](../../includes/tsql-md.md)]
 
     To switch back and forth between local and remote compute contexts, you need two systems. Local is typically a development workstation with sufficent power for data science workloads. Remote in this case is SQL Server 2017 or SQL Server 2016 with the R feature enabled. 
 
-    Switching compute contexts is predicated on having the same-version RevoScaleR on both local and remote systems. On a local workstation, you can get the RevoScaleR packages and related providers by installing or using any one of the following: [Data Science VM on Azure](https://docs.microsoft.com/azure/machine-learning/data-science-virtual-machine/overview), [Microsoft R Client (free)](https://docs.microsoft.com/en-us/machine-learning-server/r-client/what-is-microsoft-r-client), or [Microsoft Machine Learning Server (Standalone)](https://docs.microsoft.com/machine-learning-server/install/machine-learning-server-install). For the standalone server option, install the free developer edition, using either Linux or Windows installers. You can also use SQL Server Setup to install a standalone server.
+    Switching compute contexts is predicated on having the same-version RevoScaleR on both local and remote systems. On a local workstation, you can get the RevoScaleR packages and related providers by installing or using any one of the following: [Data Science VM on Azure](https://docs.microsoft.com/azure/machine-learning/data-science-virtual-machine/overview), [Microsoft R Client (free)](https://docs.microsoft.com/machine-learning-server/r-client/what-is-microsoft-r-client), or [Microsoft Machine Learning Server (Standalone)](https://docs.microsoft.com/machine-learning-server/install/machine-learning-server-install). For the standalone server option, install the free developer edition, using either Linux or Windows installers. You can also use SQL Server Setup to install a standalone server.
 
 -   **Additional R Packages**
 

docs/analysis-services/instances/connection-string-properties-analysis-services.md

@@ -31,7 +31,7 @@ manager: kfile
 |--------------|-----------------|-------------|  
 |**Data Source** or **DataSource**|Specifies the server instance. This property is required for all connections. Valid values include the network name or IP address of the server, local or localhost for local connections, a URL if the server is configured for HTTP or HTTPS access, or the name of a local cube (.cub) file. <br /><br /> Valid value for Azure Analysis Services, `<protocol>://<region>/<servername>` where protocol is string asazure, region is the Uri where the server was created (for example, westus.asazure.windows.net) and servername is the name of your unique server within the region. |`Data source=asazure://westus.asazure.windows.net/myasserver`<br /><br />`Data source=AW-SRV01` for the default instance and port (TCP 2383).<br /><br /> `Data source=AW-SRV01$Finance:8081` for a named instance ($Finance) and fixed port.<br /><br /> `Data source=AW-SRV01.corp.Adventure-Works.com` for a fully qualified domain name, assuming the default instance and port.<br /><br /> `Data source=172.16.254.1` for an IP address of the server, bypassing DNS server lookup, useful for troubleshooting connection problems.|  
 |**Initial Catalog** or **Catalog**|Specifies the name of the Analysis Services database to connect to. The database must be deployed on Analysis Services, and you must have permission to connect to it. This property is optional for AMO connections, but required for ADOMD.NET.|`Initial catalog=AdventureWorks2016`|  
-|**Provider**|Valid values include MSOLAP.\<version>, where \<version> is either 4, 5, 6 or 7.<br /><br /> -   MSOLAP.4 released in SQL Server 2008 and again SQL Server 2008 R2 (filename is msolap100.dll for SQL Server 2008 and 2008 R2)<br />-   MSOLAP.5 released in SQL Server 2012 (filename is msolap110.dll)<br />-   MSOLAP.6 released in SQL Server 2014 (filename is msolap1200.dll)<br />-   MSOLAP.7 released in SQL Server 2016 (filename is msolap130.dll)<br /><br /> This property is optional. By default, the client libraries read the current version of the OLE DB provider from the registry. You only need to set this property if you require a specific version of the data provider, for example to connect to a SQL Server 2012 instance.<br /><br /> MSOLAP.4 was released in both SQL Server 2008 and SQL Server 2008 R2. The 2008 R2 version supports [!INCLUDE[ssGemini](../../includes/ssgemini-md.md)] workbooks and sometimes needs to be installed manually on SharePoint servers. To distinguish between these versions, you must check the build number in the file properties of the provider: Go to Program files\Microsoft Analysis Services\AS OLEDB\10. Right-click msolap110.dll and select **Properties**. Click **Details**. View the file version information. The version should include 10.50.\<buildnumber> for SQL Server 2008 R2. For more information, see [Install the Analysis Services OLE DB Provider on SharePoint Servers](http://msdn.microsoft.com/en-us/2c62daf9-1f2d-4508-a497-af62360ee859) and [Data providers used for Analysis Services connections](../../analysis-services/instances/data-providers-used-for-analysis-services-connections.md).|`Provider=MSOLAP.7` is used for connections that require the SQL Server 2016 version of the OLE DB provider for Analysis Services.|  
+|**Provider**|Valid values include MSOLAP.\<version>, where \<version> is either 4, 5, 6 or 7.<br /><br /> -   MSOLAP.4 released in SQL Server 2008 and again SQL Server 2008 R2 (filename is msolap100.dll for SQL Server 2008 and 2008 R2)<br />-   MSOLAP.5 released in SQL Server 2012 (filename is msolap110.dll)<br />-   MSOLAP.6 released in SQL Server 2014 (filename is msolap1200.dll)<br />-   MSOLAP.7 released in SQL Server 2016 (filename is msolap130.dll)<br /><br /> This property is optional. By default, the client libraries read the current version of the OLE DB provider from the registry. You only need to set this property if you require a specific version of the data provider, for example to connect to a SQL Server 2012 instance.<br /><br /> MSOLAP.4 was released in both SQL Server 2008 and SQL Server 2008 R2. The 2008 R2 version supports [!INCLUDE[ssGemini](../../includes/ssgemini-md.md)] workbooks and sometimes needs to be installed manually on SharePoint servers. To distinguish between these versions, you must check the build number in the file properties of the provider: Go to Program files\Microsoft Analysis Services\AS OLEDB\10. Right-click msolap110.dll and select **Properties**. Click **Details**. View the file version information. The version should include 10.50.\<buildnumber> for SQL Server 2008 R2. For more information, see [Install the Analysis Services OLE DB Provider on SharePoint Servers](http://msdn.microsoft.com/2c62daf9-1f2d-4508-a497-af62360ee859) and [Data providers used for Analysis Services connections](../../analysis-services/instances/data-providers-used-for-analysis-services-connections.md).|`Provider=MSOLAP.7` is used for connections that require the SQL Server 2016 version of the OLE DB provider for Analysis Services.|  
 |**Cube**|Cube name or perspective name. A database can contain multiple cubes and perspectives. When multiple targets are possible, include the cube or perspective name on the connection string.|`Cube=SalesPerspective` shows that you can use the Cube connection string property to specify either the name of a cube or the name of a perspective.|  
 
 ##  <a name="bkmk_auth"></a> Authentication and Security  

docs/analysis-services/multidimensional-models/toc.yml

@@ -37,6 +37,8 @@
       href: set-data-source-properties-ssas-multidimensional.md
     - name: Set Impersonation Options for a Data Source Connection
       href: set-impersonation-options-ssas-multidimensional.md
+    - name: Multidimensional Model Programming
+      href: multidimensional-model-programming.md
   - name: Data Source Views
     href: data-source-views-in-multidimensional-models.md
     items:

docs/analysis-services/toc.yml

@@ -9,9 +9,11 @@
   - name: Tools and applications
     href: tools-and-applications-used-in-analysis-services.md
   - name: Client libraries (data providers)
-    href: ../analysis-services/instances/data-providers-used-for-analysis-services-connections.md
+    href: instances/data-providers-used-for-analysis-services-connections.md
   - name: Comparing Tabular and Multidimensional solutions
     href: comparing-tabular-and-multidimensional-solutions-ssas.md
+  - name: Analysis Services Features and Tasks
+    href: analysis-services-features-and-tasks.md
   - name: Analysis Services features supported by SQL Server editions
     href: analysis-services-features-supported-by-the-editions-of-sql-server-2016.md
   - name: Backward compatibility (SQL Server 2016 Analysis Services)
@@ -215,12 +217,16 @@
     href: ../analysis-services/data-mining/data-mining-ssas.md
   - name: Power Pivot for Sharepoint
     href: ../analysis-services/power-pivot-sharepoint/power-pivot-for-sharepoint-ssas.md
+  - name: Monitor an Analysis Services Instance
+    href: instances/monitor-an-analysis-services-instance.md
   - name: Manage servers
     href: ../analysis-services/instances/analysis-services-instance-management.md
   - name: Trace-events
     href: ../analysis-services/trace-events/analysis-services-trace-events.md
 - name: Developer
   items:
+  - name: Analysis Services Developer Documentation
+    href: analysis-services-developer-documentation.md
   - name: Tabular Model Programming for Compatibility Level 1200 and higher
     href: ./tabular-model-programming-compatibility-level-1200/tabular-model-programming-for-compatibility-level-1200.md
     items:
@@ -248,6 +254,11 @@
     href: ../analysis-services/schema-rowsets/analysis-services-schema-rowsets.md
   - name: Analysis Services Scripting Language (ASSL for XMLA)
     href: scripting/analysis-services-scripting-language-assl-for-xmla.md
+  - name: Data Mining Programming
+    href: data-mining-programming.md
+    items:
+    - name: Data Mining Programming - OLE DB
+      href: data-mining-programming-ole-db.md
 - name: Samples
   items:
   - name: Analysis Services samples