Merge pull request #17755 from MicrosoftDocs/master

11/02 AM Publish

Author: huypub

docs/azure-data-studio/tutorial-qds-sql-server.md

@@ -131,7 +131,7 @@ To add the *slow queries widget* to your dashboard, edit the *dashboard.database
 
 5. View the query's execution plan:
 
-   ![showplan](./media/tutorial-qds-sql-server/showplan.png)
+   ![Screenshot showing the query's execution plan.](./media/tutorial-qds-sql-server/showplan.png)
 
 ## Next steps
 

docs/azure-data-studio/tutorial-sql-editor.md

@@ -61,11 +61,11 @@ Azure Data Studio provides many built-in T-SQL snippets for quickly creating sta
 
 2. Type **sql** in the editor, arrow down to **sqlCreateStoredProcedure**, and press the *Tab* key (or *Enter*) to load the create stored procedure snippet.
 
-   ![snippet-list](./media/tutorial-sql-editor/snippet-list.png)
+   ![Screenshot showing the Query Editor with sql typed in the editor and the sqlCreateStoredProcedure option called out.](./media/tutorial-sql-editor/snippet-list.png)
 
 3. The create stored procedure snippet has two fields set up for quick edit, *StoredProcedureName* and *SchemaName*. Select *StoredProcedureName*, right-click, and select **Change All Occurrences**. Now type *getCustomer* and all *StoredProcedureName* entries change to *getCustomer*.
 
-   ![snippet](./media/tutorial-sql-editor/snippet.png)
+   ![Screenshot showing the Query Editor with the Change All Occurrences option called out.](./media/tutorial-sql-editor/snippet.png)
 
 5. Change all occurrences of *SchemaName* to *dbo*. 
 6. The snippet contains placeholder parameters and body text that needs updating. The *EXECUTE* statement also contains placeholder text because it doesn't know how many parameters the procedure will have. For this tutorial update the snippet so it looks like the following code:

docs/connect/jdbc/reference/supportsresultsetconcurrency-method-sqlserverdatabasemetadata.md

@@ -57,12 +57,12 @@ public boolean supportsResultSetConcurrency(int type,
 
  An **int** that indicates the result set concurrency level, which can be one of the following values as defined in java.sql.ResultSet or SQLServerResultSet:  
 
-## java.sql.ResultSet Types  
+## Concurrency java.sql.ResultSet Types  
  CONCUR_READ_ONLY  
 
  CONCUR_UPDATABLE  
 
-## SQLServerResultSet Types  
+## Concurrency SQLServerResultSet Types  
  CONCUR_SS_OPTIMISTIC_CC  
 
  CONCUR_SS_SCROLL_LOCKS  

docs/connect/php/installation-tutorial-linux-mac.md

@@ -1,7 +1,7 @@
 ---
 title: "Linux and macOS Installation for the Drivers for PHP"
 description: "In these instructions, learn how to install the Microsoft Drivers for PHP for SQL Server on Linux or macOS."
-ms.date: "09/22/2020"
+ms.date: "10/30/2020"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.custom: ""
@@ -15,7 +15,7 @@ manager: v-mabarw
 # Linux and macOS Installation Tutorial for the Microsoft Drivers for PHP for SQL Server
 The following instructions assume a clean environment and show how to install PHP 7.x, the Microsoft ODBC driver, the Apache web server, and the Microsoft Drivers for PHP for SQL Server on Ubuntu 16.04, 18.04, and 20.04, RedHat 7 and 8, Debian 8, 9, and 10, Suse 12 and 15, Alpine 3.11, and macOS 10.13, 10.14, and 10.15. These instructions advise installing the drivers using PECL, but you can also download the prebuilt binaries from the [Microsoft Drivers for PHP for SQL Server](https://github.com/Microsoft/msphpsql/releases) GitHub project page and install them following the instructions in [Loading the Microsoft Drivers for PHP for SQL Server](../../connect/php/loading-the-php-sql-driver.md). For an explanation of extension loading and why we do not add the extensions to php.ini, see the section on [loading the drivers](../../connect/php/loading-the-php-sql-driver.md#loading-the-driver-at-php-startup).
 
-These instructions install PHP 7.4 by default using `pecl install`. You may need to run `pecl channel-update pecl.php.net` first. Note that some supported Linux distros default to PHP 7.1 or earlier, which is not supported for the latest version of the PHP drivers for SQL Server -- please see the notes at the beginning of each section to install PHP 7.2 or 7.3 instead.
+These instructions install PHP 7.4 by default using `pecl install`. You may need to run `pecl channel-update pecl.php.net` first. Some supported Linux distros default to PHP 7.1 or earlier, which is not supported for the latest version of the PHP drivers for SQL Server. See the notes at the beginning of each section to install PHP 7.2 or 7.3 instead.
 
 Also included are instructions for installing the PHP FastCGI Process Manager, PHP-FPM, on Ubuntu. This is needed if using the nginx web server instead of Apache.
 
@@ -262,7 +262,7 @@ To test your installation, see [Testing your installation](#testing-your-install
 ## Installing the drivers on Suse 12 and 15
 
 > [!NOTE]
-> In the following instructions, replace `<SuseVersion>` with your version of Suse - if you are using Suse Enterprise Linux 15, it will be SLE_15 or SLE_15_SP1. For Suse 12, use SLE_12_SP4 (or above if applicable). Not all versions of PHP are available for all versions of Suse Linux - please refer to `http://download.opensuse.org/repositories/devel:/languages:/php` to see which versions of Suse have the default version PHP available, or to `http://download.opensuse.org/repositories/devel:/languages:/php:/` to see which other versions of PHP are available for which versions of Suse.
+> In the following instructions, replace `<SuseVersion>` with your version of Suse - if you are using Suse Enterprise Linux 15, it will be SLE_15 or SLE_15_SP1. For Suse 12, use SLE_12_SP4 (or above if applicable). Not all versions of PHP are available for all versions of Suse Linux. Refer to `http://download.opensuse.org/repositories/devel:/languages:/php` to see which versions of Suse have the default version PHP available, or to `http://download.opensuse.org/repositories/devel:/languages:/php:/` to see which other versions of PHP are available for which versions of Suse.
 
 > [!NOTE]
 > Packages for PHP 7.4 are not available for Suse 12. 
@@ -314,7 +314,7 @@ To test your installation, see [Testing your installation](#testing-your-install
 > The default version of PHP is 7.3. Alternate versions of PHP may be available from other repositories for Alpine 3.11. You can instead compile PHP from source.
 
 ### Step 1. Install PHP
-PHP packages for Alpine can be found in the `edge/community` repository. Please check [Enable Community Repository](https://wiki.alpinelinux.org/wiki/Enable_Community_Repository) on their WIKI page. Add the following line to `/etc/apt/repositories`, replacing `<mirror>` with the URL of an Alpine repository mirror:
+PHP packages for Alpine can be found in the `edge/community` repository. Check [Enable Community Repository](https://wiki.alpinelinux.org/wiki/Enable_Community_Repository) on their WIKI page. Add the following line to `/etc/apt/repositories`, replacing `<mirror>` with the URL of an Alpine repository mirror:
 ```
 http://<mirror>/alpine/edge/community
 ```
@@ -365,7 +365,7 @@ brew tap
 brew tap homebrew/core
 brew install php@7.4
 ```
-PHP should now be in your path -- run `php -v` to verify that you are running the correct version of PHP. If PHP is not in your path or it is not the correct version, run the following:
+PHP should now be in your path. Run `php -v` to verify that you are running the correct version of PHP. If PHP is not in your path or it is not the correct version, run the following:
 ```bash
 brew link --force --overwrite php@7.4
 ```
@@ -405,7 +405,7 @@ To test your installation, see [Testing your installation](#testing-your-install
 ## Testing Your Installation
 
 To test this sample script, create a file called testsql.php in your system's document root. This is `/var/www/html/` on Ubuntu, Debian, and Redhat, `/srv/www/htdocs` on SUSE, `/var/www/localhost/htdocs` on Alpine, or `/usr/local/var/www` on macOS. Copy the following script to it, replacing the server, database, username, and password as appropriate.
-```
+```php
 <?php
 $serverName = "yourServername";
 $connectionOptions = array(
@@ -414,6 +414,15 @@ $connectionOptions = array(
     "pwd" => "yourPassword"
 );
 
+function exception_handler($exception) {
+    echo "<h1>Failure</h1>";
+    echo "Uncaught exception: " , $exception->getMessage();
+    echo "<h1>PHP Info for troubleshooting</h1>";
+    phpinfo();
+}
+
+set_exception_handler('exception_handler');
+
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 if ($conn === false) {
@@ -432,7 +441,7 @@ if ($stmt === false) {
 }
 ?>
 
-<h1> Results : </h1>
+<h1> Success Results : </h1>
 
 <?php
 while ($row = sqlsrv_fetch_array($stmt, SQLSRV_FETCH_ASSOC)) {
@@ -445,6 +454,7 @@ sqlsrv_close($conn);
 function formatErrors($errors)
 {
     // Display errors
+    echo "<h1>SQL Error:</h1>";
     echo "Error information: <br/>";
     foreach ($errors as $error) {
         echo "SQLSTATE: ". $error['SQLSTATE'] . "<br/>";
@@ -454,7 +464,7 @@ function formatErrors($errors)
 }
 ?>
 ```
-Point your browser to https://localhost/testsql.php (https://localhost:8080/testsql.php on macOS). You should now be able to connect to your SQL Server/Azure SQL database.
+Point your browser to https://localhost/testsql.php (https://localhost:8080/testsql.php on macOS). You should now be able to connect to your SQL Server/Azure SQL database. If you don't see a success message showing SQL version information, see [Support resources](support-resources-for-the-php-sql-driver.md) for places to go for help.
 
 ## See Also  
 [Getting Started with the Microsoft Drivers for PHP for SQL Server](../../connect/php/getting-started-with-the-php-sql-driver.md)

docs/database-engine/install-windows/change-the-database-compatibility-mode-and-use-the-query-store.md

@@ -40,7 +40,7 @@ The upgrade process to enable new query processor functionality is related to th
   
 The recommended workflow for upgrading the query processor to the latest version of the code is documented in the [Keep performance stability during the upgrade to newer SQL Server section of Query Store Usage Scenarios](../../relational-databases/performance/query-store-usage-scenarios.md#CEUpgrade), as seen below.  
 
-![query-store-usage-5](../../relational-databases/performance/media/query-store-usage-5.png "query-store-usage-5") 
+![Diagram showing the recommended workflow for upgrading the query processor to the latest version of the code.](../../relational-databases/performance/media/query-store-usage-5.png "query-store-usage-5") 
 
 Starting with [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)] v18, users can be guided through the recommended workflow using the Query Tuning Assistant. For more information, see [Upgrading Databases by using the Query Tuning Assistant](../../relational-databases/performance/upgrade-dbcompat-using-qta.md).
 

docs/database-engine/install-windows/view-and-read-sql-server-setup-log-files.md

@@ -38,7 +38,7 @@ SQL Server Setup creates log files in a dated and time-stamped folder within **\
    | **For unattended installations** | %temp%\sqlsetup*.log |
 
 
- ![setup-bootstrap-example.png](media/view-and-read-sql-server-setup-log-files/setup-bootstrap-example.png)
+ ![Screenshot showing where to find the ConfigurationFiles.ini file in the Setup Bootstrap folder.](media/view-and-read-sql-server-setup-log-files/setup-bootstrap-example.png)
 
  >[!NOTE]
  > The numbers in the path *nnn* correspond to the version of SQL being installed. In the above picture, SQL 2017 was installed, so the folder is 140. For SQL 2016, the folder would be 130, and for SQL 2014 the folder would be 120.

docs/integration-services/expressions/subtract-ssis-expression.md

@@ -38,10 +38,9 @@ numeric_expression1 - numeric_expression2
  Determined by the data types of the two arguments. For more information, see [Integration Services Data Types in Expressions](../../integration-services/expressions/integration-services-data-types-in-expressions.md).  
 
 ## Remarks  
- Enclose the minus unary expression in parenthesis to ensure that the expression is evaluated in the correct order  
-  
-## Remarks  
- If either operand is null, the result is null.  
+ - Enclose the minus unary expression in parenthesis to ensure that the expression is evaluated in the correct order  
+
+ - If either operand is null, the result is null.  
 
 ## Expression Examples  
  This example subtracts numeric literals.  

docs/integration-services/functions-dm-execution-performance-counters.md

@@ -58,14 +58,18 @@ dm_execution_performance_counters [ @execution_id = ] execution_id
 |counter_name|**nvarchar(128)**|The name of the counter.|See the **Remarks** section of values.|  
 |counter_value|**BigInt**|Value returned by the counter.||  
 
-## Example  
+## Examples  
+
+### A. Return statistics for a running execution
+
  In the following example, the function returns statistics for a running execution with an ID of 34.  
 
 ```sql
 select * from [catalog].[dm_execution_performance_counters] (34)  
 ```  
 
-## Example  
+### B. Return statistics for all running executions
+
  In the following example, the function returns statistics for all the executions running on the [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] server, depending on your permissions.  
 
 ```sql

docs/integration-services/system-stored-procedures/catalog-remove-data-tap.md

@@ -32,7 +32,10 @@ catalog.remove_data_tap [ @data_tap_id = ] data_tap_id
  The unique identifier for the data tap that is created by using the catalog.add_data_tap stored procedure. The *data_tap_id* is **bigint**.  
 
 ## Remarks  
- When a package contains more than one data flow tasks that have the same name, the data tap is added to the first data flow task with the given name.  
+
+- When a package contains more than one data flow tasks that have the same name, the data tap is added to the first data flow task with the given name.  
+  
+- To remove data taps, the instance of the execution must be in the created state (a value of 1 in the **status** column of the [catalog.operations (SSISDB Database)](../../integration-services/system-views/catalog-operations-ssisdb-database.md)view) .  
 
 ## Return Codes  
  0 (success)  
@@ -42,9 +45,6 @@ catalog.remove_data_tap [ @data_tap_id = ] data_tap_id
 ## Result Set  
  None  
 
-## Remarks  
- To remove data taps, the instance of the execution must be in the created state (a value of 1 in the **status** column of the [catalog.operations (SSISDB Database)](../../integration-services/system-views/catalog-operations-ssisdb-database.md)view) .  
-  
 ## Permissions  
  This stored procedure requires one of the following permissions:  
 

docs/integration-services/system-stored-procedures/catalog-revoke-permission-ssisdb-database.md

@@ -62,9 +62,6 @@ catalog.revoke_permission [ @object_type = ] object_type
 ## Result Sets  
  None  
 
-## Remarks  
- None  
-  
 ## Permissions  
  This stored procedure requires one of the following permissions: