Skip to content

Commit afb7f63

Browse files
mikeblomemikeblome
authored
Merge branch 'master' into mb-make-relative
2 parents e5fb01b + 80fa921 commit afb7f63

55 files changed

Lines changed: 2417 additions & 346 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.

‎.openpublishing.redirection.json‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,12 +1911,12 @@
19111911
"redirect_document_id":false
19121912
},
19131913
{
1914-
"source_path": "docs/sql/relational-databases/security/encryption/transparent-data-encryption-with-azure-sql-database.md",
1914+
"source_path": "docs/relational-databases/security/encryption/transparent-data-encryption-with-azure-sql-database.md",
19151915
"redirect_url": "/sql/relational-databases/security/encryption/transparent-data-encryption-azure-sql",
19161916
"redirect_document_id": false
19171917
},
19181918
{
1919-
"source_path": "docs/sql/relational-databases/security/encryption/transparent-data-encryption-tde.md",
1919+
"source_path": "docs/relational-databases/security/encryption/transparent-data-encryption-tde.md",
19201920
"redirect_url": "/sql/relational-databases/security/encryption/transparent-data-encryption",
19211921
"redirect_document_id": false
19221922
},
@@ -3054,11 +3054,6 @@
30543054
"source_path": "docs/reporting-services/report-server-sharepoint/report-viewer-web-part-on-a-sharepoint-site.md",
30553055
"redirect_url": "/sql/reporting-services/report-server-sharepoint/deploy-report-viewer-web-part",
30563056
"redirect_document_id": false
3057-
},
3058-
{
3059-
"source_path": "docs/relational-databases/security/encryption/transparent-data-encryption-tde.md",
3060-
"redirect_url": "/sql/relational-databases/security/encryption/transparent-data-encryption",
3061-
"redirect_document_id": false
30623057
}
30633058
]
3064-
}
3059+
}

‎docs/analysis-services/what-s-new-in-sql-server-analysis-services-2017.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To upgrade an existing tabular model in SSDT, in Solution Explorer, right-click
4141

4242
![AS_Model_Properties](../analysis-services/media/as-model-properties.png)
4343

44-
It's important to keep in mind, once you upgrade an existing model to 1400, you can't downgrade. Be sure to keep a backup of your 1200 model database, just in-case.
44+
It's important to keep in mind, once you upgrade an existing model to 1400, you can't downgrade. Be sure to keep a backup of your 1200 model database.
4545

