Skip to content

Commit a092248

Browse files
MikeRayMSFTMikeRayMSFT
authored
Merge branch 'MicrosoftDocs:main' into sql-server-freshness-review-288442
2 parents 86dd2cc + 57b0dca commit a092248

369 files changed

Lines changed: 4501 additions & 8610 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.

‎.github/workflows/signoff-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
$GitHubHeaders.Add("Authorization","token $($AccessToken)")
7979
$GitHubHeaders.Add("User-Agent", "OfficeDocs")
8080

81-
$StatusHelpUrl = "https://dev.azure.com/msft-skilling/Content/_wiki/wikis/Database%20Docs/2358/Partner-publishing-workflow-pilot"
81+
$StatusHelpUrl = "https://dev.azure.com/msft-skilling/Content/_wiki/wikis/Database%20Docs/2358/Partner-publishing-workflow"
8282
$StatusCheckName = "PR signed off by content team"
8383
$Status = @{}
8484
$Status.Add("context", $StatusCheckName)

‎.openpublishing.redirection.azure-data-studio.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,11 @@
899899
"source_path": "docs/sql-operations-studio/what-is.md",
900900
"redirect_url": "/azure-data-studio/what-is-azure-data-studio",
901901
"redirect_document_id": false
902+
},
903+
{
904+
"source_path": "docs/relational-databases/security/encryption/always-encrypted-query-columns-ads.md",
905+
"redirect_url": "/sql/relational-databases/security/encryption/always-encrypted-query-columns-ssms",
906+
"redirect_document_id": false
902907
}
903908
]
904909
}

‎.openpublishing.redirection.data-migration.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path": "data-migration/sql-server/virtual-machines/database-migration-service.md",
55
"redirect_url": "/data-migration/sql-server/virtual-machines/database-migration-service-offline",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "data-migration/sql-server/managed-instance/database-migration-service.md",
10+
"redirect_url": "/sql/sql-server/azure-arc/migrate-to-azure-sql-managed-instance",
11+
"redirect_document_id": false
712
}
813
]
914
}

