Merge pull request #3747 from stevestein/SqlCarbon

Author: Steve Stein

docs/carbon/TOC.md

@@ -1,24 +1,19 @@
-# [Carbon Documentation](index.md)
-# [Download and Install Carbon](download.md)
+# [SQL Operations Studio Documentation](index.md)
+# [Download and Install SQL Operations Studio](download.md)
 # [FAQ](faq.md)
 # [Overview](overview.md)
 # Quickstarts
-## Run Carbon on Windows
-### [Connect & query SQL Server](get-started-sql-server.md)
-### [Connect & query SQL Database](get-started-sql-database.md)
-### [Connect & query SQL Data Warehouse](get-started-sql-dw.md)
-## Run Carbon on macOS
-### [Connect & query SQL Server (macOS)](get-started-sql-server-mac.md)
-## Run Carbon on Linux
-### [Connect & query SQL Server (Linux)](get-started-sql-server-linux.md)
+## [Connect & query SQL Server](get-started-sql-server.md)
+## [Connect & query SQL Database](get-started-sql-database.md)
+## [Connect & query SQL Data Warehouse](get-started-sql-dw.md)
 # Tutorials
 ## [Query Editor](tutorial-modern-code-flow-sql-server.md) 
 ## [Monitor](tutorial-monitoring-sql-server.md)
-### [1. Database Insight - Monitoring Query Performance](tutorial-qds-sql-server.md)
-### [2. Database Insight - Table Space Usage](tutorial-table-space-sql-server.md)
-### [3. Server Insight - Backup Status](tutorial-backup-status-sql-server.md)
-### [4. Server Insight - Database Size](tutorial-db-size-sql-server.md)
-### [5. Build Custom Insight - Missing Index and Memory Usage](tutorial-build-custom-insight-sql-server.md) 
+### [Database Insight - Monitoring Query Performance](tutorial-qds-sql-server.md)
+### [Database Insight - Table Space Usage](tutorial-table-space-sql-server.md)
+### [Server Insight - Backup Status](tutorial-backup-status-sql-server.md)
+### [Server Insight - Database Size](tutorial-db-size-sql-server.md)
+### [Custom Insight - Missing Index and Memory Usage](tutorial-build-custom-insight-sql-server.md) 
 ## [Backup and restore](tutorial-backup-restore-sql-server.md)
 # How-to guides
 ## [Management dashboards & Insight widgets](insight-widgets.md)
@@ -31,5 +26,5 @@
 ## [Windows authentication (Kerberos)](enable-kerberos.md)
 # Reference
 # Resources
-## [Carbon GitHub repo](https://www.github.com/Microsoft/Carbon)
+## [SQL Operations Studio GitHub repo](https://www.github.com/Microsoft/Carbon)
 # [Usage Data Collection](usage-data-collection.md)

docs/carbon/download.md

@@ -1,34 +1,29 @@
 ---
-title: Download and install Carbon | Microsoft Docs
-description: 'Download and Install Carbon for Linux, macOS, or Windows'
-keywords: Carbon, install Carbon, download Carbon
-services: 
-documentationcenter: ''
-author: stevestein
+title: Download and install Microsoft SQL Operations Studio | Microsoft Docs
+description: 'Download and Install Microsoft SQL Operations Studio for Windows, macOS, or Linux'
+keywords: Microsoft SQL Operations Studio, install Microsoft SQL Operations Studio, download Microsoft SQL Operations Studio
+ms.custom: "tools|sos"
+ms.date: "10/31/2017"
+ms.prod: "sql-non-specified"
+ms.reviewer: "alayu; erickang; sanagama; sstein"
+ms.suite: "sql"
+ms.tgt_pltfrm: ""
+ms.topic: "article"
+author: "stevestein"
+ms.author: "sstein"
 manager: craigg
-editor: 
-
-ms.assetid: 
-ms.service:
-ms.custom: 
-ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.prod: NEEDED
-ms.workload: data-management
-ms.date: 10/19/2017
-ms.author: sstein
+ms.workload: "Inactive"
 ---
-# Download and install Carbon
+# Download and install Microsoft SQL Operations Studio
 
-[Carbon](index.md) is a lightweight, open source, multi-OS and multi-database tool, designed from the ground-up for DBAs and developers. Carbon simplifies configuration, management, monitoring, and troubleshooting of databases. 
+[!INCLUDE[name-sos-short](../includes/name-sos-short.md)] is a free, lightweight, modern database development and management tool that runs on Windows, macOS, and Linux. Use [!INCLUDE[name-sos-short](../includes/name-sos-short.md)] to manage SQL Server running anywhere, Azure SQL Database, and Azure SQL Data Warehouse.   
 
 > [!NOTE]
