Skip to content

Commit ef3f905

Browse files
authored
Merge pull request #26131 from MicrosoftDocs/main
2/21 AM Publish
2 parents 0dc771a + a3d1b60 commit ef3f905

9 files changed

Lines changed: 49 additions & 40 deletions

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

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -184,21 +184,23 @@ In this step, you'll create and configure an attestation provider in Microsoft A
184184
1. Set **Policy Format** to **Text**. Leave **Policy options** set to **Enter policy**.
185185
1. In the **Policy text** field, replace the default policy with the below policy. For information about the below policy, see [Create and configure an attestation provider](always-encrypted-enclaves-configure-attestation.md#create-and-configure-an-attestation-provider).
186186

187-
```output
188-
version= 1.1;
189-
configurationrules
190-
{
191-
=> issueproperty(type="x-ms-sgx-tcbidentifier", value="azuredefault");
192-
};
193-
authorizationrules
194-
{
195-
[ type=="x-ms-sgx-is-debuggable", value==false ]
196-
&& [ type=="x-ms-sgx-product-id", value==4639 ]
197-
&& [ type=="x-ms-sgx-svn", value>= 2 ]
198-
&& [ type=="x-ms-sgx-mrsigner", value=="e31c9e505f37a58de09335075fc8591254313eb20bb1a27e5443cc450b6e33e5"]
199-
=> permit();
200-
};
201-
```
187+
188+
```output
189+
version= 1.1;
190+
configurationrules
191+
{
192+
=> issueproperty(type="x-ms-sgx-tcbidentifier", value="azuredefault");
193+
};
194+
authorizationrules
195+
{
196+
[ type=="x-ms-sgx-is-debuggable", value==false ]
197+
&& [ type=="x-ms-sgx-product-id", value==4639 ]
198+
&& [ type=="x-ms-sgx-svn", value>= 2 ]
199+
&& [ type=="x-ms-sgx-mrsigner", value=="e31c9e505f37a58de09335075fc8591254313eb20bb1a27e5443cc450b6e33e5"]
200+
=> permit();
201+
};
202+
203+
```
202204

203205
1. Select **Save**.
204206

@@ -210,18 +212,23 @@ In this step, you'll create and configure an attestation provider in Microsoft A
210212

211213
1. Copy the below attestation policy and save the policy in a text file (txt). For information about the below policy, see [Create and configure an attestation provider](always-encrypted-enclaves-configure-attestation.md#create-and-configure-an-attestation-provider).
212214

213-
```output
214-
version= 1.0;
215-
authorizationrules
216-
{
217-
[ type=="x-ms-sgx-is-debuggable", value==false ]
218-
&& [ type=="x-ms-sgx-product-id", value==4639 ]
219-
&& [ type=="x-ms-sgx-svn", value>= 2 ]
220-
&& [ type=="x-ms-sgx-mrsigner", value=="e31c9e505f37a58de09335075fc8591254313eb20bb1a27e5443cc450b6e33e5"]
221-
=> permit();
222-
};
223-
```
224215

216+
```output
217+
version= 1.1;
218+
configurationrules
219+
{
220+
=> issueproperty(type="x-ms-sgx-tcbidentifier", value="azuredefault");
221+
};
222+
authorizationrules
223+
{
224+
[ type=="x-ms-sgx-is-debuggable", value==false ]
225+
&& [ type=="x-ms-sgx-product-id", value==4639 ]
226+
&& [ type=="x-ms-sgx-svn", value>= 2 ]
227+
&& [ type=="x-ms-sgx-mrsigner", value=="e31c9e505f37a58de09335075fc8591254313eb20bb1a27e5443cc450b6e33e5"]
228+
=> permit();
229+
};
230+
231+
```
225232
1. Create an attestation provider.
226233

227234
```powershell

azure-sql/managed-instance/data-virtualization-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn about data virtualization capabilities of Azure SQL Managed I
55
author: MladjoA
66
ms.author: mlandzic
77
ms.reviewer: mathoma, wiassaf
8-
ms.date: 01/31/2023
8+
ms.date: 02/21/2023
99
ms.service: sql-managed-instance
1010
ms.subservice: service-overview
1111
ms.topic: conceptual
@@ -357,7 +357,7 @@ CREATE EXTERNAL TABLE tbl_TaxiRides(
357357
WITH (
358358
LOCATION = 'yellow/puYear=*/puMonth=*/*.parquet',
359359
DATA_SOURCE = NYCTaxiExternalDataSource,
360-
FILE_FORMAT = MyFileFormat
360+
FILE_FORMAT = DemoFileFormat
361361
);
362362
GO
363363
```
@@ -448,7 +448,7 @@ The syntax for creating statistics on external tables resembles the one used for
448448

449449
```sql
450450
CREATE STATISTICS sVendor
451-
ON tbl_TaxiRides (vendor_id)
451+
ON tbl_TaxiRides (vendorID)
452452
WITH FULLSCAN, NORECOMPUTE;
453453
```
454454

docs/connect/oledb/oledb-driver-for-sql-server-known-issues.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: Learn about known issues and fixes for the Microsoft OLE DB Driver
44
author: David-Engel
55
ms.author: v-davidengel
66
ms.date: 02/07/2023
7-
ms.prod: sql
8-
ms.technology: connectivity
7+
ms.service: sql
8+
ms.subservice: connectivity
99
ms.topic: reference
1010
---
1111
# Microsoft OLE DB Driver for SQL Server known issues

docs/includes/gdpr-hybrid-note.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ description: include file
44
author: eross-msft
55
ms.author: lizross
66
ms.date: 05/01/2018
7-
ms.prod: reporting-services
8-
ms.service:
7+
ms.service: reporting-services
98
ms.topic: include
109
ms.custom: include file
1110
---

docs/includes/gdpr-intro-sentence.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ description: include file
44
author: eross-msft
55
ms.author: lizross
66
ms.date: 05/01/2018
7-
ms.prod: reporting-services
8-
ms.service:
7+
ms.service: reporting-services
98
ms.topic: include
109
ms.custom: include file
1110
---

docs/sql-server/azure-arc/includes/azure-arc-data-regions.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@ author: MikeRayMSFT
33
ms.author: mikeray
44
ms.date: 02/10/2023
55
ms.topic: include
6-
ms.prod: sql
6+
ms.service: sql
77
ms.custom: references_regions
88
---
99

1010
Arc-enabled SQL Server is available in the following regions:
1111

1212
- East US
1313
- East US 2
14+
- West US
1415
- West US 2
16+
- West US 3
1517
- Central US
18+
- North Central US
1619
- South Central US
20+
- Canada Central
1721
- UK South
1822
- France Central
1923
- West Europe
@@ -22,4 +26,4 @@ Arc-enabled SQL Server is available in the following regions:
2226
- Korea Central
2327
- East Asia
2428
- Southeast Asia
25-
- Australia East
29+
- Australia East

docs/sql-server/azure-arc/includes/license-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ author: MikeRayMSFT
33
ms.author: mikeray
44
ms.date: 02/10/2023
55
ms.topic: include
6-
ms.prod: sql
6+
ms.service: sql
77
---
88

99
The following table identifies features enabled depending on license type:

docs/sql-server/azure-arc/troubleshoot-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: MikeRayMSFT #Required; your GitHub user alias — correct capitalization
55
ms.author: mikeray #Required; Microsoft alias of the author.
66
ms.topic: troubleshooting-general #Required; leave this attribute/value as-is.
77
ms.date: 02/01/2023 #Required; enter the date in the mm/dd/yyyy format.
8-
ms.prod: sql
8+
ms.service: sql
99
---
1010

1111
# Troubleshoot Azure extension for SQL Server

docs/sql-server/install/uninstall-reporting-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Uninstall Reporting Services | Microsoft Docs"
33
description: This article describes how to uninstall Reporting Services, which does not remove content you created or configuration you have modified.
44
ms.custom: ""
55
ms.date: "03/01/2017"
6-
ms.prod: reporting-services
6+
ms.service: reporting-services
77
ms.reviewer: ""
88
ms.topic: conceptual
99
author: maggiesMSFT

0 commit comments

Comments
 (0)