Skip to content

Commit 3676316

Browse files
authored
Merge pull request #6037 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents 329924e + c3f8af0 commit 3676316

21 files changed

Lines changed: 167 additions & 116 deletions

docs/database-engine/availability-groups/windows/always-on-policies-for-operational-issues-always-on-availability.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ manager: craigg
9999

100100
A user-defined policy can use any of the available PBM facets, including those used by the Always On predefined policies (see [Predefined Policies and Issues](#Always OnPBM), earlier in this topic). The Server facet provides the following properties for monitoring [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] health: (**IsHadrEnabled** and **HadrManagerStatus**). The Server facet also provides properties the following policies for monitoring the WSFC cluster configuration: **ClusterQuorumType**, and **ClusterQuorumState**.
101101

102-
For more information, see [The Always On Health Model Part 2 -- Extending the Health Model](http://blogs.msdn.com/b/sqlAlways On/archive/2012/02/13/extending-the-Always On-health-model.aspx) (a SQL Server Always On Team blog).
102+
For more information, see [The Always On Health Model Part 2 -- Extending the Health Model](https://blogs.msdn.microsoft.com/sqlalwayson/2012/02/13/the-alwayson-health-model-part-2-extending-the-health-model/) (a SQL Server Always On Team blog).
103103

104104
## <a name="RelatedTasks"></a> Related Tasks
105105

@@ -117,9 +117,9 @@ manager: craigg
117117

118118
## <a name="RelatedContent"></a> Related Content
119119

120-
- [The Always On Health Model Part 1 -- Health Model Architecture](http://blogs.msdn.com/b/sqlAlways On/archive/2012/02/13/extending-the-Always On-health-model.aspx)
120+
- [The Always On Health Model Part 1 -- Health Model Architecture](https://blogs.msdn.microsoft.com/sqlalwayson/2012/02/08/the-alwayson-health-model-part-1-health-model-architecture/)
121121

122-
- [The Always On Health Model Part 2 -- Extending the Health Model](http://blogs.msdn.com/b/sqlAlways On/archive/2012/02/13/extending-the-Always On-health-model.aspx)
122+
- [The Always On Health Model Part 2 -- Extending the Health Model](https://blogs.msdn.microsoft.com/sqlalwayson/2012/02/13/the-alwayson-health-model-part-2-extending-the-health-model/)
123123

124124
- [Microsoft SQL Server Always On Solutions Guide for High Availability and Disaster Recovery](http://go.microsoft.com/fwlink/?LinkId=227600)
125125

docs/relational-databases/databases/attach-a-database.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ We don't recommend using detach and attach for Backup and Recovery. There are no
159159
160160
## See Also
161161
[CREATE DATABASE &#40;SQL Server Transact-SQL&#41;](../../t-sql/statements/create-database-sql-server-transact-sql.md)
162-
<br>[Manage metadata when making a database available on another server](/manage-metadata-when-making-a-database-available-on-another-server.md)
162+
<br>[Manage metadata when making a database available on another server](manage-metadata-when-making-a-database-available-on-another-server.md)
163163
[Detach a Database](../../relational-databases/databases/detach-a-database.md)
164164
165165

docs/relational-databases/databases/rename-a-database.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: "Rename a Database | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/20/2017"
@@ -42,7 +42,7 @@ monikerRange: "= azuresqldb-current || >= sql-server-2016 || = sqlallproducts-al
4242
- **Follow Up:** [After renaming a database](#FollowUp)
4343

4444
> [!NOTE]
45-
> To rename a database in Azure SQL Database, use the [ALTER DATABASE (Azure SQL Database)](../../t-sql/statements/alter-database-azure-sql-database.md) statement. To rename a database in Azure SQL Data Warehouse or Parallel Data Warehouse, use the [RENAME (Transact-SQL)](/t-sql/statements/rename-transact-sql) statement.
45+
> To rename a database in Azure SQL Database, use the [ALTER DATABASE (Azure SQL Database)](../../t-sql/statements/alter-database-azure-sql-database.md) statement. To rename a database in Azure SQL Data Warehouse or Parallel Data Warehouse, use the [RENAME (Transact-SQL)](../../t-sql/statements/rename-transact-sql.md) statement.
4646
4747
## <a name="BeforeYouBegin"></a> Before You Begin
4848

docs/relational-databases/databases/tempdb-database.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: "tempdb Database | Microsoft Docs"
33
description: This topic provides details regarding the configuration and use of the tempdb database in SQL Server and Azure SQL Database
44
ms.custom: "P360"
@@ -130,7 +130,7 @@ Operations within **tempdb** are minimally logged so that transactions can be ro
130130

131131
### tempdb sizes for vCore-based service tiers
132132

133-
See vCore-based resource limits](https://review.docs.microsoft.com/azure/sql-database/sql-database-vcore-resource-limits)
133+
See [vCore-based resource limits](https://docs.microsoft.com/azure/sql-database/sql-database-vcore-resource-limits)
134134

135135
## Restrictions
136136
The following operations cannot be performed on the **tempdb** database:

docs/relational-databases/security/encryption/rotate-always-encrypted-keys-using-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: "Rotate Always Encrypted Keys using PowerShell | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "05/17/2017"
@@ -308,7 +308,7 @@ You can rotate a column encryption key using an offline or an online approach. T
308308
|Step 3. Authenticate to Azure, if your column master key (protecting the column encryption key, to be rotated), is stored in Azure Key Vault. | [Add-SqlAzureAuthenticationContext](https://docs.microsoft.com/powershell/sqlserver/sqlserver/vlatest/add-sqlazureauthenticationcontext) | Yes | No
309309
|Step 4. Generate a new column encryption key, encrypt it with the column master key and create column encryption key metadata in the database. | [New-SqlColumnEncryptionKey](https://docs.microsoft.com/powershell/sqlserver/sqlserver/vlatest/new-sqlcolumnencryptionkey)<br><br>**Note:** Use a variation of the cmdlet that internally generates and encrypts a column encryption key.<br>Under the covers this cmdlet issues the [CREATE COLUMN ENCRYPTION KEY (Transact-SQL)](../../../t-sql/statements/create-column-encryption-key-transact-sql.md) statement to create the key metadata. | Yes | Yes
310310
|Step 5. Find all columns encrypted with the old column encryption key. | [SQL Server Management Objects (SMO) Programming Guide](../../../relational-databases/server-management-objects-smo/sql-server-management-objects-smo-programming-guide.md) | No | Yes
311-
|Step 6. Create a *SqlColumnEncryptionSettings* object for each impacted column. SqlColumnMasterKeySettings is an object that exists in memory (in PowerShell). It specifies the target encryption scheme for a column. In this case, the object should specify the impacted column should be encrypted using the new column encryption key. | [New-SqlColumnEncryptionSettings](https://docs.microsoft.com/powershell/sqlserver/sqlserver/vlatest/new-sqlcolumnencryptionkeysettings) | No | No
311+
|Step 6. Create a *SqlColumnEncryptionSettings* object for each impacted column. SqlColumnMasterKeySettings is an object that exists in memory (in PowerShell). It specifies the target encryption scheme for a column. In this case, the object should specify the impacted column should be encrypted using the new column encryption key. | [New-SqlColumnEncryptionSettings](https://docs.microsoft.com/powershell/sqlserver/sqlserver/vlatest/new-sqlcolumnencryptionsettings) | No | No
312312
|Step 7. Re-encrypt the columns, identified in step 5, using the new column encryption key. | [Set-SqlColumnEncryption](https://docs.microsoft.com/powershell/sqlserver/sqlserver/vlatest/set-sqlcolumnencryption)<br><br>**Note:** This step may take a long time. Your applications mill not be able to access the tables through the entire operation or a portion of it, depending on the approach (online vs. offline), you select. | Yes | Yes
313313
|Step 8. Remove the metadata for the old column encryption key. | [Remove-SqlColumnEncryptionKey](https://docs.microsoft.com/powershell/sqlserver/sqlserver/vlatest/remove-sqlcolumnencryptionkey) | No | Yes
314314

docs/relational-databases/system-stored-procedures/xp-logevent-transact-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ xp_logevent { error_number , 'message' } [ , 'severity' ]
6565
The following example logs the message, with variables passed to the message in the Windows Event Viewer.
6666

6767
```
68-
DECLARE @@TABNAME varchar(30, @@USERNAME varchar(30),DECLARE @@MESSAGE varchar(255);
68+
DECLARE @@TABNAME varchar(30), @@USERNAME varchar(30),DECLARE @@MESSAGE varchar(255);
6969
SET @@TABNAME = 'customers';
7070
SET @@USERNAME = USER_NAME();
7171
SELECT @@MESSAGE = 'The table ' + @@TABNAME + ' is not owned by the user

docs/sql-operations-studio/tutorial-backup-restore-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ After clicking **Backup**, the **Backup database** dialog disappears and the bac
7272

7373
4. Click **Restore**
7474

75-
5. To view the status of the restore operation, click **CTRL+T** to open the **Task History** sidebar.
75+
5. To view the status of the restore operation, press **CTRL+T** to open the **Task History** sidebar.
7676

7777
![restore](./media/tutorial-backup-restore-sql-server/task-history-restore.png)
7878

docs/t-sql/data-types/TOC.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# [Conversion](data-type-conversion-database-engine.md)
44
# [Precedence](data-type-precedence-transact-sql.md)
55
# [Synonyms](data-type-synonyms-transact-sql.md)
6-
# [Precision, Scale, and Length](precision-scale-and-length-transact-sql.md)
7-
# [bit](bit-transact-sql.md)
6+
# [Precision, Scale, and Length](precision-scale-and-length-transact-sql.md)
87
# [cursor](cursor-transact-sql.md)
98
# [Date and time](date-and-time-types.md)
109
## [date](date-transact-sql.md)
@@ -27,6 +26,7 @@
2726
## [Write (Database Engine)](write-database-engine.md)
2827

2928
# [Numeric](numeric-types.md)
29+
## [bit](bit-transact-sql.md)
3030
## [decimal and numeric](decimal-and-numeric-transact-sql.md)
3131
## [float and real](float-and-real-transact-sql.md)
3232
## [int, bigint, smallint, and tinyint](int-bigint-smallint-and-tinyint-transact-sql.md)

0 commit comments

Comments
 (0)