‎.openpublishing.redirection.json‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "docs/odbc/reference/introduction-to-odbc.md",
5+
"redirect_url": "/sql/odbc/reference/odbc-overview",
6+
"redirect_document_id": true
7+
},
38
{
49
"source_path": "docs/sql-server/applies-to-includes.md",
510
"redirect_url": "/sql/sql-server/sql-server-docs-contribute",
@@ -50810,6 +50815,106 @@
5081050815
"redirect_url": "/sql/machine-learning/concepts/security",
5081150816
"redirect_document_id": true
5081250817
},
50818+
{
50819+
"source_path": "docs/machine-learning/data-exploration/python-dataframe-pandas.md",
50820+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50821+
"redirect_document_id": false
50822+
},
50823+
{
50824+
"source_path": "docs/machine-learning/data-exploration/python-dataframe-sql-server.md",
50825+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50826+
"redirect_document_id": false
50827+
},
50828+
{
50829+
"source_path": "docs/machine-learning/data-exploration/python-plot-histogram.md",
50830+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50831+
"redirect_document_id": false
50832+
},
50833+
{
50834+
"source_path": "docs/machine-learning/tutorials/python-clustering-model.md",
50835+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50836+
"redirect_document_id": false
50837+
},
50838+
{
50839+
"source_path": "docs/machine-learning/tutorials/python-clustering-model-build.md",
50840+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50841+
"redirect_document_id": false
50842+
},
50843+
{
50844+
"source_path": "docs/machine-learning/tutorials/python-clustering-model-deploy.md",
50845+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50846+
"redirect_document_id": false
50847+
},
50848+
{
50849+
"source_path": "docs/machine-learning/tutorials/python-clustering-model-prepare-data.md",
50850+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50851+
"redirect_document_id": false
50852+
},
50853+
{
50854+
"source_path": "docs/machine-learning/tutorials/python-ski-rental-linear-regression.md",
50855+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50856+
"redirect_document_id": false
50857+
},
50858+
{
50859+
"source_path": "docs/machine-learning/tutorials/python-ski-rental-linear-regression-deploy-model.md",
50860+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50861+
"redirect_document_id": false
50862+
},
50863+
{
50864+
"source_path": "docs/machine-learning/tutorials/python-ski-rental-linear-regression-prepare-data.md",
50865+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50866+
"redirect_document_id": false
50867+
},
50868+
{
50869+
"source_path": "docs/machine-learning/tutorials/python-ski-rental-linear-regression-train-model.md",
50870+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50871+
"redirect_document_id": false
50872+
},
50873+
{
50874+
"source_path": "docs/machine-learning/tutorials/r-clustering-model-build.md",
50875+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50876+
"redirect_document_id": false
50877+
},
50878+
{
50879+
"source_path": "docs/machine-learning/tutorials/r-clustering-model-deploy.md",
50880+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50881+
"redirect_document_id": false
50882+
},
50883+
{
50884+
"source_path": "docs/machine-learning/tutorials/r-clustering-model-introduction.md",
50885+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50886+
"redirect_document_id": false
50887+
},
50888+
{
50889+
"source_path": "docs/machine-learning/tutorials/r-clustering-model-prepare-data.md",
50890+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50891+
"redirect_document_id": false
50892+
},
50893+
{
50894+
"source_path": "docs/machine-learning/tutorials/r-predictive-model-deploy.md",
50895+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50896+
"redirect_document_id": false
50897+
},
50898+
{
50899+
"source_path": "docs/machine-learning/tutorials/r-predictive-model-introduction.md",
50900+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50901+
"redirect_document_id": false
50902+
},
50903+
{
50904+
"source_path": "docs/machine-learning/tutorials/r-predictive-model-prepare-data.md",
50905+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50906+
"redirect_document_id": false
50907+
},
50908+
{
50909+
"source_path": "docs/machine-learning/tutorials/r-predictive-model-train.md",
50910+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50911+
"redirect_document_id": false
50912+
},
50913+
{
50914+
"source_path": "docs/machine-learning/package-management/install-additional-python-packages-on-sql-server.md",
50915+
"redirect_url": "/sql/machine-learning/concepts/extension-python",
50916+
"redirect_document_id": false
50917+
},
5081350918
{
5081450919
"source_path": "docs/advanced-analytics/connect/loopback-connection.md",
5081550920
"redirect_url": "/sql/machine-learning/connect/loopback-connection",
@@ -67590,6 +67695,11 @@
6759067695
"redirect_url": "/sql/relational-databases/security/authentication-access/authentication-microsoft-entra-create-users-with-nonunique-names",
6759167696
"redirect_document_id": false
6759267697
},
67698+
{
67699+
"source_path": "azure-sql/database/design-first-database-azure-data-studio.md",
67700+
"redirect_url": "/azure/azure-sql/database/design-first-database-visual-studio-code",
67701+
"redirect_document_id": false
67702+
},
6759367703
{
6759467704
"source_path": "docs/relational-databases/resource-governor/create-and-test-a-classifier-user-defined-function.md",
6759567705
"redirect_url": "/sql/relational-databases/resource-governor/resource-governor-walkthrough",
@@ -67728,6 +67838,36 @@
6772867838
"source_path": "docs/connect/python/pymssql/python-sql-driver-pymssql-quickstart.md",
6772967839
"redirect_url": "/sql/connect/python/mssql-python/python-sql-driver-mssql-python-quickstart",
6773067840
"redirect_document_id": false
67841+
},
67842+
{
67843+
"source_path": "docs/analytics-platform-system/tsql-language-elements.md",
67844+
"redirect_url": "/sql/analytics-platform-system/home-analytics-platform-system-aps-pdw?view=aps-pdw-2016-au7&preserve-view=true",
67845+
"redirect_document_id": false
67846+
},
67847+
{
67848+
"source_path": "docs/analytics-platform-system/tsql-statements.md",
67849+
"redirect_url": "/sql/analytics-platform-system/home-analytics-platform-system-aps-pdw?view=aps-pdw-2016-au7&preserve-view=true",
67850+
"redirect_document_id": false
67851+
},
67852+
{
67853+
"source_path": "docs/analytics-platform-system/tsql-system-views.md",
67854+
"redirect_url": "/sql/analytics-platform-system/home-analytics-platform-system-aps-pdw?view=aps-pdw-2016-au7&preserve-view=true",
67855+
"redirect_document_id": false
67856+
},
67857+
{
67858+
"source_path": "docs/t-sql/functions/string-functions-transact-sql.md",
67859+
"redirect_url": "/sql/t-sql/functions/functions#string-functions",
67860+
"redirect_document_id": false
67861+
},
67862+
{
67863+
"source_path": "docs/t-sql/functions/configuration-functions-transact-sql.md",
67864+
"redirect_url": "/sql/t-sql/functions/functions#configuration-functions",
67865+
"redirect_document_id": false
67866+
},
67867+
{
67868+
"source_path": "docs/connect/jdbc/programming-guide-for-jdbc-sql-driver.md",
67869+
"redirect_url": "/sql/connect/jdbc/connecting-to-sql-server-with-the-jdbc-driver",
67870+
"redirect_document_id": false
6773167871
}
6773267872
]
6773367873
}

