Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into hubsql

Author: markingmyname

docs/dea/database-experimentation-assistant-overview.md

@@ -2,7 +2,7 @@
 title: Overview of the Database Experimentation Assistant 
 description: Overview of Database Experimentation Assistant
 ms.custom: ""
-ms.date: 11/05/2019
+ms.date: 11/16/2019
 ms.prod: sql
 ms.prod_service: dea
 ms.suite: sql
@@ -49,53 +49,59 @@ Following are some prerequisites for running DEA:
 
 In the prerequisite environment architecture, we recommend that you install DEA *on the same machine as the Distributed Replay controller*. This practice avoids cross-machine calls and simplifies configuration.
 
-### Required configuration for workload comparison by using DEA
+### Required configuration for workload comparison using DEA
 
 DEA connects to database servers by using Windows authentication. Be sure that a user running DEA can connect to database servers (source, target, and analysis) by using Windows authentication.
 
-**Capture configuration requirements**:
+**Capture configuration requirements**
+
+Capturing a trace requires that the:
 
 - User running DEA can connect to the source database server by using Windows authentication.
 - User running DEA has sysadmin rights on the source database server.
 - Service account running the source database server has write access to the trace folder path.
 
-For more information, see the [capture FAQ](database-experimentation-assistant-capture-trace.md#frequently-asked-questions-about-trace-capture)
+For more information, see [Frequently asked questions about trace capture](database-experimentation-assistant-capture-trace.md#frequently-asked-questions-about-trace-capture)
+
+**Replay configuration requirements**
 
-**Replay configuration requirements**: 
+Replaying a trace requires that the:
 
 - User running DEA can connect to the target database server by using Windows authentication.
 - User running DEA has sysadmin rights on the target database server.
 - Service account running the target database servers has write access to the trace folder path.
 - Service account running Distributed Replay clients can connect to the target database server by using Windows authentication.
-- DEA communicates with the Distributed Replay controller by using COM interfaces. Make sure that TCP ports are opened for incoming requests on the Distributed Replay controller.
+- TCP ports are opened for incoming requests on the Distributed Replay controller. DEA communicates with the Distributed Replay controller by using COM interfaces.
+
+For more information, see [Frequently asked questions about trace replay](database-experimentation-assistant-replay-trace.md#frequently-asked-questions-about-trace-replay)
 
-For more information, see the [replay FAQ](database-experimentation-assistant-replay-trace.md#frequently-asked-questions-about-trace-replay)
+**Analysis configuration requirements**
 
-**Analysis configuration requirements**:
+Performing the analysis requires that the:
 
 - User running DEA can connect to the analysis database server by using Windows authentication.
 - User running DEA has sysadmin rights on the source database server.
 
-For more information, see the [analysis FAQ](database-experimentation-assistant-create-report.md#frequently-asked-questions-about-analysis-reports)
+For more information, see [Frequently asked questions about analysis reports](database-experimentation-assistant-create-report.md#frequently-asked-questions-about-analysis-reports)
 
 ## Set up telemetry
 
-DEA has an internet-enabled feature that can send telemetry information to Microsoft. Microsoft collects telemetry to enhance the product experience. Telemetry is optional. The information that's collected is also saved on your computer for local audit. You can always see what's collected. All log files from DEA are saved in the %temp%\\DEA folder.
+DEA has an internet-enabled feature that can send telemetry information to Microsoft for use in enhancing the product experience. The information that's collected is also saved on your computer for local audit, so you can always see what's collected. All DEA log files are saved in the %temp%\\DEA folder.
 
-You can decide which events are collected. You also decide whether collected events are sent to Microsoft. There are four types of events:
+Telemetry data can be collected on four types of events:
 
 - **TraceEvent**: Usage events for the application (for example, "triggered stop capture").
 - **Exception**: Exception thrown during application usage.
 - **DiagnosticEvent**: An event log to assist with diagnosis when problems occur (*not* sent to Microsoft).
 - **FeedbackEvent**: User feedback that's submitted through the application.
 
-These steps show you how to choose which events are collected and whether the events are sent to Microsoft:
+Collecting and sending telemetry data is optional. To specify which events are collected and whether collected events are sent to Microsoft, use the following steps:
 
-1. Go to the location where DEA is installed (for example, C:\\Program Files (x86)\\Microsoft Corporation\\Database Experimentation Assistant).
-2. Open the two .config files: DEA.exe.config (for the application) and DEACmd.exe.config (for the CLI).
-3. To stop collecting a type of event, set the value of *event* (for example, **TraceEvent**) to **false**. To start collecting the event again, set the value to **true**.
-4. To stop saving local copies of events, set the value of **TraceLoggerEnabled** to **false**. To start saving local copies again, set the value to **true**.
-5. To stop sending events to Microsoft, set the value of **AppInsightsLoggerEnabled** to **false**. To start sending events to Microsoft again, set the value to **true**.
+1. Go to the location in which DEA is installed (for example, C:\\Program Files (x86)\\Microsoft Corporation\\Database Experimentation Assistant).
+2. Open and modify the two .config files **DEA.exe.config** (for the application) and **DEACmd.exe.config** (for the CLI) as follows:
+    - To stop collecting a type of event, set the value of *event* (for example, **TraceEvent**) to **false**. To start collecting the event again, set the value to **true**.
+    - To stop saving local copies of events, set the value of **TraceLoggerEnabled** to **false**. To start saving local copies again, set the value to **true**.
+    - To stop sending events to Microsoft, set the value of **AppInsightsLoggerEnabled** to **false**. To start sending events to Microsoft again, set the value to **true**.
 
 DEA is governed by the [Microsoft Privacy Statement](https://aka.ms/dea-privacy).
 

docs/t-sql/functions/serverproperty-transact-sql.md

@@ -25,21 +25,26 @@ ms.author: vanto
 monikerRange: ">=aps-pdw-2016||=azuresqldb-current||=azure-sqldw-latest||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # SERVERPROPERTY (Transact-SQL)
+
 [!INCLUDE[tsql-appliesto-ss2008-all-md](../../includes/tsql-appliesto-ss2008-all-md.md)]
 
-  Returns property information about the server instance.  
+Returns property information about the server instance.  
 
- ![Topic link icon](../../database-engine/configure-windows/media/topic-link.gif "Topic link icon") [Transact-SQL Syntax Conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)  
+![Topic link icon](../../database-engine/configure-windows/media/topic-link.gif "Topic link icon") [Transact-SQL Syntax Conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)  
 
 ## Syntax  
 
 ```  
 SERVERPROPERTY ( 'propertyname' )  
 ```  
-  
+
+> [!IMPORTANT]
+> The database engine version numbers for SQL Server and Azure SQL Database are not comparable with each other, and rather are internal build numbers for these separate products. The database engine for Azure SQL Database is based on the same code base as the SQL Server database engine. Most importantly, the database engine in Azure SQL Database always has the newest SQL database engine bits. Version 12 of Azure SQL Database is newer than version 15 of SQL Server.
+
 ## Arguments  
- *propertyname*  
- Is an expression that contains the property information to be returned for the server. *propertyname* can be one of the following values.  
+
+*propertyname*  
+Is an expression that contains the property information to be returned for the server. *propertyname* can be one of the following values.  
 
 |Property|Values returned|  
 |--------------|---------------------|  
@@ -89,34 +94,39 @@ SERVERPROPERTY ( 'propertyname' )
 |FilestreamEffectiveLevel|The effective level of FILESTREAM access. This value can be different than the FilestreamConfiguredLevel if the level has changed and either an instance restart or a computer restart is pending. For more information, see [filestream access level](../../database-engine/configure-windows/filestream-access-level-server-configuration-option.md).|  
 
 ## Return Types  
- **sql_variant**  
+
+**sql_variant**
 
 ## Remarks  
 
-### ServerName Property  
- The `ServerName` property of the `SERVERPROPERTY` function and [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) return similar information. The `ServerName` property provides the Windows server and instance name that together make up the unique server instance. [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) provides the currently configured local server name.  
+### ServerName Property
+
+The `ServerName` property of the `SERVERPROPERTY` function and [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) return similar information. The `ServerName` property provides the Windows server and instance name that together make up the unique server instance. [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) provides the currently configured local server name.  
 
- The `ServerName` property and [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) return the same information if the default server name at the time of installation has not been changed. The local server name can be configured by executing the following:  
+The `ServerName` property and [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) return the same information if the default server name at the time of installation has not been changed. The local server name can be configured by executing the following:  
 
-```  
+```sql
 EXEC sp_dropserver 'current_server_name';  
 GO  
 EXEC sp_addserver 'new_server_name', 'local';  
 GO  
 ```  
 
- If the local server name has been changed from the default server name at installation time, [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) returns the new name.  
+If the local server name has been changed from the default server name at installation time, [@@SERVERNAME](../../t-sql/functions/servername-transact-sql.md) returns the new name.  
 
-### Version Properties  
- The `SERVERPROPERTY` function returns individual properties that relate to the version information whereas the [@@VERSION](../../t-sql/functions/version-transact-sql-configuration-functions.md) function combines the output into one string. If your application requires individual property strings, you can use the `SERVERPROPERTY` function to return them instead of parsing the [@@VERSION](../../t-sql/functions/version-transact-sql-configuration-functions.md) results.  
+### Version Properties
+
+The `SERVERPROPERTY` function returns individual properties that relate to the version information whereas the [@@VERSION](../../t-sql/functions/version-transact-sql-configuration-functions.md) function combines the output into one string. If your application requires individual property strings, you can use the `SERVERPROPERTY` function to return them instead of parsing the [@@VERSION](../../t-sql/functions/version-transact-sql-configuration-functions.md) results.  
 
 ## Permissions
-All users can query the server properties. 
+
+All users can query the server properties.
 
-## Examples  
- The following example uses the `SERVERPROPERTY` function in a `SELECT` statement to return information about the current instance of [!INCLUDE[ssNoVersion_md](../../includes/ssnoversion-md.md)].   
+## Examples
+
+The following example uses the `SERVERPROPERTY` function in a `SELECT` statement to return information about the current instance of [!INCLUDE[ssNoVersion_md](../../includes/ssnoversion-md.md)].
 
-```  
+```sql
 SELECT  
   SERVERPROPERTY('MachineName') AS ComputerName,
   SERVERPROPERTY('ServerName') AS InstanceName,  
@@ -126,7 +136,6 @@ SELECT
 GO  
 ```  
 
-## See Also  
- [Editions and Components of SQL Server 2016](../../sql-server/editions-and-components-of-sql-server-2016.md)  
-  
-  
+## See Also
+
+[Editions and Components of SQL Server 2016](../../sql-server/editions-and-components-of-sql-server-2016.md)  

docs/t-sql/statements/alter-database-transact-sql-compatibility-level.md

@@ -1,7 +1,7 @@
 ---
 title: "ALTER DATABASE Compatibility Level (Transact-SQL) | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/12/2019"
+ms.date: "11/15/2019"
 ms.prod: sql
 ms.prod_service: "database-engine, sql-database"
 ms.reviewer: ""
@@ -29,7 +29,7 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversio
 
 [!INCLUDE[tsql-appliesto-ss2008-asdb-xxxx-xxx-md](../../includes/tsql-appliesto-ss2008-asdb-xxxx-xxx-md.md)]
 
-Sets [!INCLUDE[tsql](../../includes/tsql-md.md)] and query processing behaviors to be compatible with the specified version of the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)]. For other ALTER DATABASE options, see [ALTER DATABASE](../../t-sql/statements/alter-database-transact-sql.md).  
+Sets [!INCLUDE[tsql](../../includes/tsql-md.md)] and query processing behaviors to be compatible with the specified version of the SQL engine. For other ALTER DATABASE options, see [ALTER DATABASE](../../t-sql/statements/alter-database-transact-sql.md).  
 
 For more information about the syntax conventions, see [Transact-SQL Syntax Conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md).
 
@@ -42,10 +42,10 @@ SET COMPATIBILITY_LEVEL = { 150 | 140 | 130 | 120 | 110 | 100 | 90 }
 
 ## Arguments
 
-*database_name*      
+*database_name*
 Is the name of the database to be modified.
 
-COMPATIBILITY_LEVEL { 150 | 140 | 130 | 120 | 110 | 100 | 90 | 80 }       
+COMPATIBILITY_LEVEL { 150 | 140 | 130 | 120 | 110 | 100 | 90 | 80 }
 Is the version of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] with which the database is to be made compatible. The following compatibility level values can be configured (not all versions supports all of the above listed compatibility level):
 
 <a name="supported-dbcompats"></a>
@@ -64,7 +64,11 @@ Is the version of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] with
 |[!INCLUDE[ssVersion2005](../../includes/ssversion2005-md.md)]|9|90|90, 80|
 |[!INCLUDE[ssVersion2000](../../includes/ssversion2000-md.md)]|8|80|80|
 
+> [!IMPORTANT]
+> The database engine version numbers for SQL Server and Azure SQL Database are not comparable with each other, and rather are internal build numbers for these separate products. The database engine for Azure SQL Database is based on the same code base as the SQL Server database engine. Most importantly, the database engine in Azure SQL Database always has the newest SQL database engine bits. Version 12 of Azure SQL Database is newer than version 15 of SQL Server.
+
 ## Remarks
+
 For all installations of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], the default compatibility level is associated with the version of the [!INCLUDE[ssDE](../../includes/ssde-md.md)]. New databases are set to this level unless the **model** database has a lower compatibility level. For databases attached or restored from any earlier version of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], the database retains its existing compatibility level, if it is at least minimum allowed for that instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]. Moving a database with a compatibility level lower than the allowed level by the [!INCLUDE[ssde_md](../../includes/ssde_md.md)], automatically sets the database to the lowest compatibility level allowed. This applies to both system and user databases.
 
 The below behaviors are expected for [!INCLUDE[ssSQL17](../../includes/sssql17-md.md)] when a database is attached or restored, and after an in-place upgrade:

docs/toc.yml

@@ -5821,7 +5821,7 @@
       href: dea/database-experimentation-assistant-replay-trace.md
     - name: Create reports
       href: dea/database-experimentation-assistant-create-report.md
-    - name: View reports
+    - name: Review reports
       href: dea/database-experimentation-assistant-view-report.md
     - name: Run at command prompt
       href: dea/database-experimentation-assistant-run-command-prompt.md