Skip to content

Commit eae9a42

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into helpviewer
2 parents ac7e9fa + 0680ce1 commit eae9a42

238 files changed

Lines changed: 833 additions & 678 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,6 +1390,11 @@
13901390
"redirect_url": "/sql/machine-learning/tutorials/r-tutorials",
13911391
"redirect_document_id": true
13921392
},
1393+
{
1394+
"source_path": "docs/machine-learning/what-is-sql-server-machine-learning.md",
1395+
"redirect_url": "/sql/machine-learning/sql-server-machine-learning-services",
1396+
"redirect_document_id": true
1397+
},
13931398
{
13941399
"source_path": "docs/linux/sql-server-linux-develop-use-ssms.md",
13951400
"redirect_url": "/sql/linux/sql-server-linux-manage-ssms",

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,45 +105,45 @@
105105
- name: Client Architecture Requirements
106106
href: ../multidimensional-models/olap-physical/client-architecture-requirements-for-analysis-services-development.md
107107
- name: Developing with ADOMD.NET
108-
href: https://docs.microsoft.com/bi-reference/adomd/developing-with-adomd-net
108+
href: https://docs.microsoft.com/analysis-services/adomd/developing-with-adomd-net
109109
- name: ADOMD.NET Client Programming
110110
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/adomd-net-client-programming
111111
items:
112112
- name: ADOMD.NET Client Functionality
113-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/adomd-net-client-functionality
113+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/adomd-net-client-functionality
114114
- name: Migrating From ADO MD To ADOMD.NET
115-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/migrating-from-ado-md-to-adomd-net
115+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/migrating-from-ado-md-to-adomd-net
116116
- name: Establishing Connections in ADOMD.NET
117-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net
117+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net
118118
- name: Establishing Secure Connections in ADOMD.NET
119119
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-establishing-secure-connections
120120
- name: Working with Connections and Sessions in ADOMD.NET
121-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-working-with-connections-and-sessions
121+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-working-with-connections-and-sessions
122122
- name: Performing Transactions in ADOMD.NET
123-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-performing-transactions
123+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-performing-transactions
124124
- name: Retrieving Metadata from an Analytical Data Source
125125
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-from-an-analytical-data-source
126126
- name: Working with the ADOMD.NET Object Model
127-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-adomd-net-object-model
127+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-adomd-net-object-model
128128
- name: Working with Schema Rowsets in ADOMD.NET
129-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-schema-rowsets
129+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-schema-rowsets
130130
- name: Executing Commands Against an Analytical Data Source
131-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/executing-commands-against-an-analytical-data-source
131+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/executing-commands-against-an-analytical-data-source
132132
- name: Retrieving Data from an Analytical Data Source
133-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-from-an-analytical-data-source
133+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-from-an-analytical-data-source
134134
- name: Retrieving Data Using the CellSet
135-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-cellset
135+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-cellset
136136
- name: Retrieving Data Using the AdomdDataReader
137-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-adomddatareader
137+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-adomddatareader
138138
- name: Retrieving Data Using the XmlReader
139-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-xmlreader
139+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-data-using-the-xmlreader
140140
- name: ADOMD.NET Server Programming
141-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-programming
141+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/adomd-net-server-programming
142142
items:
143143
- name: ADOMD.NET Server Functionality
144-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-functionality
144+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/adomd-net-server-functionality
145145
- name: ADOMD.NET Server Object Architecture
146-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-object-architecture
146+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/adomd-net-server-object-architecture
147147
- name: User Defined Functions and Stored Procedures
148148
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/user-defined-functions-and-stored-procedures
149149
- name: Redistributing ADOMD.NET

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ manager: craigg
6464
### <a name="bkmk_sqleditions"></a> SQL Server Edition Requirements
6565
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).
6666

67-
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).
67+
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).
6868

