Skip to content

Commit 5871b35

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/sql-docs-pr into release-fabric-mirroring-pupr
2 parents badfc9f + a84dc0f commit 5871b35

3,124 files changed

Lines changed: 24333 additions & 20586 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/stale.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Mark stale issues and pull requests
22

3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
37
on:
48
schedule:
59
- cron: "0 */6 * * *"

.openpublishing.redirection.azure-sql.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@
669669
"source_path_from_root": "/azure-sql/database/service-tiers-vcore.md",
670670
"redirect_url": "/azure/azure-sql/database/service-tiers-sql-database-vcore",
671671
"redirect_document_id": false
672-
},
672+
},
673673
{
674674
"source_path_from_root": "/azure-sql/managed-instance/management-endpoint-verify-built-in-firewall.md",
675675
"redirect_url": "/azure/azure-sql/managed-instance/connectivity-architecture-overview",
@@ -679,17 +679,17 @@
679679
"source_path_from_root": "/azure-sql/managed-instance/scripts/restore-geo-backup-cli.md",
680680
"redirect_url": "/azure/azure-sql/managed-instance/scripts/restore-geo-backup",
681681
"redirect_document_id": false
682-
},
682+
},
683683
{
684684
"source_path_from_root": "/azure-sql/database/elastic-jobs-migrate.md",
685685
"redirect_url": "/azure/azure-sql/database/job-automation-overview",
686686
"redirect_document_id": false
687-
},
687+
},
688688
{
689689
"source_path_from_root": "/azure-sql/virtual-machines/windows/sql-agent-extension-manually-register-single-vm.md#repair-extension",
690690
"redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-agent-extension-troubleshoot-known-issues#repair-extension",
691691
"redirect_document_id": false
692-
},
692+
},
693693
{
694694
"source_path_from_root": "/azure-sql/database/sql-database-vulnerability-assessment-rules.md",
695695
"redirect_url": "/azure/defender-for-cloud/sql-azure-vulnerability-assessment-rules",
@@ -711,4 +711,4 @@
711711
"redirect_document_id": false
712712
}
713713
]
714-
}
714+
}

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41330,6 +41330,11 @@
4133041330
"redirect_url": "/sql/dma/dma-consolidatereports",
4133141331
"redirect_document_id": false
4133241332
},
41333+
{
41334+
"source_path": "docs/sql-server/azure-arc/connect-at-scale-policy.md",
41335+
"redirect_url": "/sql/sql-server/azure-arc/automatically-connect",
41336+
"redirect_document_id": false
41337+
},
4133341338
{
4133441339
"source_path": "docs/sql-server/azure-arc/connect-at-scale-autodeploy.md",
4133541340
"redirect_url": "/sql/sql-server/azure-arc/manage-autodeploy",
@@ -59699,6 +59704,11 @@
5969959704
"source_path": "docs/ssms/f1-help/connect-to-server-database-engine.md",
5970059705
"redirect_url": "/sql/ssms/f1-help/connect-to-server-login-page-database-engine",
5970159706
"redirect_document_id": false
59707+
},
59708+
{
59709+
"source_path": "docs/relational-databases/performance/intelligent-query-processing-feedback.md",
59710+
"redirect_url": "/sql/relational-databases/performance/intelligent-query-processing-memory-grant-feedback",
59711+
"redirect_document_id": false
5970259712
}
5970359713
]
5970459714
}

azure-sql/database/active-geo-replication-security-configure.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ WITH PASSWORD = '<login password>',
8686
SID = 0x1234 /*replace 0x1234 with the desired login SID*/
8787
```
8888

89+
On the target server, do not create a new login with the server admin SID from the source. Instead make the target's server admin login a database principal in the database, such as db_owner or user.
90+
8991
> [!NOTE]
9092
> If you want to grant user access to the secondary, but not to the primary, you can do that by altering the user login on the primary server by using the following syntax.
9193
>

azure-sql/database/authentication-aad-configure.md

Lines changed: 150 additions & 151 deletions
Large diffs are not rendered by default.

azure-sql/database/authentication-aad-service-principal-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ To register your application:
176176
1. You'll also need to create a client secret for signing in. Follow the guide here to [upload a certificate or create a secret for signing in](/azure/active-directory/develop/howto-create-service-principal-portal#authentication-two-options).
177177

178178
1. Record the following from your application registration. It should be available from your **Overview** pane:
179-
- **Application ID**
179+
- **Application (client) ID**
180180
- **Tenant ID** - This should be the same as before
181181

182182
In this tutorial, we'll be using *AppSP* as our main service principal, and *myapp* as the second service principal user that will be created in Azure SQL by *AppSP*. You'll need to create two applications, *AppSP* and *myapp*.
@@ -226,7 +226,7 @@ Once a service principal is created in Microsoft Entra ID, create the user in SQ
226226
1. Use the following script to create a Microsoft Entra service principal user *myapp* using the service principal *AppSP*.
227227
228228
- Replace `<TenantId>` with your `TenantId` gathered earlier.
229-
- Replace `<ClientId>` with your `ClientId` gathered earlier.
229+
- Replace `<ClientId>` with your `Application ID` gathered earlier.
230230
- Replace `<ClientSecret>` with your client secret created earlier.
231231
- Replace `<server name>` with your SQL logical server name. If your server name is `myserver.database.windows.net`, replace `<server name>` with `myserver`.
232232
- Replace `<database name>` with your SQL Database name.

0 commit comments

Comments
 (0)