Skip to content

Commit 6741b92

Browse files
WilliamDAssafMSFTWilliamDAssafMSFT
authored
Merge branch 'live' into patch-4
2 parents 489c645 + 11cda13 commit 6741b92

4,605 files changed

Lines changed: 35331 additions & 15130 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.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ Tools/NuGet/
1111
.openpublishing.build.mdproj
1212
.openpublishing.buildcore.ps1
1313
packages.config
14+
15+
**/.vscode/settings.json

‎.openpublishing.redirection.json‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20932,7 +20932,7 @@
2093220932
},
2093320933
{
2093420934
"source_path": "docs/2014/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization.md",
20935-
"redirect_url": "/previous-versions/sql/2014/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization",
20935+
"redirect_url": "/previous-versions/sql/2014/relational-databases/in-memory-oltp/overview-and-usage-scenarios",
2093620936
"redirect_document_id": false
2093720937
},
2093820938
{
@@ -42485,6 +42485,11 @@
4248542485
"redirect_url": "/machine-learning-server/r-reference/sqlrutils/how-to-create-a-stored-procedure-from-r",
4248642486
"redirect_document_id": false
4248742487
},
42488+
{
42489+
"source_path": "docs/machine-learning-server/r-reference/sqlrutils/how-to-create-a-stored-procedure-from-r.md",
42490+
"redirect_url": "/sql/machine-learning/r/reference/sqlrutils/how-to-create-stored-procedure-from-r",
42491+
"redirect_document_id": false
42492+
},
4248842493
{
4248942494
"source_path": "docs/advanced-analytics/r/how-to-create-mdx-queries-using-olapr.md",
4249042495
"redirect_url": "/sql/machine-learning/r/how-to-create-mdx-queries-using-olapr",
@@ -42557,7 +42562,12 @@
4255742562
},
4255842563
{
4255942564
"source_path": "docs/advanced-analytics/r/set-up-a-data-science-client.md",
42560-
"redirect_url": "/sql/machine-learning/r/set-up-a-data-science-client",
42565+
"redirect_url": "/sql/machine-learning/r/set-up-data-science-client",
42566+
"redirect_document_id": false
42567+
},
42568+
{
42569+
"source_path": "docs/sql/machine-learning/r/set-up-a-data-science-client.md",
42570+
"redirect_url": "/sql/machine-learning/r/set-up-data-science-client",
4256142571
"redirect_document_id": true
4256242572
},
4256342573
{
@@ -43487,7 +43497,7 @@
4348743497
},
4348843498
{
4348943499
"source_path": "docs/advanced-analytics/r/setup-or-configure-r-tools.md",
43490-
"redirect_url": "/sql/advanced-analytics/r/set-up-a-data-science-client",
43500+
"redirect_url": "/sql/advanced-analytics/r/set-up-data-science-client",
4349143501
"redirect_document_id": false
4349243502
},
4349343503
{
@@ -44567,7 +44577,7 @@
4456744577
},
4456844578
{
4456944579
"source_path": "docs/advanced-analytics/r-services/set-up-a-data-science-client.md",
44570-
"redirect_url": "/sql/advanced-analytics/r/set-up-a-data-science-client",
44580+
"redirect_url": "/sql/advanced-analytics/r/set-up-data-science-client",
4457144581
"redirect_document_id": false
4457244582
},
4457344583
{
@@ -56847,7 +56857,7 @@
5684756857
},
5684856858
{
5684956859
"source_path": "docs/2014/relational-databases/in-memory-oltp/index.md",
56850-
"redirect_url": "/sql/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization?view=sql-server-2014",
56860+
"redirect_url": "/previous-versions/sql/2014/relational-databases/in-memory-oltp/overview-and-usage-scenarios",
5685156861
"redirect_document_id": false
5685256862
},
5685356863
{
@@ -58017,7 +58027,7 @@
5801758027
},
5801858028
{
5801958029
"source_path": "docs/relational-databases/in-memory-oltp/index.md",
58020-
"redirect_url": "/sql/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization",
58030+
"redirect_url": "/sql/relational-databases/in-memory-oltp/overview-and-usage-scenarios",
5802158031
"redirect_document_id": false
5802258032
},
5802358033
{
@@ -59294,6 +59304,16 @@
5929459304
"source_path": "docs/relational-databases/security/encryption/always-encrypted-enclaves-query-columns-ssms.md",
5929559305
"redirect_url": "/sql/relational-databases/security/encryption/always-encrypted-enclaves-query-columns",
5929659306
"redirect_document_id": true
59307+
},
59308+
{
59309+
"source_path": "docs/relational-databases/in-memory-oltp/in-memory-oltp-in-memory-optimization.md",
59310+
"redirect_url": "/sql/relational-databases/in-memory-oltp/overview-and-usage-scenarios",
59311+
"redirect_document_id": false
59312+
},
59313+
{
59314+
"source_path": "docs/relational-databases/system-stored-procedures/sp-batch-params-transact-sql.md",
59315+
"redirect_url": "/sql/relational-databases/system-stored-procedures/sp-describe-undeclared-parameters-transact-sql",
59316+
"redirect_document_id": false
5929759317
}
5929859318
]
5929959319
}

‎data-migration/index.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
title: Azure Database Migration Guides | Microsoft Docs
77
description: "Step-by-step guidance for modernizing your data assets by migrating to SQL Server, Azure SQL Database, Azure SQL Managed Instance, Azure Database, Azure Cosmos DB, SQL Server on Azure VMs and Azure Synapse Analytics. "
88
ms.topic: hub-page
9+
ms.prod: sql
910
ms.technology: migration-guide
1011

1112
# itemType: how-to-guide | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new

