Skip to content

Commit 6cdb04c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-remove-sscurrent-tag
2 parents 9e90a5d + 5966a25 commit 6cdb04c

37 files changed

Lines changed: 159 additions & 82 deletions

File tree

data-migration/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ conceptualContent:
134134
url: https://azure.microsoft.com/pricing/hybrid-benefit/
135135
itemType: reference
136136
- text: Browse Azure Architecture
137-
url: https://docs.microsoft.com/azure/architecture/browse/?azure_categories=migration
137+
url: /azure/architecture/browse/?azure_categories=migration
138138
itemType: reference
139139
- text: Microsoft cloud Adoption Framework for Azure
140140
url: https://azure.microsoft.com/cloud-adoption-framework/#cloud-adoption-journey
@@ -206,4 +206,4 @@ additionalContent:
206206
# Card
207207
- title: CCC Marketing (Japan)
208208
summary: CCC Marketing switched its data analytics infrastructure from Oracle to Microsoft Azure.
209-
url: https://customers.microsoft.com/story/843276-ccc-marketing-professional-services-azure-en-japan
209+
url: https://customers.microsoft.com/story/843276-ccc-marketing-professional-services-azure-en-japan

docs/azure-data-studio/extensions/sql-database-project-extension.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Watch this short 10-minute video for an introduction to the SQL Database Project
5151
## .NET Core SDK
5252
The .NET Core SDK is required for project build functionality and you will be prompted to install the .NET Core SDK if it cannot be detected by the extension. The .NET Core SDK (v3.1 or higher) can be downloaded and installed from [https://dotnet.microsoft.com/download/dotnet-core/3.1](https://dotnet.microsoft.com/download/dotnet-core/3.1).
5353

54-
Previous installations of the .NET Core SDK may be below the minimum required version and are unsupported for use with the SQL Database Projects extension. If you would like to [check currently installed versions](https://docs.microsoft.com/dotnet/core/install/how-to-detect-installed-versions) of the dotnet SDK, open a terminal and run the following command.
54+
Previous installations of the .NET Core SDK may be below the minimum required version and are unsupported for use with the SQL Database Projects extension. If you would like to [check currently installed versions](/dotnet/core/install/how-to-detect-installed-versions) of the dotnet SDK, open a terminal and run the following command.
5555

5656
```dotnetcli
5757
dotnet --list-sdks
@@ -97,4 +97,4 @@ In the example `.code-workspace` file below, the `folders` array lists all folde
9797
## Next steps
9898

9999
- [Getting Started with the SQL Database Projects extension](sql-database-project-extension-getting-started.md)
100-
- [Build and Publish a project with SQL Database Projects extension for Azure Data Studio](sql-database-project-extension-build.md)
100+
- [Build and Publish a project with SQL Database Projects extension for Azure Data Studio](sql-database-project-extension-build.md)

docs/big-data-cluster/big-data-cluster-faq.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ sections:
139139
You can use EXECUTE AT to query DMVs like sys.dm_db_partition_stats to get the data in each local table.
140140
- question: Is curl the only option to upload files to HDFS?
141141
answer: |
142-
No, you can use [azdata bdc hdfs cp](reference-azdata-bdc-hdfs.md#azdata-bdc-hdfs-cp). If you provide the root directory the command will recursively copy the whole tree. You can copy in/out using this command just by changing what is the source/target paths.
142+
No, you can use [azdata bdc hdfs cp](/sql/azdata/reference/reference-azdata-bdc-hdfs#azdata-bdc-hdfs-cp). If you provide the root directory the command will recursively copy the whole tree. You can copy in/out using this command just by changing what is the source/target paths.
143143
- question: How can I load data into the data pool?
144144
answer: |
145145
You can use MSSQL Spark connector library to help with SQL and data pool ingestion. For a guided walk-through, see [Tutorial: Ingest data into a SQL Server data pool with Spark jobs](tutorial-data-pool-ingest-spark.md#start-a-spark-streaming-job).
146146
- question: If I have a lot of data on a (Windows) network path, which contains lots of folders/sub-folders and text files, how do I upload them to HDFS on Big data cluster?
147147
answer: |
148-
Give [azdata bdc hdfs cp](reference-azdata-bdc-hdfs.md#azdata-bdc-hdfs-cp) a try. If you provide the root directory the command will recursively copy the whole tree. You can copy in/out using this command just by changing what is the source/target paths.
148+
Give [azdata bdc hdfs cp](/sql/azdata/reference/reference-azdata-bdc-hdfs#azdata-bdc-hdfs-cp) a try. If you provide the root directory the command will recursively copy the whole tree. You can copy in/out using this command just by changing what is the source/target paths.
149149
- question: Is it possible to increase the size of the storage pool on a deployed cluster?
150150
answer: |
151151
There is no azdata interface to perform this operation at this time. You have the option to resize desired PVCs manually. Resizing is a complex operation, see [Persistent Volumes in Kubernetes Documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/).
@@ -191,7 +191,7 @@ sections:
191191
You can add packages at job submission using the steps in the [sample notebook for installing packages in Spark](https://github.com/microsoft/sql-server-samples/blob/master/samples/features/sql-big-data-cluster/spark/config-install/installpackage_Spark.ipynb).
192192
- question: Do I need to use SQL Server 2019 to use R and Python for SQL Server Big Data Clusters?
193193
answer: |
194-
Machine Learning (ML) Services (R and Python) is available beginning in SQL Server 2017. ML Services is available in SQL Server Big Data Clusters as well. For more information, see [What is SQL Server Machine Learning?](../advanced-analytics/what-is-sql-server-machine-learning.md).
194+
Machine Learning (ML) Services (R and Python) is available beginning in SQL Server 2017. ML Services is available in SQL Server Big Data Clusters as well. For more information, see [What is SQL Server Machine Learning?](/sql/machine-learning/sql-server-machine-learning-services).
195195
- name: Licensing
196196
questions:
197197
- question: How do SQL Server licenses work for SQL Server Big Data Clusters?
@@ -248,4 +248,4 @@ sections:
248248
(PDF)[Case Study: SQL Workloads running on Apache Spark in MS SQL Server 2019 Big Data Cluster](https://aka.ms/sql-bdc-spark-perf)<BR>
249249
additionalContent: |
250250
## See Also
251-
- [SQL Server Big Data Clusters](big-data-cluster-overview.md)
251+
- [SQL Server Big Data Clusters](big-data-cluster-overview.md)

docs/connect/jdbc/download-microsoft-jdbc-driver-for-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ Unsupported driver versions aren't available for download here. We're continuall
6868

6969
## Next steps
7070

71-
For more information about the Microsoft JDBC Driver for SQL Server, see [Overview of the JDBC driver](overview-of-the-jdbc-driver.md) and the [JDBC driver GitHub repository](https://github.com/microsoft/mssql-jdbc/blob/dev/README.md).
71+
For more information about the Microsoft JDBC Driver for SQL Server, see [Overview of the JDBC driver](overview-of-the-jdbc-driver.md) and the [JDBC driver GitHub repository](https://github.com/microsoft/mssql-jdbc/blob/dev/README.md).

docs/connect/odbc/download-odbc-driver-for-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ See also [Installing the macOS driver](linux-mac/install-microsoft-odbc-driver-s
117117

118118
### Release notes for Linux and macOS
119119

120-
For details about releases for Linux and macOS, see [the Linux and macOS release notes](linux-mac\release-notes-odbc-sql-server-linux-mac.md).
120+
For details about releases for Linux and macOS, see [the Linux and macOS release notes](linux-mac\release-notes-odbc-sql-server-linux-mac.md).

docs/connect/oledb/download-oledb-driver-for-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ For details about this release, see [the release notes](release-notes-for-oledb-
5555
[System requirements for OLE DB Driver for SQL Server](system-requirements-for-oledb-driver-for-sql-server.md)
5656
[Support policies for OLE DB Driver for SQL Server](applications\support-policies-for-oledb-driver-for-sql-server.md)
5757
[When to use OLE DB Driver for SQL Server](when-to-use-oledb-driver-for-sql-server.md)
58-
[Installing OLE DB Driver for SQL Server](applications/installing-oledb-driver-for-sql-server.md)
58+
[Installing OLE DB Driver for SQL Server](applications/installing-oledb-driver-for-sql-server.md)

docs/database-engine/configure-windows/server-configuration-options-sql-server.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Self-configuring options are those that [!INCLUDE[ssNoVersion](../../includes/ss
126126
| [PH_timeout](../../database-engine/configure-windows/ph-timeout-server-configuration-option.md) (A) | 1 | 3600 | 60 |
127127
| [polybase enabled](../../relational-databases/polybase/polybase-installation.md#enable) (RR) <br/><br/>[!INCLUDE [sqlserver2019](../../includes/applies-to-version/sqlserver2019.md)]| 0 | 1 | 0 |
128128
| [polybase network encryption](../../relational-databases/polybase/polybase-installation.md#enable) | 0 | 1 | 1 |
129-
| [precompute rank](../../database-engine/configure-windows/precompute-rank-server-configuration-option.md) (A) | 0 | 1 | 0 |
129+
| [precompute rank](/docs/database-engine/discontinued-database-engine-functionality-in-sql-server) (A) | 0 | 1 | 0 |
130130
| [priority boost](../../database-engine/configure-windows/configure-the-priority-boost-server-configuration-option.md) (A, RR) | 0 | 1 | 0 |
131131
| [query governor cost limit](../../database-engine/configure-windows/configure-the-query-governor-cost-limit-server-configuration-option.md) (A) | 0 | 2147483647 | 0 |
132132
| [query wait](../../database-engine/configure-windows/configure-the-query-wait-server-configuration-option.md) (A) | -1 | 2147483647 | -1 |
@@ -154,6 +154,4 @@ Self-configuring options are those that [!INCLUDE[ssNoVersion](../../includes/ss
154154
## See also
155155
[sp_configure &#40;Transact-SQL&#41;](../../relational-databases/system-stored-procedures/sp-configure-transact-sql.md)
156156
[RECONFIGURE &#40;Transact-SQL&#41;](../../t-sql/language-elements/reconfigure-transact-sql.md)
157-
[DBCC FREEPROCCACHE &#40;Transact-SQL&#41;](../../t-sql/database-console-commands/dbcc-freeproccache-transact-sql.md)
158-
159-
157+
[DBCC FREEPROCCACHE &#40;Transact-SQL&#41;](../../t-sql/database-console-commands/dbcc-freeproccache-transact-sql.md)

docs/database-engine/configure-windows/sql-server-service-broker.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ FROM ExpenseQueue;
100100

101101
Cross-instance service broker message exchange is supported only between Azure SQL Managed Instances:
102102

103-
- `CREATE ROUTE`: You can't use CREATE ROUTE with ADDRESS other than LOCAL or DNS name of another SQL Managed Instance. Port specified must be 4022. See [CREATE ROUTE](https://docs.microsoft.com/sql/t-sql/statements/create-route-transact-sql).
104-
- `ALTER ROUTE`: You can't use ALTER ROUTE with ADDRESS other than LOCAL or DNS name of another SQL Managed Instance. Port specified must be 4022. See See [ALTER ROUTE](https://docs.microsoft.com/sql/t-sql/statements/alter-route-transact-sql).
103+
- `CREATE ROUTE`: You can't use CREATE ROUTE with ADDRESS other than LOCAL or DNS name of another SQL Managed Instance. Port specified must be 4022. See [CREATE ROUTE](/sql/t-sql/statements/create-route-transact-sql).
104+
- `ALTER ROUTE`: You can't use ALTER ROUTE with ADDRESS other than LOCAL or DNS name of another SQL Managed Instance. Port specified must be 4022. See See [ALTER ROUTE](/sql/t-sql/statements/alter-route-transact-sql).
105105

106106
Transport security is supported, dialog security is not:
107107

@@ -129,4 +129,4 @@ No significant changes were introduced in [!INCLUDE[ssCurrent](../../includes/ss
129129

130130
## Next steps
131131

132-
The most common use of Service Broker is for [event notifications](../../relational-databases/service-broker/event-notifications.md). Learn how to [implement event notifications](../../relational-databases/service-broker/implement-event-notifications.md), [configure dialog security](../../relational-databases/service-broker/configure-dialog-security-for-event-notifications.md), or [get more information](../../relational-databases/service-broker/get-information-about-event-notifications.md).
132+
The most common use of Service Broker is for [event notifications](../../relational-databases/service-broker/event-notifications.md). Learn how to [implement event notifications](../../relational-databases/service-broker/implement-event-notifications.md), [configure dialog security](../../relational-databases/service-broker/configure-dialog-security-for-event-notifications.md), or [get more information](../../relational-databases/service-broker/get-information-about-event-notifications.md).

docs/database-engine/install-windows/add-features-to-an-instance-of-sql-server-setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This article provides a step-by-step procedure for adding features to an instanc
2525
To add features to an instance of SQL Server from the command prompt, see [Install SQL Server from the Command Prompt](./install-sql-server-from-the-command-prompt.md).
2626

2727
> [!CAUTION]
28-
> Adding features to an existing installation of SQL Server will install the features at the version level of the installation media, which may be behind the version level other features of SQL Server. This may result in unexpected behavior or errors. Always follow the success of SQL Server Setup by bringing the new feature up to the same version level. Install service packs (SPs), cumulative updates (CUs), and/or general distribution releases (GDRs) as needed. To determine the version of features added to an installation of SQL Server, see [Determine the version, edition, and update level of SQL Server and its components](https://docs.microsoft.com/troubleshoot/sql/general/determine-version-edition-update-level).
28+
> Adding features to an existing installation of SQL Server will install the features at the version level of the installation media, which may be behind the version level other features of SQL Server. This may result in unexpected behavior or errors. Always follow the success of SQL Server Setup by bringing the new feature up to the same version level. Install service packs (SPs), cumulative updates (CUs), and/or general distribution releases (GDRs) as needed. To determine the version of features added to an installation of SQL Server, see [Determine the version, edition, and update level of SQL Server and its components](/troubleshoot/sql/general/determine-version-edition-update-level).
2929
3030
## Prerequisites
3131

@@ -158,4 +158,4 @@ Configure your SQL Server installation
158158
- [Repair a Failed SQL Server 2016 Installation](../../database-engine/install-windows/repair-a-failed-sql-server-installation.md)
159159
- [Upgrade SQL Server Using the Installation Wizard &#40;Setup&#41;](../../database-engine/install-windows/upgrade-sql-server-using-the-installation-wizard-setup.md)
160160
- [Install SQL Server from the Command Prompt](./install-sql-server-from-the-command-prompt.md)
161-
- [Latest Updates for SQL Server](latest-updates-for-microsoft-sql-server.md)
161+
- [Latest Updates for SQL Server](latest-updates-for-microsoft-sql-server.md)

docs/database-engine/install-windows/plan-and-test-the-database-engine-upgrade-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ monikerRange: ">=sql-server-2016"
9090
[Upgrade Database Engine](../../database-engine/install-windows/upgrade-database-engine.md)
9191
9292
## Additional resources
93-
[Database Migration Guide](https://aka.ms/datamigration)
93+
[Database Migration Guide](/data-migration/)

0 commit comments

Comments
 (0)