Skip to content

Commit acb5de9

Browse files
authored
Merge pull request MicrosoftDocs#9839 from MicrosoftDocs/master
4/12 PM Publish
2 parents ae33368 + d21012d commit acb5de9

18 files changed

Lines changed: 87 additions & 63 deletions

docs/linux/sql-server-linux-create-availability-group.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sudo systemctl restart mssql-server
6666

6767
An availability group uses TCP endpoints for communication. Under Linux, endpoints for an AG are only supported if certificates are used for authentication. This means that the certificate from one instance must be restored on all other instances that will be replicas participating in the same AG. The certificate process is required even for a configuration-only replica.
6868

69-
Creating endpoints and restoring certificates can only be done via Transact-SQL. You can use non- [!INCLUDE[ssnoversion-md](../includes/ssnoversion-md.md)]-generated certificates as well. You will also need a process to manage and replace any certificates that expire.
69+
Creating endpoints and restoring certificates can only be done via Transact-SQL. You can use non- [!INCLUDE[ssnoversion-md](../includes/ssnoversion-md.md)]-generated certificates as well. You will also need a process to manage and replace any certificates that expire.
7070

7171
> [!IMPORTANT]
7272
> If you plan to use the [!INCLUDE[ssmanstudiofull-md](../includes/ssmanstudiofull-md.md)] wizard to create the AG, you still need to create and restore the certificates by using Transact-SQL on Linux.
@@ -238,7 +238,7 @@ This example will create certificates for a three-node configuration. The instan
238238
GO
239239
```
240240
241-
10. Restore LinAGN1_Cert and LinAGN3_Cert on LinAGN2.
241+
10. Restore LinAGN1_Cert and LinAGN3_Cert on LinAGN2.
242242
243243
```SQL
244244
CREATE CERTIFICATE LinAGN1_Cert
@@ -252,8 +252,9 @@ This example will create certificates for a three-node configuration. The instan
252252
FROM FILE = '/var/opt/mssql/data/LinAGN3_Cert.cer';
253253
254254
GO
255+
```
255256
256-
11. Grant the logins associated with LinAG1 and LinAGN3 permission to connect to the endpoint on LinAGN2.
257+
11. Grant the logins associated with LinAG1 and LinAGN3 permission to connect to the endpoint on LinAGN2.
257258
258259
```SQL
259260
GRANT CONNECT ON ENDPOINT::AGEP TO LinAGN1_Login;
@@ -265,7 +266,7 @@ This example will create certificates for a three-node configuration. The instan
265266
GO
266267
```
267268
268-
12. Create the instance-level logins and users associated with LinAGN1 and LinAGN2 on LinAGN3.
269+
12. Create the instance-level logins and users associated with LinAGN1 and LinAGN2 on LinAGN3.
269270
270271
```SQL
271272
CREATE LOGIN LinAGN1_Login WITH PASSWORD = '<StrongPassword>';
@@ -279,7 +280,7 @@ This example will create certificates for a three-node configuration. The instan
279280
GO
280281
```
281282
282-
13. Restore LinAGN1_Cert and LinAGN2_Cert on LinAGN3.
283+
13. Restore LinAGN1_Cert and LinAGN2_Cert on LinAGN3.
283284
284285
```SQL
285286
CREATE CERTIFICATE LinAGN1_Cert
@@ -293,8 +294,9 @@ This example will create certificates for a three-node configuration. The instan
293294
FROM FILE = '/var/opt/mssql/data/LinAGN2_Cert.cer';
294295
295296
GO
297+
```
296298
297-
14. Grant the logins associated with LinAG1 and LinAGN2 permission to connect to the endpoint on LinAGN3.
299+
14. Grant the logins associated with LinAG1 and LinAGN2 permission to connect to the endpoint on LinAGN3.
298300
299301
```SQL
300302
GRANT CONNECT ON ENDPOINT::AGEP TO LinAGN1_Login;
@@ -411,7 +413,7 @@ This example shows how to create a two-replica AG that uses a configuration-only
411413
GO
412414
```
413415

414-
3. In a query window connected to the configuration only replica, join it to the AG.
416+
3. In a query window connected to the configuration only replica, join it to the AG.
415417

416418
```SQL
417419
ALTER AVAILABILITY GROUP [<AGName>] JOIN WITH (CLUSTER_TYPE = EXTERNAL);
@@ -534,7 +536,7 @@ A Pacemaker high availability cluster underlying [!INCLUDE[ssnoversion-md](../in
534536
1. In a query window connected to the first replica, execute the following:
535537

536538
```SQL
537-
CREATE LOGIN PMLogin WITH PASSWORD '<StrongPassword>';
539+
CREATE LOGIN PMLogin WITH PASSWORD ='<StrongPassword>';
538540
539541
GO
540542

docs/relational-databases/performance/best-practice-with-the-query-store.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.assetid: 5b13b5ac-1e4c-45e7-bda7-ebebe2784551
1313
author: julieMSFT
1414
ms.author: jrasnick
1515
manager: craigg
16-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
16+
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||= azure-sqldw-latest||>=sql-server-linux-2017||=azuresqldb-mi-current"
1717
---
1818
# Best Practice with the Query Store
1919
[!INCLUDE[appliesto-ss-asdb-asdw-xxx-md](../../includes/appliesto-ss-asdb-asdw-xxx-md.md)]

docs/relational-databases/performance/how-query-store-collects-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.assetid: 8d5eec36-0013-480a-9c11-183e162e4c8e
1313
author: julieMSFT
1414
ms.author: jrasnick
1515
manager: craigg
16-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
16+
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||= azure-sqldw-latest||>=sql-server-linux-2017||=azuresqldb-mi-current"
1717
---
1818
# How Query Store Collects Data
1919
[!INCLUDE[appliesto-ss-asdb-asdw-xxx-md](../../includes/appliesto-ss-asdb-asdw-xxx-md.md)]

docs/relational-databases/performance/query-store-usage-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.assetid: f5309285-ce93-472c-944b-9014dc8f001d
1313
author: julieMSFT
1414
ms.author: jrasnick
1515
manager: craigg
16-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
16+
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||= azure-sqldw-latest||>=sql-server-linux-2017||=azuresqldb-mi-current"
1717
---
1818
# Query Store Usage Scenarios
1919
[!INCLUDE[appliesto-ss-asdb-asdw-xxx-md](../../includes/appliesto-ss-asdb-asdw-xxx-md.md)]

docs/relational-databases/system-catalog-views/query-store-catalog-views-transact-sql.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Query Store Catalog Views (Transact-SQL) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "03/29/2016"
4+
ms.date: "04/12/2019"
55
ms.prod: sql
66
ms.prod_service: "database-engine, sql-database"
77
ms.reviewer: ""
@@ -16,10 +16,10 @@ ms.assetid: 43d5466a-89e2-4e59-b87e-a2a78e59a1de
1616
author: stevestein
1717
ms.author: sstein
1818
manager: craigg
19-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
19+
monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
2020
---
2121
# Query Store Catalog Views (Transact-SQL)
22-
[!INCLUDE[tsql-appliesto-ss2016-asdb-xxxx-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-xxxx-xxx-md.md)]
22+
[!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
2323

2424
This section contains the following catalog views.
2525

docs/relational-databases/system-catalog-views/sys-database-query-store-options-transact-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.assetid: 16b47d55-8019-41ff-ad34-1e0112178067
2121
author: stevestein
2222
ms.author: sstein
2323
manager: craigg
24-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
24+
monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
2525
---
2626
# sys.database_query_store_options (Transact-SQL)
2727
[!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]

docs/relational-databases/system-catalog-views/sys-query-context-settings-transact-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.assetid: 3c1887df-6bd8-491e-82fc-d25ad9589faf
2020
author: stevestein
2121
ms.author: sstein
2222
manager: craigg
23-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
23+
monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
2424
---
2525
# sys.query_context_settings (Transact-SQL)
2626
[!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]

docs/relational-databases/system-catalog-views/sys-query-store-plan-transact-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.assetid: b4d05439-6360-45db-b1cd-794f4a64935e
2121
author: stevestein
2222
ms.author: sstein
2323
manager: craigg
24-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
24+
monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
2525
---
2626
# sys.query_store_plan (Transact-SQL)
2727
[!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]

docs/relational-databases/system-catalog-views/sys-query-store-query-text-transact-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.assetid: f7032fa0-7c16-4492-bb82-685806c63a8c
2121
author: stevestein
2222
ms.author: sstein
2323
manager: craigg
24-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
24+
monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
2525
---
2626
# sys.query_store_query_text (Transact-SQL)
2727
[!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]

docs/relational-databases/system-catalog-views/sys-query-store-query-transact-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.assetid: bdee149e-7556-4fc3-8242-925dd4b7b6ac
2121
author: stevestein
2222
ms.author: sstein
2323
manager: craigg
24-
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
24+
monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
2525
---
2626
# sys.query_store_query (Transact-SQL)
2727
[!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]

0 commit comments

Comments
 (0)