‎azure-sql/database-watcher-manage.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ After you create and configure a watcher following the steps in this article, yo
4040

4141
To use database watcher, the following prerequisites are required.
4242

43-
- You need an active Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?icid=azurefreeaccount). You need to be a member of the **Contributor** role or the **Owner** role for the subscription or a resource group to be able to create resources.
43+
- You need an active Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn). You need to be a member of the **Contributor** role or the **Owner** role for the subscription or a resource group to be able to create resources.
4444

4545
- To configure and start a watcher, you need an existing SQL target: an Azure SQL database, elastic pool, or SQL managed instance.
4646
- If you don't already have an Azure SQL database created, visit [Quickstart: Create a single database](database/single-database-create-quickstart.md). Look for the option to use your offer to [Try Azure SQL Database for free](database/free-offer.md).

‎azure-sql/database/always-encrypted-enclaves-getting-started-sgx.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This tutorial teaches you how to get started with [Always Encrypted with secure
2525
2626
## Prerequisites
2727

28-
- An active Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?icid=azurefreeaccount). You need to be a member of the Contributor role or the Owner role for the subscription to be able to create resources and configure an attestation policy.
28+
- An active Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn). You need to be a member of the Contributor role or the Owner role for the subscription to be able to create resources and configure an attestation policy.
2929
- Optional, but recommended for storing your column master key for Always Encrypted: a key vault in Azure Key Vault. For information on how to create a key vault, see [Quickstart: Create a key vault using the Azure portal](/azure/key-vault/general/quick-create-portal).
3030
- If your key vault uses the access policy permissions model, make sure you have the following key permissions in the key vault: `get`, `list`, `create`, `unwrap key`, `wrap key`, `verify`, `sign`. For more information, see [Assign a Key Vault access policy](/azure/key-vault/general/assign-access-policy).
3131
- If you're using the Azure role-based access control (RBAC) permission model, make you sure you're a member of the [Key Vault Crypto Officer](/azure/role-based-access-control/built-in-roles#key-vault-crypto-officer) role for your key vault. See [Provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control](/azure/key-vault/general/rbac-migration).

‎azure-sql/database/always-encrypted-enclaves-getting-started-vbs.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This tutorial teaches you how to get started with [Always Encrypted with secure
2424
2525
## Prerequisites
2626

27-
- An active Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?icid=azurefreeaccount). You need to be a member of the Contributor role or the Owner role for the subscription to be able to create resources.
27+
- An active Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn). You need to be a member of the Contributor role or the Owner role for the subscription to be able to create resources.
2828
- Optional, but recommended for storing your column master key for Always Encrypted: a key vault in Azure Key Vault. For information on how to create a key vault, see [Quickstart: Create a key vault using the Azure portal](/azure/key-vault/general/quick-create-portal).
2929
- If your key vault uses the access policy permissions model, make sure you have the following key permissions in the key vault: `get`, `list`, `create`, `unwrap key`, `wrap key`, `verify`, `sign`. See [Assign a Key Vault access policy](/azure/key-vault/general/assign-access-policy).
3030
- If you're using the Azure role-based access control (RBAC) permission model, make you sure you're a member of the [Key Vault Crypto Officer](/azure/role-based-access-control/built-in-roles#key-vault-crypto-officer) role for your key vault. See [Provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control](/azure/key-vault/general/rbac-migration).

‎azure-sql/database/automated-backups-overview.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ You can choose one of the following storage redundancies for backups:
8484

8585
:::image type="content" source="media/automated-backups-overview/multi-paired-grs.svg" alt-text="Diagram showing the geo-redundant storage (GRS) option.":::
8686

87-
- **Geo-Zone redundant storage (GZRS)** (preview): Geo-zone-redundant storage (GZRS) combines the high availability provided by redundancy across availability zones (ZRS) with protection from regional outages provided by geo-replication (GRS). Copies your backups synchronously across three Azure availability zones in the primary region, and asynchronously three times to a single physical location in the [paired secondary region](/azure/reliability/cross-region-replication-azure#azure-cross-region-replication-pairings-for-all-geographies). This feature is currently in preview.
87+
- **Geo-Zone redundant storage (GZRS)**: Geo-zone-redundant storage (GZRS) combines the high availability provided by redundancy across availability zones (ZRS) with protection from regional outages provided by geo-replication (GRS). Copies your backups synchronously across three Azure availability zones in the primary region, and asynchronously three times to a single physical location in the [paired secondary region](/azure/reliability/cross-region-replication-azure#azure-cross-region-replication-pairings-for-all-geographies).
8888

8989
Microsoft recommends using GZRS for applications requiring maximum consistency, durability, and availability, excellent performance, and resilience for disaster recovery.
9090

‎azure-sql/database/azure-sql-dotnet-entity-framework-core-quickstart.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This quickstart describes how to connect an application to a database in Azure S
2323

2424
## Prerequisites
2525

26-
- An [Azure subscription](https://azure.microsoft.com/pricing/purchase-options/azure-account?icid=azurefreeaccountdotnet/).
26+
- An [Azure subscription](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2727
- A SQL database configured for authentication with Microsoft Entra ID ([formerly Azure Active Directory](/entra/fundamentals/new-name)). You can create one using the [Quickstart: Create a single database - Azure SQL Database](single-database-create-quickstart.md).
2828
- [.NET 9.0](https://dotnet.microsoft.com/download) or later.
2929
- [Visual Studio](https://visualstudio.microsoft.com/vs/) or later with the **ASP.NET and web development** workload.

‎azure-sql/database/azure-sql-dotnet-quickstart.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This quickstart describes how to connect an application to a database in Azure S
2222

2323
## Prerequisites
2424

25-
- An [Azure subscription](https://azure.microsoft.com/pricing/purchase-options/azure-account?icid=azurefreeaccountdotnet/).
25+
- An [Azure subscription](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2626
- An Azure SQL database configured for authentication with Microsoft Entra ID ([formerly Azure Active Directory](/entra/fundamentals/new-name)). You can create one using the [Create database quickstart](single-database-create-quickstart.md).
2727
- The latest version of the [Azure CLI](/cli/azure/get-started-with-azure-cli).
2828
- [Visual Studio](https://visualstudio.microsoft.com/vs/) or later with the **ASP.NET and web development** workload.

0 commit comments

Comments
 (0)