fix merge conflict

Author: stevestein

docs/advanced-analytics/install/sql-machine-learning-services-windows-install.md

@@ -20,7 +20,7 @@ This article explains how to install the machine learning component by running t
 
 - SQL Server 2017 (or greater) setup is required if you want to install Machine Learning Services with language support for R, Python, or both. If instead you have SQL Server 2016 installation media, you can  install [SQL Server 2016 R Services (In-Database)](sql-r-services-windows-install.md) to get R language support.
 
-- A database engine instance is required. You cannot install just R or Python features, although you can add them incrementally to an existing instance.
++ A database engine instance is required. You cannot install just R or Python features, although you can add them incrementally to an existing instance.
 
 - Do not install Machine Learning Services on a SQL Server 2017 failover cluster instance. 
     - On SQL Server vNext, installing Machine Learning Services on a failover cluster is supported. 

docs/analytics-platform-system/appliance-feature-switch.md

@@ -6,13 +6,13 @@ manager: "craigg"
 ms.prod: "sql"
 ms.technology: "data-warehouse"
 ms.topic: "conceptual"
-ms.date: "04/24/2018"
+ms.date: "06/27/2018"
 ms.author: "murshedz"
 ms.reviewer: "martinle"
+monikerRange: ">= aps-pdw-2016-au7 || = sqlallproducts-allversions"
 ---
-
 #Appliance Feature Switch
-The **Feature Switch** page displays information about the two feature switches that are introduced in Analytics Platform System AU7. Use this page to update or enable/disable features and settings in Analytics Platform System. Changing feature switch values requires a service restart.
+The **Feature Switch** page displays information about the two feature switches that are introduced in Analytics Platform System 2016-AU7. Use this page to update or enable/disable features and settings in Analytics Platform System. Changing feature switch values requires a service restart.
 
 ![DWConig Appliance Feature Switch](media/feature-switch/SQL_Server_PDW_DWConfig_feature_switch.png "DWConig Appliance Feature Switch") 
 

docs/analytics-platform-system/configure-auto-statistics.md

@@ -6,16 +6,16 @@ manager: "craigg"
 ms.prod: "sql"
 ms.technology: "data-warehouse"
 ms.topic: "conceptual"
-ms.date: "04/24/2018"
+ms.date: "06/27/2018"
 ms.author: "murshedz"
 ms.reviewer: martinle
+monikerRange: ">= aps-pdw-2016-au7 || = sqlallproducts-allversions"
 ---
-
 # Configure auto statistics
 
 Learn how to configure Parallel Data Warehouse to use auto statistics for creating and updating statistics automatically.  Use this capability to improve query plans, and therefore improve query performance.
 
-**Applies to:** APS (starting with AU7)
+**Applies to:** APS (starting with 2016-AU7)
 
 ## What are statistics?
 Statistics for query optimization are objects that contain statistical information about the distribution of values in one or more columns of a table. The query optimizer uses these statistics to estimate the cardinality, or number of rows, in the query result. These cardinality estimates enable the query optimizer to create a high-quality query plan. As an example, in APS, the MPP query optimizer uses cardinality estimates to choose to shuffle or replicate the smaller of two tables used in a join clause and in doing so improve query performance.  For more information, see [Statistics](../relational-databases/statistics/statistics.md) and [DBCC SHOW_STATISTICS](../t-sql/database-console-commands/dbcc-show-statistics-transact-sql.md)

docs/analytics-platform-system/whats-new-analytics-platform-system.md

@@ -6,17 +6,17 @@ manager: "craigg"
 ms.prod: "sql"
 ms.technology: "data-warehouse"
 ms.topic: "conceptual"
-ms.date: "04/24/2018"
+ms.date: "06/27/2018"
 ms.author: "murshedz"
 ms.reviewer: "martinle"
 ---
-
 # What's new in Analytics Platform System, a scale-out MPP data warehouse
 See what’s new in the latest Appliance Updates for Microsoft® Analytics Platform System (APS). APS is a scale-out on-premises appliance that hosts MPP SQL Server Parallel Data Warehouse. 
 
