Skip to content

Commit 54be012

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-arcee-ga
2 parents 5596ed8 + 06808b9 commit 54be012

423 files changed

Lines changed: 11003 additions & 1440 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: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59294,11 +59294,6 @@
5929459294
"source_path": "docs/relational-databases/security/encryption/always-encrypted-enclaves-query-columns-ssms.md",
5929559295
"redirect_url": "/sql/relational-databases/security/encryption/always-encrypted-enclaves-query-columns",
5929659296
"redirect_document_id": true
59297-
},
59298-
{
59299-
"source_path": "docs/ssms/support-policy.md",
59300-
"redirect_url": "/sql/ssms/download-sql-server-management-studio-ssms",
59301-
"redirect_document_id": false
5930259297
}
5930359298
]
5930459299
}

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/azdata/install/deploy-install-azdata-installer.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.technology: big-data-cluster
1515

1616
[!INCLUDE [azdata](../../includes/applies-to-version/azdata.md)]
1717

18-
This article describes how to install `azdata` on Windows with an installer. Use `azdata` to manage SQL Server Big Data Clusters or Azure Arc enabled data services.
18+
This article describes how to install `azdata` on Windows with an installer. Use `azdata` to manage SQL Server Big Data Clusters.
1919

2020
## Steps to Install `azdata` with the Microsoft Windows Installer
2121

@@ -38,5 +38,3 @@ The program to uninstall is called `Azure Data CLI` . Select this application, t
3838
## Next steps
3939

4040
For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md)
41-
42-
Use `azdata` with [Azure Arc enabled data services](/azure/azure-arc/data/)

docs/azdata/install/deploy-install-azdata-linux-package.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,3 @@ sudo apt-get update && sudo apt-get install --only-upgrade -y azdata-cli
111111
## Next steps
112112

113113
For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
114-
115-
Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)

docs/azdata/install/deploy-install-azdata-macos.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,3 @@ brew uninstall azdata-cli
5959

6060
For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
6161

62-
Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)

docs/azdata/install/deploy-install-azdata-pip.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ titleSuffix:
44
description: Learn how to install the azdata tool with pip.
55
author: MikeRayMSFT
66
ms.author: mikeray
7-
ms.reviewer: mihaelab
8-
ms.date: 09/30/2020
7+
ms.reviewer: danibunny
8+
ms.date: 07/29/2021
99
ms.topic: conceptual
1010
ms.prod: sql
1111
ms.technology: big-data-cluster
@@ -22,15 +22,15 @@ This article describes how to install the [!INCLUDE [azure-data-cli-azdata](../.
2222
2323
## <a id="prerequisites"></a> Prerequisites
2424

25-
`azdata` is a command-line utility written in Python that enables cluster administrators to bootstrap and manage data resources via REST APIs. The minimum Python version required is v3.5. `pip` is required to download and install the `azdata` tool. The instructions below provide examples for Windows, Linux (Ubuntu) and macOS/OS X. For installing Python on other platforms, see the [Python documentation](https://wiki.python.org/moin/BeginnersGuide/Download). In addition, install and update the latest version of `requests` Python package:
25+
`azdata` is a command-line utility written in Python that enables cluster administrators to bootstrap and manage data resources via REST APIs. The minimum Python version required is v3.6. `pip` is required to download and install the `azdata` tool. The instructions below provide examples for Windows, Linux (Ubuntu) and macOS/OS X. For installing Python on other platforms, see the [Python documentation](https://wiki.python.org/moin/BeginnersGuide/Download). In addition, install and update the latest version of `requests` Python package:
2626

2727
```bash
2828
pip3 install -U requests
2929
```
3030

3131
## <a id="windows"></a> Windows `azdata` installation
3232

33-
1. On a Windows client, download the necessary Python package from [https://www.python.org/downloads/](https://www.python.org/downloads/). For python 3.5.3 and later, pip3 is also installed when you install Python.
33+
1. On a Windows client, download the necessary Python package from [https://www.python.org/downloads/](https://www.python.org/downloads/). For python 3.6 and later, pip3 is also installed when you install Python.
3434

3535
> [!TIP]
3636
> When installing Python3, select to add Python to your `PATH`. If you do not, you can later find where pip3 is located and manually add it to your `PATH`.
@@ -56,7 +56,7 @@ pip3 install -U requests
5656

5757
## <a id="linux"></a> Linux `azdata` installation
5858

59-
On Linux, you must install Python 3.5 and then upgrade pip. The following example shows the commands that would work for Ubuntu. For other Linux platforms, see the [Python documentation](https://wiki.python.org/moin/BeginnersGuide/Download).
59+
On Linux, you must install Python 3.6 and then upgrade pip. The following example shows the commands that would work for Ubuntu. For other Linux platforms, see the [Python documentation](https://wiki.python.org/moin/BeginnersGuide/Download).
6060

6161
1. Install the necessary Python packages:
6262

@@ -134,4 +134,3 @@ To install `azdata` on macOS or OS X complete these steps. For each step, run th
134134

135135
For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
136136

137-
Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)

docs/azdata/install/deploy-install-azdata-yum.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,3 @@ sudo yum update azdata-cli
9090
## Next steps
9191

9292
For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
93-
94-
Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)

docs/azdata/install/deploy-install-azdata-zypper.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,3 @@ sudo zypper removerepo azdata-cli
7878
## Next steps
7979

8080
For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
81-
82-
Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)

docs/azdata/install/deploy-install-azdata.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,3 @@ To find your installed version and see if you need to update, run `azdata --vers
3737
## Next steps
3838

3939
Use azdata with Big Data Clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
40-
41-
Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)

docs/azdata/reference/reference-azdata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The following article provides reference for the **sql** commands in the **azdat
2121

2222
|Command|Description|
2323
| --- | --- |
24-
|[azdata arc](reference-azdata-arc.md) | Commands for using Azure Arc for Azure data services. |
24+
|[azdata arc](/azure/azure-arc/data/reference/overview) | Commands for using Azure Arc for Azure data services. |
2525
|[azdata sql](reference-azdata-sql.md) | The SQL DB CLI allows the user to interact with SQL Server via T-SQL. |
2626
[azdata login](#azdata-login) | Log in to the cluster's controller endpoint and set its namespace as your active context. To use a password on login, you must set the AZDATA_PASSWORD environment variable.
2727
[azdata logout](#azdata-logout) | Log out of cluster.

0 commit comments

Comments
 (0)