Skip to content

Commit 9ad624c

Browse files
MikeRayMSFTMikeRayMSFT
committed
Resolving merge conflict
2 parents c888fde + d10aaa7 commit 9ad624c

207 files changed

Lines changed: 3374 additions & 2713 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: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,38 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "docs/relational-databases/polybase/polybase-type-mapping.md",
5+
"redirect_url": "/sql/relational-databases/polybase/polybase-guide",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "docs/relational-databases/polybase/get-started-with-polybase.md",
510
"redirect_url": "/sql/relational-databases/polybase/polybase-guide",
611
"redirect_document_id": false
712
},
13+
{
14+
"source_path": "docs/advanced-analytics/r/sqldev-train-and-save-a-model-using-t-sql.md",
15+
"redirect_url": "/sql/advanced-analytics/tutorials/sqldev-train-and-save-a-model-using-t-sql",
16+
"redirect_document_id": true
17+
},
18+
{
19+
"source_path": "docs/advanced-analytics/tutorials/wrap-python-in-tsql-stored-procedure.md",
20+
"redirect_url": "/sql/advanced-analytics/tutorials/demo-data-iris-in-sql",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "docs/advanced-analytics/tutorials/sqldev-download-the-sample-data.md",
25+
"redirect_url": "/sql/advanced-analytics/tutorials/demo-data-nyctaxi-in-sql",
26+
"redirect_document_id": false
27+
},
828
{
929
"source_path": "docs/advanced-analytics/tutorials/sqldev-py1-download-the-sample-data.md",
10-
"redirect_url": "/sql/advanced-analytics/tutorials/sqldev-download-the-sample-data",
30+
"redirect_url": "/sql/advanced-analytics/tutorials/demo-data-nyctaxi-in-sql",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "docs/advanced-analytics/tutorials/sqldev-py2-import-data-to-sql-server-using-powershell.md",
35+
"redirect_url": "/sql/advanced-analytics/tutorials/demo-data-nyctaxi-in-sql",
1136
"redirect_document_id": false
1237
},
1338
{
@@ -192,7 +217,7 @@
192217
},
193218
{
194219
"source_path": "docs/advanced-analytics/r/sqldev-import-data-to-sql-server-using-powershell.md",
195-
"redirect_url": "/sql/advanced-analytics/tutorials/sqldev-download-the-sample-data",
220+
"redirect_url": "/sql/advanced-analytics/tutorials/demo-data-nyctaxi-in-sql",
196221
"redirect_document_id": false
197222
},
198223
{
@@ -1198,7 +1223,7 @@
11981223
},
11991224
{
12001225
"source_path": "docs/advanced-analytics/r-services/step-1-download-the-sample-data-in-database-advanced-analytics-tutorial.md",
1201-
"redirect_url": "/sql/advanced-analytics/tutorials/sqldev-download-the-sample-data",
1226+
"redirect_url": "/sql/advanced-analytics/tutorials/demo-data-nyctaxi-in-sql",
12021227
"redirect_document_id": false
12031228
},
12041229
{
@@ -1218,7 +1243,7 @@
12181243
},
12191244
{
12201245
"source_path": "docs/advanced-analytics/r-services/step-5-train-and-save-a-model-using-t-sql.md",
1221-
"redirect_url": "/sql/advanced-analytics/r/sqldev-train-and-save-a-model-using-t-sql",
1246+
"redirect_url": "/sql/advanced-analytics/tutorials/sqldev-train-and-save-a-model-using-t-sql",
12221247
"redirect_document_id": false
12231248
},
12241249
{
@@ -2683,12 +2708,12 @@
26832708
},
26842709
{
26852710
"source_path": "docs/relational-databases/replication/replication-to-sql-database.md",
2686-
"redirect_url": "https://docs.microsoft.com/en-us/azure/sql-database/replication-to-sql-database",
2711+
"redirect_url": "https://docs.microsoft.com/azure/sql-database/replication-to-sql-database",
26872712
"redirect_document_id": false
26882713
},
26892714
{
26902715
"source_path": "docs/relational-databases/replication/replication-with-sql-database-managed-instance.md",
2691-
"redirect_url": "https://docs.microsoft.com/en-us/azure/sql-database/replication-with-sql-database-managed-instance",
2716+
"redirect_url": "https://docs.microsoft.com/azure/sql-database/replication-with-sql-database-managed-instance",
26922717
"redirect_document_id": false
26932718
},
26942719
{

‎contributor-guide/templates/tutorial-template-annotated-example.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
<!------------------
33

4-
This is an annotated example of a tutorial with high CSAT (https://docs.microsoft.com/en-us/azure/app-service-web/web-sites-dotnet-get-started).
4+
This is an annotated example of a tutorial with high CSAT (https://docs.microsoft.com/azure/app-service-web/web-sites-dotnet-get-started).
55

66
Tutorials show users how to solve a problem. They include prerequisites and steps. They are not "learn concepts" topics.
77

‎contributor-guide/templates/tutorial-template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
<!------------------
33

4-
This is an outline of a tutorial that has high CSAT (https://docs.microsoft.com/en-us/azure/app-service-web/web-sites-dotnet-get-started).
4+
This is an outline of a tutorial that has high CSAT (https://docs.microsoft.com/azure/app-service-web/web-sites-dotnet-get-started).
55

66
Tutorials show users how to solve a problem. They include prerequisites and steps. They are not "learn concepts" topics.
77

‎docs/2014/analysis-services/lesson-5-4-defining-dimension-granularity-within-a-measure-group.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ manager: craigg
215215
![Sales Quota measure group dimensioned correctly](../../2014/tutorials/media/l5-granularity-7.gif "Sales Quota measure group dimensioned correctly")
216216

217217
## Next Lesson
218-
[Lesson 6: Defining Calculations]((lesson-6-defining-calculations.md)
218+
[Lesson 6: Defining Calculations](lesson-6-defining-calculations.md)
219219

220220
## See Also
221221
[Dimension Relationships](multidimensional-models-olap-logical-cube-objects/dimension-relationships.md)

‎docs/2014/database-engine/availability-groups/windows/monitor-availability-groups-transact-sql.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ manager: craigg
7474
> [!NOTE]
7575
> Also see **sys.dm_hadr_availability_replica_cluster_nodes** and **sys.dm_hadr_availability_replica_cluster_states** in the [Monitoring Availability Replicas](#AvReplicas) section and **sys.availability_databases_cluster** and **sys.dm_hadr_database_replica_cluster_states** in the [Monitoring Availability Databases](#AvDbs) section, later in this topic.
7676
77-
For information about WSFC clusters and [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)], see [Windows Server Failover Clustering &#40;WSFC&#41; with SQL Server]((../../../sql-server/failover-clusters/windows/windows-server-failover-clustering-wsfc-with-sql-server.md) and [Failover Clustering and AlwaysOn Availability Groups &#40;SQL Server&#41;](failover-clustering-and-always-on-availability-groups-sql-server.md).
77+
For information about WSFC clusters and [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)], see [Windows Server Failover Clustering &#40;WSFC&#41; with SQL Server](../../../sql-server/failover-clusters/windows/windows-server-failover-clustering-wsfc-with-sql-server.md) and [Failover Clustering and AlwaysOn Availability Groups &#40;SQL Server&#41;](failover-clustering-and-always-on-availability-groups-sql-server.md).
7878

7979
## <a name="AvGroups"></a> Monitoring Availability Groups
8080
To monitor the availability groups for which the server instance hosts an availability replica, use the following views:

‎docs/2014/database-engine/behavior-changes-to-full-text-search.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ manager: craigg
9797
The full-text engine indexes the contents of the FILESTREAM BLOBs. Indexing files such as images might not be useful. When a FILESTREAM BLOB is updated it is reindexed.
9898

9999
## See Also
100-
[Full-Text Search]((../relational-databases/search/full-text-search.md)
100+
[Full-Text Search](../relational-databases/search/full-text-search.md)
101101
[Full-Text Search Backward Compatibility](../../2014/database-engine/full-text-search-backward-compatibility.md)
102102
[Upgrade Full-Text Search](../relational-databases/search/upgrade-full-text-search.md)
103103
[Get Started with Full-Text Search](../relational-databases/search/get-started-with-full-text-search.md)

‎docs/2014/database-engine/breaking-changes-to-full-text-search.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ manager: craigg
5353

5454
## See Also
5555
[Behavior Changes to Full-Text Search](../relational-databases/search/full-text-search.md)
56-
[Full-Text Search]((../relational-databases/search/full-text-search.md)
56+
[Full-Text Search](../relational-databases/search/full-text-search.md)
5757

5858

0 commit comments

Comments
 (0)