‎docs/ado/guide/data/what-is-a-cursor.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ title: "What is a Cursor? | Microsoft Docs"
44
ms.prod: sql
55
ms.prod_service: connectivity
66
ms.technology: ado
7-
ms.custom: ""
7+
ms.custom:
8+
- intro-overview
89
ms.date: "01/19/2017"
910
ms.reviewer: ""
1011
ms.topic: conceptual
11-
helpviewer_keywords:
12+
helpviewer_keywords:
1213
- "cursors [ADO], about cursors"
1314
ms.assetid: 596eb4b6-c22f-4cde-b23f-172dd66c3161
1415
author: rothja

‎docs/ado/guide/data/what-is-a-lock.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ title: "What is a Lock? | Microsoft Docs"
44
ms.prod: sql
55
ms.prod_service: connectivity
66
ms.technology: ado
7-
ms.custom: ""
7+
ms.custom:
8+
- intro-overview
89
ms.date: "01/19/2017"
910
ms.reviewer: ""
1011
ms.topic: conceptual
11-
helpviewer_keywords:
12+
helpviewer_keywords:
1213
- "cursors [ADO], locking"
1314
- "locks [ADO], about locking"
1415
ms.assetid: f8989555-28c6-4c17-9bf8-7f44a8a5c407

‎docs/analytics-platform-system/acquire-and-configure-backup-server.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Since PDW backups are not stored on the appliance, your IT team is responsible f
126126

127127
### Manage network credentials
128128

129-
Network access to the backup directory is based on standard Windows file sharing security. Before performing a backup, you need to create or designate a Windows account that will be used for authenticating PDW to the backup directory. This windows account must have permission to access, create, and write to the backup directory.
129+
Network access to the backup directory is based on standard Windows file sharing security. Before performing a backup, you need to create or designate a Windows account that will be used for authenticating PDW to the backup directory. This Windows account must have permission to access, create, and write to the backup directory.
130130

131131
> [!IMPORTANT]
132132
> To reduce security risks with your data, we advise that you designate one Windows account solely for the purpose of performing backup and restore operations. Allow this account to have permissions to the backup location and nowhere else.

‎docs/analytics-platform-system/apply-analytics-platform-system-hotfixes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Unlike the Microsoft updates, the hotfixes for the Analytics Platform System sof
4848

4949
2. Use the **Run as administrator** option to open a Command Prompt.
5050

51-
3. Run the following command, replacing *<HotfixPackageName>* with the name of the hotfix executable package, and replacing the other placeholder items *< >* with the appropriate information.
51+
3. Run the following command, replacing *\<HotfixPackageName\>* with the name of the hotfix executable package, and replacing the other placeholder items *< >* with the appropriate information.
5252

5353
```
5454
<HotfixPackageName> /DomainAdminPassword="<password>"

‎docs/analytics-platform-system/create-ssis-script-task-using-pdw-destination-adapter.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This SSIS package script code is a code example for using the SSIS PDW destinati
2323

2424
3. Edit the script to use the code provided below. Customized the script to your environment by making the following changes:
2525

26-
- You must retain the namespace of the script created by the script task. Note the name of the namespace `namespace ST_<GUID>` and edit the script below, changing *ST_<GUID>* to the original *GUID* of the script task.
26+
- You must retain the namespace of the script created by the script task. Note the name of the namespace `namespace ST_<GUID>` and edit the script below, changing *ST_\<GUID\>* to the original *GUID* of the script task.
2727

2828
- Replace four occurrences of the placeholder value *XXXXXXXX* with the values appropriate to your environment and intended action.
2929

‎docs/analytics-platform-system/download-and-apply-microsoft-updates.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Before performing these steps, you need to:
120120

121121
5. In the **Status** drop-down menu, select **Any** and click **Refresh**.
122122

123-
6. Expand **Update Services**, *<appliance name>*-VMM, **Updates**, **All Updates**, where *<appliance name>* is your appliance name.
123+
6. Expand **Update Services**, *\<appliance name\>*-VMM, **Updates**, **All Updates**, where *\<appliance name\>* is your appliance name.
124124

125125
7. In the **All Updates** window set **Approval** to **Any Except Declined**.
126126

@@ -144,7 +144,7 @@ Follow these instructions to run the Analytics Platform System Update program.
144144
145145
1. Make sure you are logged into the HST01 node as the Fabric Domain Administrator.
146146

147-
2. Open a Command Prompt window and enter the following commands. Replace *<parameter>* with the designated information.
147+
2. Open a Command Prompt window and enter the following commands. Replace *\<parameter\>* with the designated information.
148148

149149
**To Run the Microsoft Update:**
150150

‎docs/analytics-platform-system/dwloader.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Examples:
142142
**-S** *target_appliance*
143143
Specifies the SQL Server PDW appliance that will receive the loaded data.
144144

145-
*For Infiniband connections*, *target_appliance* is specified as <appliance-name>-SQLCTL01. To configure this named connection, see [Configure InfiniBand Network Adapters](configure-infiniband-network-adapters.md).
145+
*For Infiniband connections*, *target_appliance* is specified as \<appliance-name\>-SQLCTL01. To configure this named connection, see [Configure InfiniBand Network Adapters](configure-infiniband-network-adapters.md).
146146

147147
For Ethernet connections, *target_appliance* is the IP address for the Control node cluster.
148148

@@ -690,7 +690,7 @@ Description of the command-line parameters:
690690

691691
- *-r \r\n* specifies each row in DimAccount.txt ends with a carriage return and a line feed character.
692692

693-
- *-U <login_name> -P <password>* specifies the login and password for the login that has permissions to perform the load.
693+
- *-U <login_name> -P \<password\>* specifies the login and password for the login that has permissions to perform the load.
694694

695695

696696
<!-- MISSING LINK

0 commit comments

Comments
 (0)