Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit b550ef4

Browse files
author
Michael Blome
committed
Merge branch 'master' into mb-msdnlinks3
merging from remote master
2 parents f5af2bf + a144fdb commit b550ef4

5 files changed

Lines changed: 21 additions & 13 deletions

File tree

docs/2014/analysis-services/multidimensional-models/mdx/cube-space.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ WHERE Measures.[Internet Sales Amount]
5353
> [!NOTE]
5454
> Notice that 0 is used to designate the column axis, which is shorthand for axis(0) - which is the column axis.
5555
56-
The previous query only returns cells for members from each attribute hierarchy in the query that exist with each other. The previous query can also be written using the new * variant of the [* (Crossjoin) (MDX)](/sql/mdx/crossjoin-mdx) function.
56+
The previous query only returns cells for members from each attribute hierarchy in the query that exist with each other. The previous query can also be written using the new * variant of the [\* (Crossjoin) (MDX)](/sql/mdx/crossjoin-mdx) function.
5757

5858
```
5959
SELECT

docs/relational-databases/event-classes/auto-stats-event-class.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
title: "Auto Stats Event Class | Microsoft Docs"
1+
---
2+
title: "Auto Stats Event Class | Microsoft Docs"
23
ms.custom: ""
34
ms.date: "03/14/2017"
45
ms.prod: sql

docs/relational-databases/performance/intelligent-query-processing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ manager: craigg
1818
monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017"
1919
---
2020
# Intelligent query processing in SQL databases
21-
[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-xx-asdb-xxxx-xxx-md.md)]
21+
[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
2222

2323
The **Intelligent query processing** feature family includes features with broad impact that improve the performance of existing workloads with minimal implementation effort.
2424

docs/relational-databases/security/encryption/transparent-data-encryption-azure-sql.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Transparent data encryption for Azure SQL Database and Data Warehouse | Microsoft Docs"
33
description: "An overview of transparent data encryption for SQL Database and Data Warehouse. The document covers its benefits and the options for configuration, which includes service-managed transparent data encryption and Bring Your Own Key."
44
keywords:
5-
author: "becczhang"
5+
author: "aliceku"
66
manager: craigg
77
editor: ""
88
ms.prod:
@@ -12,7 +12,7 @@ ms.prod_service: sql-database, sql-data-warehouse
1212
ms.service: "sql-database"
1313
ms.tgt_pltfrm:
1414
ms.topic: conceptual
15-
ms.date: "07/09/2018"
15+
ms.date: "08/10/2018"
1616
ms.author: "aliceku"
1717
monikerRange: "= azuresqldb-current || = sqlallproducts-allversions"
1818
---
@@ -83,8 +83,8 @@ To configure transparent data encryption through PowerShell, you must be connect
8383
| Cmdlet | Description |
8484
| --- | --- |
8585
| [Set-AzureRmSqlDatabaseTransparentDataEncryption](/powershell/module/azurerm.sql/set-azurermsqldatabasetransparentdataencryption) |Enables or disables transparent data encryption for a database|
86-
| [Get-Azure-Rm-Sql-Database-Transparent-Data-Encryption](/powershell/module/azurerm.sql/get-azurermsqldatabasetransparentdataencryption) |Gets the transparent data encryption state for a database |
87-
| [Get-Azure-Rm-Sql-Database-Transparent-Data-Encryption-Activity](/powershell/module/azurerm.sql/get-azurermsqldatabasetransparentdataencryptionactivity) |Checks the encryption progress for a database |
86+
| [Get-AzureRmSqlDatabaseTransparentDataEncryption](/powershell/module/azurerm.sql/get-azurermsqldatabasetransparentdataencryption) |Gets the transparent data encryption state for a database |
87+
| [Get-AzureRmSqlDatabaseTransparentDataEncryptionActivity](/powershell/module/azurerm.sql/get-azurermsqldatabasetransparentdataencryptionactivity) |Checks the encryption progress for a database |
8888
| [Add-AzureRmSqlServerKeyVaultKey](/powershell/module/azurerm.sql/add-azurermsqlserverkeyvaultkey) |Adds a Key Vault key to a SQL Server instance |
8989
| [Get-AzureRmSqlServerKeyVaultKey](/powershell/module/azurerm.sql/get-azurermsqlserverkeyvaultkey) |Gets the Key Vault keys for a SQL server instance |
9090
| [Set-AzureRmSqlServerTransparentDataEncryptionProtector](/powershell/module/azurerm.sql/set-azurermsqlservertransparentdataencryptionprotector) |Sets the transparent data encryption protector for a SQL Server instance |

docs/sql-server/sql-server-technical-documentation.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "SQL Server Documentation | Microsoft Docs"
3-
ms.date: "08/08/2018"
3+
ms.date: "08/10/2018"
44
ms.prod: sql
55
ms.reviewer: ""
66
ms.suite: "sql"
@@ -32,25 +32,32 @@ SQL Server is a central part of the Microsoft data platform. SQL Server is an in
3232
::: moniker-end
3333

3434
::: moniker range="= sql-server-2016"
35-
SQL Server 2016 is a central part of the Microsoft data platform. SQL Server is an industry leader in operational database management systems (ODBMS). This documentation helps you install, configure, and use SQL Server on Windows. The content includes end-to-end examples, code samples, and videos. For SQL Server language topics, see [Language Reference](../t-sql/language-reference.md).
35+
SQL Server is a central part of the Microsoft data platform. SQL Server is an industry leader in operational database management systems (ODBMS). This documentation helps you install, configure, and use SQL Server on Windows. The content includes end-to-end examples, code samples, and videos. For SQL Server language topics, see [Language Reference](../t-sql/language-reference.md).
3636
::: moniker-end
3737

38+
<!-- Moniker assignments nicely designed so that exactly 1 of these next 3 little WhatsNew tables will be displayed
39+
at any one time, regardless of user's moniker choice.
40+
-->
41+
3842
::: moniker range="= sqlallproducts-allversions"
43+
|What's new | Release notes |
44+
|---------|---------|
45+
|[What's New in SQL Server 2017](../sql-server/what-s-new-in-sql-server-2017.md) | [SQL Server 2017 Release Notes](../sql-server/sql-server-2017-release-notes.md) |
46+
|[What's New in SQL Server 2016](../sql-server/what-s-new-in-sql-server-2016.md) | [SQL Server 2016 Release Notes](../sql-server/sql-server-2016-release-notes.md) |
47+
3948
![info_tip](../sql-server/media/info-tip.png) The SQL Server **2014** documentation is available [here](https://docs.microsoft.com/sql/2014-toc/index?view=sql-server-2014).
4049
::: moniker-end
4150

42-
::: moniker range="= sql-server-linux-2017 || = sql-server-2017 || = sqlallproducts-allversions"
51+
::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
4352
|What's new | Release notes |
4453
|---------|---------|
4554
|[What's New in SQL Server 2017](../sql-server/what-s-new-in-sql-server-2017.md) | [SQL Server 2017 Release Notes](../sql-server/sql-server-2017-release-notes.md) |
46-
| &nbsp; | &nbsp; |
4755
::: moniker-end
4856

49-
::: moniker range="=sql-server-2016 || = sqlallproducts-allversions"
57+
::: moniker range="=sql-server-2016"
5058
|What's new | Release notes |
5159
|---------|---------|
5260
|[What's New in SQL Server 2016](../sql-server/what-s-new-in-sql-server-2016.md) | [SQL Server 2016 Release Notes](../sql-server/sql-server-2016-release-notes.md) |
53-
| &nbsp; | &nbsp; |
5461
::: moniker-end
5562

5663
::: moniker range="= sql-server-2016 || = sqlallproducts-allversions"

0 commit comments

Comments
 (0)