Merge pull request #27275 from MicrosoftDocs/FromPublicRepo

Resolve syncing conflicts from FromPublicRepo to main

Author: rwestMSFT

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

@@ -44,6 +44,10 @@ apt-get install php8.1 php8.1-dev php8.1-xml -y --allow-unauthenticated
 
 Install the ODBC driver for Ubuntu by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (Linux)](../../connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server.md). Make sure to also install the `unixodbc-dev` package. It's used by the `pecl` command to install the PHP drivers.
 
+```bash
+sudo apt-get install unixodbc-dev
+```
+
 ### Step 3. Install the PHP drivers for Microsoft SQL Server (Ubuntu)
 
 ```bash

docs/linux/includes/quickstart-connect-query.md

@@ -66,8 +66,10 @@ Next create a new table, `dbo.Inventory`, and insert two new rows.
 
    ```sql
    CREATE TABLE dbo.Inventory (
-      id INT, name NVARCHAR(50),
-      quantity INT
+       id INT,
+       name NVARCHAR(50),
+       quantity INT,
+       PRIMARY KEY (id)
    );
    ```
 

docs/t-sql/functions/string-escape-transact-sql.md

@@ -34,7 +34,7 @@ STRING_ESCAPE( text , type )
 ## Arguments
 
  *text*  
- Is a **nvarchar**[expression](../../t-sql/language-elements/expressions-transact-sql.md) expression representing the object that should be escaped.  
+ Is a **nvarchar** [expression](../../t-sql/language-elements/expressions-transact-sql.md) representing the object that should be escaped.  
 
  *type*  
  Escaping rules that will be applied. Currently the value supported is `'json'`.