-> This preview version of Carbon installs by copying a zip (tar) file to your local computer, extracting (expanding) the file, and running the executable.
+> This preview version of [!INCLUDE[name-sos-short](../includes/name-sos-short.md)] installs by copying a zip (tar) file to your local computer, extracting (expanding) the file, and running the executable.
 
 ## Supported Operating Systems
 
-Carbon runs on Linux, Mac, and Windows.
+Carbon runs on Windows, macOS, and Linux.
 
 Carbon is supported on the following platforms:
 
@@ -38,7 +33,7 @@ Carbon is supported on the following platforms:
 | Mac | macOS Sierra (10.12), macOS High Sierra (10.13) |
 | Linux | Ubuntu 16.04 LTS, Red Hat Enterprise Linux 7.3 (RHEL)|
 
-??NEED TO FINALIZE THE ABOVE LIST- I grabbed this info from the mail thread about supported OS's
+??NEED TO FINALIZE THE ABOVE LIST- I grabbed this info from the mail thread about supported OSs
 
 Other Potential Platforms
 - Windows 8.1 (64-bit)
@@ -57,26 +52,14 @@ Other Potential Platforms
 ## Get Carbon for Windows
 
 1. Download [Carbon for Windows](https://github.com/Microsoft/carbon/releases/download/v0.20.0/2017-Sep-27-carbon-windows.zip) to your local computer.
-2. Browse to the downloaded file and extract it.
-3. Run *\Carbon\Carbon-windows\Carbon.exe* [VERIFY PATH]
 
+   > [!IMPORTANT]
+   > Executable files may be blocked by Windows when zip files are downloaded from an external source and extracted. Follow the steps below to unblock the .zip file before extracting.
 
-## Get Carbon for Linux
-
-### Red Hat Enterprise
-
-- yum install: `$ sudo yum install -y mssql-Carbon`
-- Offline installation: `$ sudo yum localinstall mssql-server_versionnumber.x86_64.rpm`
-
-### SUSE
-
-- zypper install: `$ sudo zypper install mssql-Carbon`
-- Offline installation: `$ sudo zypper install mssql-server_versionnumber.x86_64.rpm`
-
-### Ubuntu
-
-- apt-get install: `$ sudo apt-get update sudo apt-get install -y mssql-server`
-- Offline installation: `$ sudo dpkg -i mssql-server_versionnumber_amd64.deb`
+1. Right-click the **.zip** file, and select **Properties**.
+1. On the **General** tab, select **Unblock**, and click **Apply**.
+1. Browse to the downloaded file and extract it.
+2. Run *\Carbon\Carbon-windows\Carbon.exe* [VERIFY PATH]
 
 
 ## Get Carbon for macOS
@@ -92,9 +75,24 @@ Other Potential Platforms
       ```carbon .```
 
 
-## Uninstalling Carbon
+## Get Carbon for Linux
+
+1. Open a new Terminal window.
+2. Type the following commands to extract the file and launch Carbon:
+
+```bash
+cd ~
+cp ~/Downloads/pgi3-carbon-linux-x64.tar.gz ~
+tar -xvf ~/pgi3-carbon-linux-x64.tar.gz
+echo 'export PATH="$PATH:~/carbon-linux-x64"' >> ~/.bashrc
+source .bashrc
+carbon .
+```
+
+
+## Uninstall Carbon
 
-To uninstall any flavor of the Carbon preview, just delete the files.
+To uninstall the [!INCLUDE[name-sos-short](../includes/name-sos-short.md)] preview, delete the files.
 
 ## Next Steps
 

docs/carbon/get-started-sql-database.md

@@ -1,34 +1,39 @@
 ---
-title: Connect and query an Azure SQL database using Carbon | Microsoft Docs
-description: Use Carbon to connect to a SQL database and run a query
-author: yualan
-ms.author: alayu
+title: Connect and query an Azure SQL database using SQL Operations Studio | Microsoft Docs
+description: Use SQL Operations Studio to connect to a SQL database and run a query
+keywords:
+ms.custom: "tools|sos"
+ms.date: "11/01/2017"
+ms.prod: "sql-non-specified"
+ms.reviewer: "alayu; erickang; sanagama; sstein"
+ms.suite: "sql"
+ms.tgt_pltfrm: ""
+ms.topic: "quickstart"
+author: "yualan"
+ms.author: "alayu"
 manager: craigg
-ms.reviewer: achatter, alayu, erickang, sanagama, sstein
-ms.service: data-tools
-ms.workload: data-tools
-ms.prod: NEEDED
-ms.custom: mvc
-ms.topic: quickstart
-ms.date: 10/01/2017
+ms.workload: "Inactive"
 ---
-# Azure SQL Database: Use Carbon to connect and query data
+# Azure SQL Database: Use [!INCLUDE[name-sos](../includes/name-sos-short.md)] to connect and query data
 
-This quickstart demonstrates how to use Carbon to connect to an Azure SQL database, and then use Transact-SQL statements to create, insert, and select data in the database.
+This quickstart demonstrates how to use [!INCLUDE[name-sos](../includes/name-sos-short.md)] to connect to an Azure SQL database, and then use Transact-SQL (T-SQL)statements to create, insert, and select data.
 
 ## Prerequisites
 
-This quickstart uses as its starting point the resources created in one of these quick starts:
+To complete this quickstart, you need [!INCLUDE[name-sos](../includes/name-sos-short.md)], and an Azure SQL server where you have *CREATE DATABASE* permissions.
 
-- [Create DB - Portal](https://docs.microsoft.com/en-us/azure/sql-database/sql-database-get-started-portal)
-- [Create DB - CLI](https://docs.microsoft.com/en-us/azure/sql-database/sql-database-get-started-cli)
-- [Create DB - PowerShell](https://docs.microsoft.com/en-us/azure/sql-database/sql-database-get-started-powershell)
+- [Install [!INCLUDE[name-sos](../includes/name-sos-short.md)]](download.md).
 
-Before you start, install Carbon by following [these directions](download.md).
+If you don't already have an Azure SQL server, complete one of the following Azure SQL Database quickstarts:
 
-## SQL server connection information
+- [Create DB - Portal](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-portal)
+- [Create DB - CLI](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-cli)
+- [Create DB - PowerShell](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-powershell)
 
-Get the connection information needed to connect to the Azure SQL database. You will need the fully qualified server name, database name, and login information in the next procedures.
+
+## Get your Azure SQL server connection string
+
+Get the connection information needed to connect to the Azure SQL database. You need the fully qualified server name, database name, and login information in the next procedures.
 
 1. Log in to the [Azure portal](https://portal.azure.com/).
 
@@ -43,39 +48,34 @@ Get the connection information needed to connect to the Azure SQL database. You
 
 ## Connect to your database
 
-Use Carbon to establish a connection to your Azure SQL Database server.
+Use [!INCLUDE[name-sos](../includes/name-sos-short.md)] to establish a connection to your Azure SQL Database server.
 
-> [!IMPORTANT]
-> Before continuing, make sure that you have your server, database, and login information ready. Once you begin entering the connection profile information, if you change your focus from Carbon, you have to restart creating the connection profile.
->
-
-1. When first loading Carbon, a connection page should be displayed. If not, click the **New Connection** icon on the top left.
+1. The first time you run [!INCLUDE[name-sos](../includes/name-sos-short.md)] the **Connection** page should open. If the **Connection** page doesn't open, click the **New Connection** icon in the **SERVERS** page:
 
    ![New Connection Icon](media/get-started-sql-database/new-connection-icon.png)
 
-2. Follow the prompts to specify the connection properties for the new connection profile. After specifying each value, press **ENTER** to continue. 
+2. This article uses *SQL Login*, but *Windows Authentication* is also supported. Fill in the fields as follows:
 
-   | Setting       | Suggested value | Description |
-   | ------------ | ------------------ | ------------------------------------------------- | 
-   | **Authentication** | SQL Login| SQL Authentication is the only authentication type that we have configured in this tutorial. |
-   | **User name** | The server admin account | This is the account that you specified when you created the server. |
-   | **Password (SQL Login)** | The password for your server admin account | This is the password that you specified when you created the server. |
-   | **Save Password?** | Yes or No | Select Yes if you do not want to enter the password each time. |
-   | **Database name** | *leave blank* | The name of the database to which to connect. |
-   | **Server Group** | Select \<Default\> | If you created a server group, you can set to a specific server group. |
+   | Setting | Suggested value | 
+   | :--- |: --- |
+   | **Authentication** | SQL Login | 
+   | **User name** | The server admin account | 
+   | **Password (SQL Login)** | The password for your Azure SQL server | 
+   | **Save Password?** | Yes or No - If you don't want to enter the password each time, select Yes. |
+   | **Database name** | *leave blank* | 
+   | **Server Group** | Select \<Default\> | 
 
    ![New Connection Icon](media/get-started-sql-database/new-connection-screen.png)  
 
-3. If you are successfully connected, ignore this step. If you see the following screen, you will need to register your IP address. You can do this through Carbon by clicking add an account, logging in with your Azure credentials, and then adding your IP.
+3. If you are successfully connected, skip ahead to the next section. If you see the *Create firewall rule* screen, you need to register your IP address. Add an account, and click **OK**.
 
    ![Firewall image](media/get-started-sql-database/setup-firewall-ip.png)  
 
-4. You should see your connection in the object explorer.
 
 ## Create a tutorial database
-1. Right click on your server in the object explorer and select **New Query.**
+1. Right click on your Azure SQL server in the SERVERS screen and select **New Query.**
 
-2. Copy the snippet below and paste in the query window. Click **Run** to execute the query.
+1. Paste the following snippet into the query window.
 
    ```sql
    IF NOT EXISTS (
@@ -89,9 +89,10 @@ Use Carbon to establish a connection to your Azure SQL Database server.
    ALTER DATABASE [TutorialDB] SET QUERY_STORE=ON
    GO
    ```
+1. To execute the query, click **Run**.
 
 ## Create a table
-1. Copy the snippet below and paste in the query window.
+1. Paste the following snippet into the query window.
    ```sql
    -- Create a new table called 'Customers' in schema 'dbo'
    -- Drop the table if it already exists
@@ -114,7 +115,7 @@ Use Carbon to establish a connection to your Azure SQL Database server.
    ![Change context](media/get-started-sql-database/change-context.png)
 
 ## Insert rows
-Copy the snippet below to insert four rows and paste in the query window. Click **Run** to execute the query.
+1. Paste the following snippet into the query window. 
    ```sql
    -- Insert rows into table 'Customers'
    INSERT INTO dbo.Customers
@@ -126,17 +127,20 @@ Copy the snippet below to insert four rows and paste in the query window. Click
       ( 4, N'Jake', N'United States', N'jake@vsdata.io')   
    GO   
    ```
+1. To execute the query, click **Run**.
 
 ## View the result
-Copy the snippet below to view all the rows and paste in the query window. Click **Run** to execute the query.
+1. Paste the following snippet into the query window.
    ```sql
    -- Select rows from table 'Customers'
    SELECT * FROM dbo.Customers;
    ```
+1. To execute the query, click **Run**.
+
    ![Select results](media/get-started-sql-database/select-results.png)
 
 ## Save result as Excel
-1. Right click on the results table and save as a **Excel** file. 
+1. Right click on the results table and save as an Excel** file. 
 
    ![Save as Excel](media/get-started-sql-database/save-as-excel.png)
 
@@ -147,12 +151,12 @@ View an existing, built-in widget through the dashboard.
 
 ## Clean up resources
 > [!TIP]
-> Other Quickstarts in this collection build upon this quick start. If you plan to continue on to work with subsequent quickstarts, **do not clean up the resources created in this quickstart**. If you do not plan to continue, use the following steps to delete resources created by this quickstart in the Azure portal.
+> Other articles in this collection build upon this quickstart. If you plan to continue on to work with subsequent quickstarts, **do not clean up the resources created in this quickstart**. If you do not plan to continue, use the following steps to delete resources created by this quickstart in the Azure portal.
 Clean up the resources you created in the quickstart either by deleting the ...
 
 To delete the entire resource group including the newly created server:
-1.	Locate your resource group in the Azure portal. From the left-hand menu in the Azure portal, click **Resource groups** and then click the name of your resource group, such as our example **myresourcegroup**.
-2.	On your resource group page, click **Delete**. Then type the name of your resource group, such as our example **myresourcegroup**, in the text box to confirm deletion, and then click **Delete**.
+1.	Locate your resource group in the Azure portal. From the left-hand menu in the Azure portal, click **Resource groups** and then click the name of your resource group, for example: **myresourcegroup**.
+2.	On your resource group page, click **Delete**. Then type the name of your resource group, for example: **myresourcegroup**, in the text box to confirm deletion, and then click **Delete**.
 
 Or instead, to delete the newly created server:
 1.	Locate your server in the Azure portal, if you do not have it open. From the left-hand menu in Azure portal, click **All resources**, and then search for the server you created.
@@ -161,10 +165,4 @@ Or instead, to delete the newly created server:
 
 ## Next steps
 > [!div class="nextstepaction"]
-> [Apply modern code flow using Carbon](tutorial-modern-code-flow-sql-server.md)
-
-> [!div class="nextstepaction"]
-> [Monitor your SQL Server databases using Carbon](tutorial-monitoring-sql-server.md)
-
-> [!div class="nextstepaction"]
-> [Backup and restore your SQL Server databases using Carbon](tutorial-backup-restore-sql-server.md)
+> [Apply modern code flow using [!INCLUDE[name-sos](../includes/name-sos-short.md)]](tutorial-modern-code-flow-sql-server.md)