6969
[Microsoft SQL Server 2012 Release Notes (https://go.microsoft.com/fwlink/?LinkId=236893)](https://go.microsoft.com/fwlink/?LinkId=236893).
7070

docs/2014/analysis-services/tabular-model-programming-compatibility-levels-1050-1103/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
- name: Tabular Model Programming
22
href: tabular-model-programming-for-compatibility-levels-1050-through-1103.md
33
- name: CSDL Annotations for Business Intelligence (CSDLBI)
4-
href: https://docs.microsoft.com/bi-reference/csdl/csdl-annotations-for-business-intelligence-csdlbi
4+
href: https://docs.microsoft.com/analysis-services/csdlbi/csdl-annotations-for-business-intelligence-csdlbi
55
items:
66
- name: CSDLBI Concepts
7-
href: https://docs.microsoft.com/bi-reference/csdl/csdlbi-concepts
7+
href: https://docs.microsoft.com/analysis-services/csdlbi/csdlbi-concepts
88
- name: CSDLBI Attributes for Report Design
9-
href: https://docs.microsoft.com/bi-reference/csdl/csdlbi-attributes-for-report-design
9+
href: https://docs.microsoft.com/analysis-services/csdlbi/csdlbi-attributes-for-report-design
1010
- name: Understanding the Tabular Object Model
1111
href: representation/understanding-tabular-object-model-at-levels-1050-through-1103.md
1212
items:

docs/2014/analysis-services/tabular-modeling-adventure-works-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ manager: craigg
5252

5353
- [!INCLUDE[ssBIDevStudioFull](../includes/ssbidevstudiofull-md.md)].
5454

55-
- AdventureWorksDW sample database. This sample database includes the data necessary to complete this tutorial. To download the sample database, see [https://go.microsoft.com/fwlink/?LinkID=335807](https://go.microsoft.com/fwlink/?LinkID=335807).
55+
- AdventureWorksDW sample database. This sample database includes the data necessary to complete this tutorial. To download the sample database, see [https://github.com/microsoft/sql-server-samples/releases/tag/adventureworks](https://github.com/microsoft/sql-server-samples/releases/tag/adventureworks).
5656

5757
- [!INCLUDE[msCoName](../includes/msconame-md.md)] Excel 2003 or later (for use with the Analyze in Excel feature in lesson 11)
5858

docs/2014/analysis-services/tabular-models/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
- name: Analyze a Tabular Model in Excel
167167
href: analyze-a-tabular-model-in-excel-ssas-tabular.md
168168
- name: Tabular Model Solution Deployment
169-
href: tabular-model-solution-deployment-ssas-tabular.md
169+
href: https://docs.microsoft.com/analysis-services/deployment/tabular-model-solution-deployment
170170
items:
171171
- name: Deploy From SQL Server Data Tools
172172
href: deploy-from-sql-server-data-tools-ssas-tabular.md

docs/2014/breadcrumb/toc.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -404,21 +404,21 @@
404404
tocHref: /sql/analysis-services/schema-rowsets/
405405
topicHref: /sql/analysis-services/schema-rowsets/analysis-services-schema-rowsets
406406
- name: Scripting
407-
tocHref: /sql/analysis-services/scripting/
408-
topicHref: /sql/analysis-services/scripting/analysis-services-scripting-language-assl-for-xmla
407+
tocHref: https://docs.microsoft.com/analysis-services/assl
408+
topicHref: https://docs.microsoft.com/analysis-services/assl/analysis-services-scripting-language-assl-for-xmla
409409
items:
410410
- name: Objects
411-
tocHref: /sql/analysis-services/scripting/objects/
412-
topicHref: /sql/analysis-services/scripting/objects/objects-assl
411+
tocHref: https://docs.microsoft.com/analysis-services/assl/objects
412+
topicHref: https://docs.microsoft.com/analysis-services/assl/objects/objects-assl
413413
- name: Collections
414-
tocHref: /sql/analysis-services/scripting/collections/
415-
topicHref: /sql/analysis-services/scripting/collections/collections-assl
414+
tocHref: https://docs.microsoft.com/analysis-services/assl/collections
415+
topicHref: https://docs.microsoft.com/analysis-services/assl/collections/collections-assl
416416
- name: Properties
417-
tocHref: /sql/analysis-services/scripting/properties/
418-
topicHref: /sql/analysis-services/scripting/properties/properties-assl
417+
tocHref: https://docs.microsoft.com/analysis-services/assl/properties
418+
topicHref: https://docs.microsoft.com/analysis-services/assl/properties/properties-assl
419419
- name: Data Types
420-
tocHref: /sql/analysis-services/scripting/data-type/
421-
topicHref: /sql/analysis-services/scripting/data-type/analysis-services-scripting-language-xml-data-types-assl
420+
tocHref: https://docs.microsoft.com/analysis-services/assl/data-type
421+
topicHref: https://docs.microsoft.com/analysis-services/assl/data-type/analysis-services-scripting-language-xml-data-types-assl
422422
- name: XMLA
423423
tocHref: /sql/analysis-services/xmla/
424424
topicHref: /sql/analysis-services/xmla/xml-for-analysis-xmla-reference

docs/2014/integration-services/configure-a-for-loop-container.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ manager: craigg
1717
# Configure a For Loop Container
1818
This procedure describes how to configure a For Loop container by using the **For Loop Editor** dialog box.
1919

20-
For an example of the For Loop container, see [SSIS Loops that do not fail](https://go.microsoft.com/fwlink/?LinkId=240295) on bimonkey.com.
21-
2220
### To configure the For Loop container
2321

2422
1. In [!INCLUDE[ssBIDevStudioFull](../includes/ssbidevstudiofull-md.md)], double-click the For Loop container to open the **For Loop Editor**.

docs/2014/integration-services/data-flow/raw-file-destination.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ manager: craigg
124124
For information about how to set properties of the component, see [Set the Properties of a Data Flow Component](set-the-properties-of-a-data-flow-component.md).
125125

126126
## Related Content
127-
Blog entry, [Raw Files Are Awesome](http://www.sqlservercentral.com/blogs/stratesql/archive/2011/1/1/31-days-of-ssis-_1320_-raw-files-are-awesome-_2800_1_2F00_31_2900_.aspx), on sqlservercentral.com.
127+
Blog entry, [Raw Files Are Awesome](https://www.sqlservercentral.com/blogs/31-days-of-ssis-%e2%80%93-raw-files-are-awesome-131), on sqlservercentral.com.
128128

129129
## See Also
130130
[Raw File Source](raw-file-source.md)

docs/2014/integration-services/data-flow/raw-file-source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ manager: craigg
4545

4646
## Related Content
4747

48-
- Blog entry, [Raw Files Are Awesome](http://www.sqlservercentral.com/blogs/stratesql/archive/2011/1/1/31-days-of-ssis-_1320_-raw-files-are-awesome-_2800_1_2F00_31_2900_.aspx), on sqlservercentral.com
48+
- Blog entry, [Raw Files Are Awesome](https://www.sqlservercentral.com/blogs/31-days-of-ssis-%e2%80%93-raw-files-are-awesome-131), on sqlservercentral.com
4949

5050
## See Also
5151
[Raw File Destination](raw-file-destination.md)

0 commit comments

Comments
 (0)