4646
## Modern Get Data experience
4747
When it comes to ingesting data from data sources into your tabular models, SQL Server Data Tools (SSDT) introduces the modern **Get Data** experience for models at the 1400 compatibility level. This new feature is based on similar functionality in Power BI Desktop and Microsoft Excel 2016. The modern Get Data experience provides immense data transformation and data mashup capabilities by using the Get Data query builder and M expressions.
@@ -235,7 +235,7 @@ Filtered Sales:=CALCULATE (
235235
```
236236

237237
## Additional improvements
238-
In addition to all the new features, Analysis Services, SSDT, and SSMS also include to following improvements:
238+
In addition to all the new features, Analysis Services, SSDT, and SSMS also include the following improvements:
239239

240240
* Hierarchy and column reuse surfaced in more helpful locations in the Power BI field list.
241241
* Date relationships to easily create relationships to date dimensions based on date fields.
@@ -249,4 +249,4 @@ In addition to all the new features, Analysis Services, SSDT, and SSMS also incl
249249

250250
## See also
251251
[SQL Server 2017 Release Notes](../sql-server/sql-server-2017-release-notes.md)
252-
[What's new in SQL Server 2017](../sql-server/what-s-new-in-sql-server-2017.md)
252+
[What's new in SQL Server 2017](../sql-server/what-s-new-in-sql-server-2017.md)

‎docs/connect/odbc/linux-mac/system-requirements.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ The Linux and macOS drivers are available only for the 64-bit versions of the fo
3333
- Debian Linux 8
3434
- RedHat Enterprise Linux 6
3535
- RedHat Enterprise Linux 7
36+
- SuSE Linux Enterprise Server 11
3637
- SuSE Linux Enterprise Server 12
38+
- Ubuntu Linux 14.04
3739
- Ubuntu Linux 15.10
3840
- Ubuntu Linux 16.04
3941
- Ubuntu Linux 16.10
@@ -74,4 +76,3 @@ The installation packages for the [!INCLUDE[msCoName](../../../includes/msconame
7476
[Known Issues in this Version of the Driver](../../../connect/odbc/linux-mac/known-issues-in-this-version-of-the-driver.md)
7577

7678
[Release Notes](../../../connect/odbc/linux-mac/release-notes.md)
77-

‎docs/database-engine/TOC.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
## [New and recently updated articles](new-updated-database-engine.md)
1515

1616
# [Install](../database-engine/install-windows/installation-for-sql-server-2016.md)
17-
# [Availability groups](../database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server.md)
1817
# [Configure](../database-engine/configure-windows/configure-database-engine-instances-sql-server.md)
19-
# [Database mirroring](../database-engine/database-mirroring/the-database-mirroring-endpoint-sql-server.md)
20-
# [Log shipping](../database-engine/log-shipping/about-log-shipping-sql-server.md)
18+
# [High availability](sql-server-business-continuity-dr.md)
19+
## [Availability groups](../database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server.md)
20+
## [Database mirroring](../database-engine/database-mirroring/the-database-mirroring-endpoint-sql-server.md)
21+
## [Log shipping](../database-engine/log-shipping/about-log-shipping-sql-server.md)

‎docs/database-engine/availability-groups/windows/automatic-seeding-secondary-replicas.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Automatic seeding for secondary replicas (SQL Server) | Microsoft Docs"
33
description: "Use automatic seeding to initialize secondary replicas."
44
services: data-lake-analytics
55
ms.custom: ""
6-
ms.date: "08/17/2017"
6+
ms.date: "09/25/2017"
77
ms.prod:
88
- "sql-server-2016"
99
- "sql-server-2017"
@@ -17,7 +17,7 @@ helpviewer_keywords:
1717
- "Automatic seeding [SQL Server], secondary replica"
1818
ms.assetid:
1919
caps.latest.revision:
20-
author: "MikeRayMSFT"
20+
author: "allanhirt"
2121
ms.author: "mikeray"
2222
manager: "jhubbard"
2323
---
@@ -272,8 +272,6 @@ The following table lists extended events related to automatic seeding.
272272

273273
[Always On Availability Groups Troubleshooting and Monitoring Guide](http://technet.microsoft.com/library/dn135328.aspx)
274274

275-
> [Allan Hirt](http://mvp.microsoft.com/en-us/PublicProfile/4025254?fullName=Allan%20Hirt), Microsoft Most Valued Professional, contributed to this article.
276-
277275
<!--Image references-->
278276
[1]: ./media/auto-seed-new-availability-group.png
279277
[2]: ./media/auto-seed-sql-server-log.png

‎docs/database-engine/availability-groups/windows/basic-availability-groups-always-on-availability-groups.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ manager: "jhubbard"
1818
# Basic Availability Groups (Always On Availability Groups)
1919
[!INCLUDE[tsql-appliesto-ss2016-xxxx-xxxx-xxx_md](../../../includes/tsql-appliesto-ss2016-xxxx-xxxx-xxx-md.md)]
2020

21-
Always On Basic Availability Groups provide a high availability solution for SQL Server 2016 Standard Edition. A basic availability group supports a failover environment for a single database. It is created and managed much like traditional (advanced) [Always On Availability Groups &#40;SQL Server&#41;](../../../database-engine/availability-groups/windows/always-on-availability-groups-sql-server.md) with Enterprise Edition. The differences and limitations of basic availability groups are summarized in this document.
21+
Always On Basic Availability Groups provide a high availability solution for SQL Server 2016 and SQL Server 2017 Standard Edition. A basic availability group supports a failover environment for a single database. It is created and managed much like traditional (advanced) [Always On Availability Groups &#40;SQL Server&#41;](../../../database-engine/availability-groups/windows/always-on-availability-groups-sql-server.md) with Enterprise Edition. The differences and limitations of basic availability groups are summarized in this document.
2222

2323
## Features
2424
Always On Basic Availability Groups replaces the deprecated Database Mirroring feature and provides a similar level of feature support. Basic availability groups enable a primary database to maintain a single replica. This replica can use either synchronous-commit mode or asynchronous-commit mode. For more information about availability modes, see [Availability Modes &#40;Always On Availability Groups&#41;](../../../database-engine/availability-groups/windows/availability-modes-always-on-availability-groups.md). The secondary replica remains inactive unless there is a need to failover. This failover reverses the primary and secondary role assignments, causing the secondary replica to become the primary active database. For more information on failover, see [Failover and Failover Modes &#40;Always On Availability Groups&#41;](../../../database-engine/availability-groups/windows/failover-and-failover-modes-always-on-availability-groups.md). Basic availability groups can operate in a hybrid environment that spans on-premises and Microsoft Azure.

‎docs/database-engine/availability-groups/windows/distributed-availability-groups.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ helpviewer_keywords:
1313
- "Availability Groups [SQL Server], distributed"
1414
ms.assetid:
1515
caps.latest.revision:
16-
author: "MikeRayMSFT"
16+
author: "allanhirt"
1717
ms.author: "mikeray"
1818
manager: "jhubbard"
1919
---
@@ -262,8 +262,6 @@ and ag.is_distributed = 1
262262

263263
* [Create an availability group with Transact-SQL](create-an-availability-group-transact-sql.md)
264264

265-
This content was written by [Allan Hirt](http://mvp.microsoft.com/en-us/PublicProfile/4025254?fullName=Allan%20Hirt), Microsoft Most Valued Professional.
266-
267265
<!--Image references-->
268266
[1]: ./media/dag-01-high-level-view-distributed-ag.png
269267
[2]: ./media/dag-02-distributed-ag-data-movement.png

‎docs/database-engine/availability-groups/windows/domain-independent-availability-groups.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Domain Independent Availability Groups (SQL Server) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "05/12/2017"
4+
ms.date: "09/25/2017"
55
ms.prod: "sql-server-2016"
66
ms.reviewer: ""
77
ms.suite: ""
@@ -13,7 +13,7 @@ helpviewer_keywords:
1313
- "Availability Groups [SQL Server], domain independent"
1414
ms.assetid:
1515
caps.latest.revision:
16-
author: "MikeRayMSFT"
16+
author: "allanhirt"
1717
ms.author: "mikeray"
1818
manager: "jhubbard"
1919
---
@@ -146,8 +146,6 @@ GO
146146

147147
- [Create an availability group with Transact-SQL](create-an-availability-group-transact-sql.md)
148148

149-
>This content written by [Allan Hirt](http://mvp.microsoft.com/en-us/PublicProfile/4025254?fullName=Allan%20Hirt), Microsoft Most Valued Professional.
150-
151149
<!--Image references-->
152150
[1]: ./media/diag-wsfc-two-data-centers-same-domain.png
153151
[2]: ./media/diag-workgroup-cluster-two-nodes-joined.png

‎docs/database-engine/availability-groups/windows/enhanced-database-failover.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Add Enhanced Database Failover to an Availability Group (SQL Server) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "05/10/2017"
4+
ms.date: "09/25/2017"
55
ms.prod: "sql-server-2016"
66
ms.reviewer: ""
77
ms.suite: ""
@@ -14,7 +14,7 @@ helpviewer_keywords:
1414
- "Availability Groups [SQL Server], failover"
1515
ms.assetid:
1616
caps.latest.revision:
17-
author: "MikeRayMSFT"
17+
author: "allanhirt"
1818
ms.author: "mikeray"
1919
manager: "jhubbard"
2020
---
@@ -82,4 +82,3 @@ To see whether an availability group has enhanced database failover enabled, que
8282

8383
- [Create an availability group with Transact-SQL](create-an-availability-group-transact-sql.md)
8484

85-
>This content written by [Allan Hirt](http://mvp.microsoft.com/en-us/PublicProfile/4025254?fullName=Allan%20%20Hirt), Microsoft Most Valued Professional.

‎docs/database-engine/sql-server-business-continuity-dr.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
title: Disaster recovery for SQL Server | Microsoft Docs
3+
description:
4+
author: mihaelab
5+
ms.author: mihaelab
6+
manager: jhubbard
7+
ms.date: 09/14/2017
8+
ms.topic: article
9+
ms.prod: sql-linux
10+
ms.technology: database-engine
11+
ms.assetid: c75717c8-c677-4033-8ca6-d0ac93aee04d
12+
---
13+
# Business continuity and database recovery - SQL Server
14+
15+
[!INCLUDE[HA-Story](../includes/sql-server-ha-story.md)]
16+
17+
## Next steps
18+
19+
[Availability groups](availability-groups/windows/overview-of-always-on-availability-groups-sql-server.md)
20+
21+
[Failover clusters](../sql-server/failover-clusters/install/sql-server-failover-cluster-installation.md)

0 commit comments

Comments
 (0)