Resolve conflict.

Author: TimShererWithAquent

.openpublishing.redirection.json

@@ -1380,6 +1380,21 @@
       "redirect_url": "/sql/machine-learning/what-s-new-in-sql-server-machine-learning-services",
       "redirect_document_id": true
     },
+    {
+      "source_path": "docs/machine-learning/tutorials/sql-server-python-tutorials.md",
+      "redirect_url": "/sql/machine-learning/tutorials/python-tutorials",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/machine-learning/tutorials/sql-server-r-tutorials.md",
+      "redirect_url": "/sql/machine-learning/tutorials/r-tutorials",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/machine-learning/what-is-sql-server-machine-learning.md",
+      "redirect_url": "/sql/machine-learning/sql-server-machine-learning-services",
+      "redirect_document_id": true
+    },
     {
       "source_path": "docs/linux/sql-server-linux-develop-use-ssms.md",
       "redirect_url": "/sql/linux/sql-server-linux-manage-ssms",

docs/2014/analysis-services/dev-guide/toc.yml

@@ -105,45 +105,45 @@
     - name: Client Architecture Requirements
       href: ../multidimensional-models/olap-physical/client-architecture-requirements-for-analysis-services-development.md
   - name: Developing with ADOMD.NET
-    href: https://docs.microsoft.com/bi-reference/adomd/developing-with-adomd-net
+    href: https://docs.microsoft.com/analysis-services/adomd/developing-with-adomd-net
   - name: ADOMD.NET Client Programming
     href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/adomd-net-client-programming
     items:
     - name: ADOMD.NET Client Functionality
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/adomd-net-client-functionality
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/adomd-net-client-functionality
     - name: Migrating From ADO MD To ADOMD.NET
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/migrating-from-ado-md-to-adomd-net
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/migrating-from-ado-md-to-adomd-net
     - name: Establishing Connections in ADOMD.NET
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net
     - name: Establishing Secure Connections in ADOMD.NET
       href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-establishing-secure-connections
     - name: Working with Connections and Sessions in ADOMD.NET
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-working-with-connections-and-sessions
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-working-with-connections-and-sessions
     - name: Performing Transactions in ADOMD.NET
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-performing-transactions
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-performing-transactions
     - name: Retrieving Metadata from an Analytical Data Source
       href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-from-an-analytical-data-source
     - name: Working with the ADOMD.NET Object Model
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-adomd-net-object-model
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-adomd-net-object-model
     - name: Working with Schema Rowsets in ADOMD.NET
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-schema-rowsets
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-schema-rowsets
     - name: Executing Commands Against an Analytical Data Source
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/executing-commands-against-an-analytical-data-source
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/executing-commands-against-an-analytical-data-source
     - name: Retrieving Data from an Analytical Data Source
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-from-an-analytical-data-source
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-from-an-analytical-data-source
     - name: Retrieving Data Using the CellSet
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-cellset
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-cellset
     - name: Retrieving Data Using the AdomdDataReader
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-adomddatareader
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-adomddatareader
     - name: Retrieving Data Using the XmlReader
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-xmlreader
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-xmlreader
   - name: ADOMD.NET Server Programming
-    href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-programming
+    href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/adomd-net-server-programming
     items:
     - name: ADOMD.NET Server Functionality
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-functionality
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/adomd-net-server-functionality
     - name: ADOMD.NET Server Object Architecture
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-object-architecture
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/adomd-net-server-object-architecture
     - name: User Defined Functions and Stored Procedures
       href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/user-defined-functions-and-stored-procedures
   - name: Redistributing ADOMD.NET

docs/2014/analysis-services/instances/install-windows/install-analysis-services-in-power-pivot-mode.md

@@ -64,7 +64,7 @@ manager: craigg
 ###  <a name="bkmk_sqleditions"></a> SQL Server Edition Requirements  
  Business intelligence features are not all available in all editions of [!INCLUDE[ssCurrent](../../../includes/sscurrent-md.md)]. For details, see [Features Supported by the Editions of SQL Server 2012 (https://go.microsoft.com/fwlink/?linkid=232473)](https://go.microsoft.com/fwlink/?linkid=232473) and [Editions and Components of SQL Server 2014](../../../sql-server/editions-and-components-of-sql-server-2016.md).  
 
- The current release notes can be found at [SQL Server 2012 SP1 Release Notes](ttp://go.microsoft.com/fwlink/?LinkID=248389) (https://go.microsoft.com/fwlink/?LinkID=248389).  
+ The current release notes can be found at [SQL Server 2012 SP1 Release Notes](https://go.microsoft.com/fwlink/?LinkID=248389) (https://go.microsoft.com/fwlink/?LinkID=248389).  
 
  [Microsoft SQL Server 2012 Release Notes (https://go.microsoft.com/fwlink/?LinkId=236893)](https://go.microsoft.com/fwlink/?LinkId=236893).  
 

docs/2014/analysis-services/instances/install-windows/install-or-uninstall-the-power-pivot-for-sharepoint-add-in-sharepoint-2013.md

@@ -161,7 +161,7 @@ Msiexec /i spPowerPivot.msi AGREETOLICENSE="yes" ADDLOCAL=" SQL_OLAPDM,SQL_ADOMD
 
  From the Windows Start screen type "power" and in the Apps search results, click **PowerPivot for SharePoint 2013 Configuration**. Note that the search results may include two links because [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] setup installs separate [!INCLUDE[ssGemini](../../../includes/ssgemini-md.md)] configuration tools for SharePoint 2010 and SharePoint 2013. Make sure you start the [!INCLUDE[ssGemini](../../../includes/ssgemini-md.md)] for SharePoint 2013 Configuration tool.
 
- ![two powerpivot configuration tools](https://docs.microsoft.com/analysis-services/analysis-services/media/as-powerpivot-configtools-bothicons.gif "two powerpivot configuration tools")
+ ![two powerpivot configuration tools](../../media/as-powerpivot-configtools-bothicons.gif "two powerpivot configuration tools")
 
  **Or**
 

docs/2014/analysis-services/multidimensional-models-adomd-net-server/adomd-net-server-object-architecture.md

@@ -20,7 +20,7 @@ manager: craigg
 > [!NOTE]  
 >  To use the `Microsoft.AnalysisServices.AdomdServer` namespace (and these objects), a reference to the msmgdsrv.dll must be added to UDF project or stored procedure.  
   
- ![Shows the object relationships in ADOMD.NET Server](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/adomdnetserverobjectmodel.gif "Shows the object relationships in ADOMD.NET Server")  
+ ![Shows the object relationships in ADOMD.NET Server](../../analysis-services/dev-guide/media/adomdnetserverobjectmodel.gif "Shows the object relationships in ADOMD.NET Server")  
 ADOMD.NET Object Model  
 
  Interaction with the ADOMD.NET object hierarchy typically starts with one or more of the objects in the topmost layer, as described in the following table.  

docs/2014/analysis-services/multidimensional-models-olap-logical-cube-objects/cube-cells-analysis-services-multidimensional-data.md

@@ -30,7 +30,7 @@ manager: craigg
 # Cube Cells (Analysis Services - Multidimensional Data)
   A cube is composed of cells, organized by measure groups and dimensions. A cell represents the unique logical intersection in a cube of one member from every dimension in the cube. For example, the cube described by the following diagram contains one measure group that has two measures, organized along three dimensions named Source, Route, and Time.  
 
- ![Cube diagram identifying a single cell](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/as-cubeintro5.gif "Cube diagram identifying a single cell")  
+ ![Cube diagram identifying a single cell](../../analysis-services/dev-guide/media/as-cubeintro5.gif "Cube diagram identifying a single cell")  
 
  The single shaded cell in this diagram is the intersection of the following members:  
 
@@ -57,7 +57,7 @@ manager: craigg
 
  The 2nd half member of the Time dimension is a nonleaf member. Therefore, all of values associated with it must be aggregated values, as shown in the following diagram.  
 
- ![3rd and 4th quarter cells for 2nd half member](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/as-cubeintro6.gif "3rd and 4th quarter cells for 2nd half member")  
+ ![3rd and 4th quarter cells for 2nd half member](../../analysis-services/dev-guide/media/as-cubeintro6.gif "3rd and 4th quarter cells for 2nd half member")  
 
  Assuming the aggregations for the 3rd quarter and 4th quarter members are summations, the value of the specified cell is 400, which is the total of all of the leaf cells shaded in the previous diagram. Because the value of the cell is derived from the aggregation of other cells, the specified cell is considered a *nonleaf cell*.  
 
@@ -68,7 +68,7 @@ manager: craigg
 
  For example, the structure of the cube shown in the following diagram is similar to other examples in this topic. However, in this example, there were no air shipments to Africa for the third quarter or to Australia for the fourth quarter. There is no data in the fact table to support the intersections of those dimensions and measures; therefore the cells at those intersections are empty.  
 
- ![Cube diagram identifying empty cells](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/as-cubeintro7.gif "Cube diagram identifying empty cells")  
+ ![Cube diagram identifying empty cells](../../analysis-services/dev-guide/media/as-cubeintro7.gif "Cube diagram identifying empty cells")  
 
  In [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] [!INCLUDE[ssASnoversion](../../includes/ssasnoversion-md.md)], an empty cell is a cell that has special qualities. Because empty cells can skew the results of crossjoins, counts, and so on, many MDX functions supply the ability to ignore empty cells for the purposes of calculation. For more information, see [Multidimensional Expressions (MDX) Reference](/sql/mdx/multidimensional-expressions-mdx-reference), and [Key Concepts in MDX (Analysis Services)](../multidimensional-models/key-concepts-in-mdx-analysis-services.md).  
 

docs/2014/analysis-services/multidimensional-models-olap-logical-dimension-objects/introduction-to-dimensions-analysis-services-multidimensional-data.md

@@ -25,19 +25,19 @@ manager: craigg
 
  The following diagram illustrates a subsection of the [!INCLUDE[ssSampleDBDWobject](../../includes/sssampledbdwobject-md.md)] sample database, in which the **FactResellerSales** fact table is related to two dimension tables, **DimReseller** and **DimPromotion**. The **ResellerKey** column in the **FactResellerSales** fact table defines a foreign key relationship to the **ResellerKey** primary key column in the **DimReseller** dimension table. Similarly, the **PromotionKey** column in the **FactResellerSales** fact table defines a foreign key relationship to the **PromotionKey** primary key column in the **DimPromotion** dimension table.  
 
- ![Logical schema for fact dimension relationship](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/dimfactrelationship.gif "Logical schema for fact dimension relationship")  
+ ![Logical schema for fact dimension relationship](../../analysis-services/dev-guide/media/dimfactrelationship.gif "Logical schema for fact dimension relationship")  
 
 ## Dimension based on a Snowflake Schema Design  
  Frequently, a more complex structure is required because information from multiple tables is required to define the dimension. In this structure, called a snowflake schema, each dimension is based on attributes from columns in multiple tables linked to each other and ultimately to the fact table by primary key - foreign key relationships. For example, the following diagram illustrates the tables required to completely describe the Product dimension in the **AdventureWorksDW** sample project:  
 
- ![Tables for AdventureWorksAS Product dimension](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/dimproduct.gif "Tables for AdventureWorksAS Product dimension")  
+ ![Tables for AdventureWorksAS Product dimension](../../analysis-services/dev-guide/media/dimproduct.gif "Tables for AdventureWorksAS Product dimension")  
 
  To completely describe a product, the product's category and subcategory must be included in the Product dimension. However, that information does not reside directly in the main table for the **DimProduct** dimension. A foreign key relationship from **DimProduct** to **DimProductSubcategory**, which in turn has a foreign key relationship to the **DimProductCategory** table, makes it possible to include the information for product categories and subcategories in the Product dimension.  
 
 ## Snowflake Schema versus Reference Relationship  
  Sometimes, you may have a choice between using a snowflake schema to define attributes in a dimension from multiple tables, or defining two separate dimensions and defining a reference dimension relationship between them. The following diagram illustrates such a scenario.  
 
- ![Logical schema for sample referenced dimension](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/dimindirect.gif "Logical schema for sample referenced dimension")  
+ ![Logical schema for sample referenced dimension](../../analysis-services/dev-guide/media/dimindirect.gif "Logical schema for sample referenced dimension")  
 
  In the previous diagram, the **FactResellerSales** fact table does not have a foreign key relationship with the **DimGeography** dimension table. However, the **FactResellerSales** fact table does have a foreign key relationship with the **DimReseller** dimension table, which in turn has a foreign key relationship with the **DimGeography** dimension table. To define a Reseller dimension that contains geography information about each reseller, you would have to retrieve these attributes from the **DimGeography** and the **DimReseller** dimension tables. However, in [!INCLUDE[ssASnoversion](../../includes/ssasnoversion-md.md)], you can achieve the same result by creating two separate dimensions and linking them in a measure group by defining a reference dimension relationship between the two dimensions. For more information about reference dimension relationships, see [Dimension Relationships](../multidimensional-models-olap-logical-cube-objects/dimension-relationships.md).  
 

docs/2014/analysis-services/multidimensional-models-scripting-language-assl-xmla/updating-cells-xmla.md

@@ -26,7 +26,7 @@ manager: craigg
 ## Specifying Cells  
  The [Cell](https://docs.microsoft.com/bi-reference/xmla/xml-elements-properties/cell-element-xmla) property of the `UpdateCells` command contains the cells to be updated. You identify each cell in the `Cell` property using that cell's ordinal number. Conceptually, [!INCLUDE[ssASnoversion](../../includes/ssasnoversion-md.md)] numbers cells in a cube as if the cube were a *p*-dimensional array, where *p* is the number of axes. Cells are addressed in row-major order. The following illustration shows the formula for calculating the ordinal number of a cell.  
 
- ![Formula to calculate the cell ordinal position](https://docs.microsoft.com/analysis-services/analysis-services/dev-guide/media/cellordinalformula.gif "Formula to calculate the cell ordinal position")  
+ ![Formula to calculate the cell ordinal position](../../analysis-services/dev-guide/media/cellordinalformula.gif "Formula to calculate the cell ordinal position")  
 
  Once you know a cell's ordinal number, you can indicate the intended value of the cell in the [Value](https://docs.microsoft.com/bi-reference/xmla/xml-elements-properties/value-element-xmla) property of the [Cell](https://docs.microsoft.com/bi-reference/xmla/xml-elements-properties/cell-element-xmla) property.