+::: moniker range="= aps-pdw-2016-au7 || = sqlallproducts-allversions"
 
-## APS AU7
-APS2016 is a prerequisite to upgrade to AU7. Following are the new features for APS AU7:
+## APS 2016-AU7
+APS 2016-AU6 is a prerequisite to upgrade to AU7. The following are new in APS AU7:
 
 ### Auto-create and auto-update statistics
 APS AU7 creates and updates statistics automatically, by default. To update statistics settings, administrators can use a new feature switch menu item in the [Configuration Manager](appliance-configuration.md#CMTasks). The [feature switch](appliance-feature-switch.md) controls the auto-create, auto-update, and asynchronous update behavior of statistics. You can also update statistics settings with the [ALTER DATABASE (Parallel Data Warehouse)](/sql/t-sql/statements/alter-database-parallel-data-warehouse) statement.
@@ -30,24 +30,37 @@ Query hints HASH and ORDER GROUP are now supported. For more information, see [H
 APS AU7 introduces Feature Switch in [Configuration Manager](launch-the-configuration-manager.md). AutoStatsEnabled and DmsProcessStopMessageTimeoutInSeconds are now configurable options that can be changed by Administrators.
 
 ### Known Issues
-With APS AU7 software, we are packaging and providing the Intel BIOS update that fixes “speculative execution side-channel attacks” (aka. Spectre and Meltdown vulnerabilities). Though packaged together, the BIOS update is installed manually and not part of the APS AU7 software install. Microsoft advises all customers to install the BIOS updated. Microsoft has measured the effect of Kernel Virtual Address Shadowing (KVAS), Kernel Page Table Indirection (KPTI) and Indirect Branch Prediction mitigation (IBP) on various SQL workloads in various environments and found significant degradation on some workloads. We recommend that you test the performance effect of enabling BIOS update before you deploy them in a production environment. If the performance effect of enabling these features is too high for an existing application, you can consider whether isolating your APS Appliance from untrusted code running is a better mitigation for your application. See SQL Server guidance [here](https://support.microsoft.com/en-us/help/4073225/guidance-protect-sql-server-against-spectre-meltdown).
+With APS AU7 software, an Intel BIOS update is provided which fixes a problem described as *speculative execution side-channel attacks*. The attacks aim to exploit what are called *Spectre and Meltdown vulnerabilities*. Although packaged together with APS, the BIOS update is installed manually, and not as part of the APS AU7 software install.
+
+Microsoft advises all customers to install the BIOS updated. Microsoft has measured the effect of the following configurations on various SQL workloads in various environments. The measurements found significant degradation on some workloads:
+
+- Kernel Virtual Address Shadowing (KVAS)
+- Kernel Page Table Indirection (KPTI)
+- Indirect Branch Prediction mitigation (IBP)
+
+Based on the results, the recommendation is that you test the performance effect of enabling BIOS update before you deploy them in a production environment. If the performance effect of enabling these features is too high for your application, consider whether a better mitigation is to isolate your APS Appliance from any untrusted code that is running. See SQL Server guidance [here](https://support.microsoft.com/en-us/help/4073225/guidance-protect-sql-server-against-spectre-meltdown).
 
-## APS 2016
-These are the new features for APS 2016:
+::: moniker-end
+::: moniker range="= aps-pdw-2016 || = sqlallproducts-allversions"
+
+## APS 2016-AU6
+This section described the new features for APS 2016-AU6.
 
 ### SQL Server 2016
 
-APS 2016 runs on the latest SQL Server 2016 release and uses the default database compatibility level 130.  SQL Server 2016 makes it possible to support some of the  new features such as secondary indexes for clustered columnstore indexes and Kerberos for PolyBase. 
+APS AU6 runs on the latest SQL Server 2016 release, and uses the default database compatibility level 130. SQL Server 2016 enables support for new features such as:
 
+- Secondary indexes for clustered columnstore indexes.
+- Kerberos for PolyBase.
 
 ### T-SQL
-APS 2016 supports these T-SQL compatibility improvements.  These additional language elements make it easier to migrate from SQL Server and other data sources. 
+APS AU6 supports these T-SQL compatibility improvements.  These additional language elements make it easier to migrate from SQL Server and other data sources. 
 
-- [Column-level SQL collations][] are now supported in addition to Windows collations.
+- [Column-level SQL collations][] are now supported, in addition to Windows collations.
 - [Nonclustered indexes on clustered columnstore indexes][] improve performance of queries that search for specific values in the clustered columnstore index. 
 - [SELECT...INTO][] 
 - [sp_spaceused()][] displays the disk space used or reserved in a table or database.
-- [Wide tables][] support is the same as SQL Server 2016. The previous limit of 32K for the row size no longer exists. 
+- [Wide tables][] support is the same as SQL Server 2016. The previous limit of 32 K for the row size no longer exists. 
 
 **Data types**
 
@@ -83,7 +96,7 @@ APS 2016 supports these T-SQL compatibility improvements.  These additional lang
 ### Install and upgrade enhancements
 
 **Enterprise architecture updates**
-Upgrading your existing appliance to APS 2016 installs the latest firmware and driver updates, which include security fixes. 
+Upgrading your existing appliance to APS AU6 installs the latest firmware and driver updates, which include security fixes. 
 
 A new appliance from HPE or DELL includes all the latest updates plus:
 
@@ -97,16 +110,23 @@ A new appliance from HPE or DELL includes all the latest updates plus:
 - To use FQDN, you need to do a full upgrade and opt-in during the upgrade. 
 
 **Reduced downtime**
-Installing or upgrading to APS 2016 is faster and requires less downtime than previous releases. To reduce downtime, the install or upgrade: 
+Installing or upgrading to APS AU6 is faster and requires less downtime than previous releases. To reduce downtime, the install or upgrade: 
 
  - Streamlines applying WSUS updates by using an image that contains all the updates through June 2016
  - Applies security updates with the driver and firmware updates
  - Places the latest hotfixes and the appliance verification utility (PAV) on your appliance so they are ready to install with no need to download them.
 
+::: moniker-end
+
+<!--
+Link references to other articles in this same GitHub repo.
+
+The link format that starts with '/sql/what-ever/my-artlcle' is not appropriate for common links within the same repo (as most of these link are).  The first couple links have been edited to show the proper syntax, but all other links in this article need to be similarly edited.
+The proper formats have at least two big advantages.  One big advantage is that the proper formats enable the OPS Build system to detect broken links at Pull Request build time, instead of only later during run time.
+-->
+[database compatibility level 130]: ../t-sql/statements/alter-database-transact-sql-compatibility-level.md
+[Column-level SQL collations]: ~/relational-databases/collations/collation-and-unicode-support.md
 
-<!--MSDN references-->
-[database compatibility level 130]:/sql/t-sql/statements/alter-database-transact-sql-compatibility-level
-[Column-level SQL collations]:/sql/relational-databases/collations/collation-and-unicode-support
 [Nonclustered indexes on clustered columnstore indexes]:/sql/t-sql/statements/create-index-transact-sql
 [VARCHAR(MAX)]:/sql/t-sql/data-types/char-and-varchar-transact-sql
 [NVARCHAR(MAX)]:/sql/t-sql/data-types/nchar-and-nvarchar-transact-sql

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

@@ -4,7 +4,7 @@ description: This tutorial shows how to create and configure availability groups
 author: MikeRayMSFT 
 ms.author: mikeray 
 manager: craigg
-ms.date: 12/11/2017
+ms.date: 06/28/2018
 ms.topic: article
 ms.prod: sql
 ms.component: ""
@@ -585,19 +585,20 @@ The AG resource that is created is a special kind of resource called a clone. Th
     **Red Hat Enterprise Linux (RHEL) and Ubuntu**
 
     ```bash
-    sudo pcs resource create <NameForAGResource> ocf:mssql:ag ag_name=<AGName> --master meta notify=true
+    sudo pcs resource create <NameForAGResource> ocf:mssql:ag ag_name=<AGName> meta failure-timeout=30s --master meta notify=true
     ```
 
     >[!NOTE]
     >On RHEL 7.4, you may encounter a warning with the use of --master. To avoid this, use
-    >`sudo pcs resource create <NameForAGResource> ocf:mssql:ag ag_name=<AGName> master notify=true`
+    >`sudo pcs resource create <NameForAGResource> ocf:mssql:ag ag_name=<AGName> meta failover-timeout=30s master notify=true`
 
     **SUSE Linux Enterprise Server (SLES)**
 
     ```bash
     primitive <NameForAGResource> \
     ocf:mssql:ag \
     params ag_name="<AGName>" \
+    meta failure-timeout=60s \
     op start timeout=60s \
     op stop timeout=60s \
     op promote timeout=60s \

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

@@ -14,7 +14,7 @@ ms.service: "sql-database"
 ms.tgt_pltfrm:
 ms.devlang: "azurecli, powershell"
 ms.topic: conceptual
-ms.date: "04/24/2018"
+ms.date: "06/28/2018"
 ms.author: "aliceku"
 monikerRange: "= azuresqldb-current || = azure-sqldw-latest || = sqlallproducts-allversions"
 ---
@@ -257,3 +257,13 @@ Now the database or data warehouse has TDE enabled with an encryption key in Key
       # get whether encryption is on or off
       az sql db tde show-configuration -n "DatabaseName" -g "ResourceGroupName" -s "ServerName" 
 
+## SQL CLI References
+
+https://docs.microsoft.com/en-us/cli/azure/sql?view=azure-cli-latest 
+
+https://docs.microsoft.com/en-us/cli/azure/sql/server/key?view=azure-cli-latest 
+
+https://docs.microsoft.com/en-us/cli/azure/sql/server/tde-key?view=azure-cli-latest 
+
+https://docs.microsoft.com/en-us/cli/azure/sql/db/tde?view=azure-cli-latest 
+

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

@@ -15,7 +15,7 @@ ms.custom:
 ms.tgt_pltfrm: ""
 
 ms.topic: conceptual
-ms.date: "06/20/2018"
+ms.date: "06/28/2018"
 ms.author: "aliceku"
 monikerRange: "= azuresqldb-current || = azure-sqldw-latest || = sqlallproducts-allversions"
 --- 
@@ -53,7 +53,7 @@ When TDE is first configured to use a TDE protector from Key Vault, the server s
 
 ### General Guidelines
 - Ensure Azure Key Vault and Azure SQL Database are going to be in the same tenant.  Cross-tenant key vault and server interactions **are not supported**.
-- Decide which subscriptions are going to be used for the required resources – moving the server across subscriptions later requires a new setup of TDE with BYOKs.
+- Decide which subscriptions are going to be used for the required resources – moving the server across subscriptions later requires a new setup of TDE with BYOKs. Learn more about [moving resources](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-move-resources)
 - When configuring TDE with BYOK, it is important to consider the load placed on the key vault by repeated wrap/unwrap operations. For example, since all databases associated with a logical server use the same TDE protector, a failover of that server will trigger as many key operations against the vault as there are databases in the server. Based on our experience and documented [key vault service limits](https://docs.microsoft.com/en-us/azure/key-vault/key-vault-service-limits), we recommend associating at most 500 Standard / General Purpose or 200 Premium / Business Critical databases with one Azure Key Vault in a single subscription to ensure consistently high availability when accessing the TDE protector in the vault. 
 - Recommended: Keep a copy of the TDE protector on premises.  This requires an HSM device to create a TDE Protector locally and a key escrow system to store a local copy of the TDE Protector.
 

docs/relational-databases/system-catalog-views/TOC.md

@@ -36,6 +36,7 @@
 ## [sys.resource_stats](sys-resource-stats-azure-sql-database.md)  
 ## [sys.resource_usage](sys-resource-usage-azure-sql-database.md)  
 ## [dbo.server_quotas](dbo-server-quotas-azure-sql-database.md)  
+## [sys.server_resource_stats](sys-server-resource-stats-azure-sql-database.md)
 
 # [CLR Assembly](clr-assembly-catalog-views-transact-sql.md)  
 ## [sys.assemblies](sys-assemblies-transact-sql.md)