Merge branch 'master' into gewarren-bugfixes

Author: gewarren

.openpublishing.publish.config.json

@@ -60,6 +60,22 @@
       },
       "build_entry_point": "docs",
       "template_folder": "_themes"
+    },
+    {
+      "docset_name": "vsdata",
+      "build_source_folder": "vsdata",
+      "build_output_subfolder": "vsdata",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
     }
   ],
   "notification_subscribers": [],

docs/data-tools/index.md

@@ -30,7 +30,7 @@ Learn how to use data tools in Visual Studio to develop and test data solutions
         </a>
     </li>
     <li>
-        <a href="https://msdn.microsoft.com/library/hh272686\(v=vs.103\).aspx">
+        <a href="https://msdn.microsoft.com/library/hh272686(v=vs.103).aspx">
         <div class="cardSize">
             <div class="cardPadding">
                 <div class="card">
@@ -48,7 +48,7 @@ Learn how to use data tools in Visual Studio to develop and test data solutions
         </a>
     </li>
     <li>
-        <a href="/azure-docs/data-lake-analytics/data-lake-analytics-data-lake-tools-get-started.md">
+        <a href="/azure/data-lake-analytics/data-lake-analytics-data-lake-tools-get-started">
         <div class="cardSize">
             <div class="cardPadding">
                 <div class="card">
@@ -66,7 +66,7 @@ Learn how to use data tools in Visual Studio to develop and test data solutions
         </a>
     </li>
     <li>
-        <a href="/azure-docs/hdinsight/hdinsight-hadoop-visual-studio-tools-get-st.md">
+        <a href="/azure/hdinsight/hdinsight-hadoop-visual-studio-tools-get-started">
         <div class="cardSize">
             <div class="cardPadding">
                 <div class="card">
@@ -84,7 +84,7 @@ Learn how to use data tools in Visual Studio to develop and test data solutions
         </a>
     </li>
     <li>
-        <a href="/azure-docs/stream-analytics/stream-analytics-tools-for-visual-studio.md">
+        <a href="/azure/stream-analytics/stream-analytics-tools-for-visual-studio">
         <div class="cardSize">
             <div class="cardPadding">
                 <div class="card">

docs/python/TOC.md

@@ -1,28 +1,45 @@
-# [Python in Visual Studio](python-in-visual-studio.md)
-## [Installation](installation.md)
-### [Python Environments](python-environments.md)
-### [Managing Python on Azure App Service](managing-python-on-azure-app-service.md)
-### [Azure SDK for Python](azure-sdk-for-python.md)
-## [Getting Started with Python](getting-started.md)
-### [Publishing to Azure](publishing-to-azure.md)
-### [Creating a C++ Extension for Python](cpp-and-python.md)
+# [Overview](python-in-visual-studio.md)
+# [Installation](installation.md)
+# Quickstarts
+## [Create a project from existing code](quickstart-01-project-from-existing.md)
+## [Create a project from a template](quickstart-02-project-from-template.md)
+## [Create a project from a repository](quickstart-03-project-from-repository.md)
+## [Create a project from a Cookiecutter template](quickstart-04-project-from-cookiecutter.md)
+# Tutorials
+## [0 - Install Python support](vs-tutorial-01-00.md)
+## [1 - Create a new Python project](vs-tutorial-01-01.md)
+## [2 - Writing and running code](vs-tutorial-01-02.md)
+## [3 - Using the interactive REPL window](vs-tutorial-01-03.md)
+## [4 - Running code in the debugger](vs-tutorial-01-04.md)
+## [5 - Installing packages and managing Python environments](vs-tutorial-01-05.md)
+## [6 - Working with Git](vs-tutorial-01-06.md)
+# Concepts
+## [Python Environments](python-environments.md)
 ## [Python Projects](python-projects.md)
 ### [Web Project Templates](template-web.md)
 ### [Django Web Project Template](template-django.md)
 ### [Azure Cloud Service Template](template-azure-cloud-service.md)
+## [Managing Python on Azure App Service](managing-python-on-azure-app-service.md)
+## [Azure SDK for Python](azure-sdk-for-python.md)
+# How To
 ## [Editing Code](code-editing.md)
 ### [Formatting Code](code-formatting.md)
 ### [Refactoring Code](code-refactoring.md)
 ### [Using PyLint](code-pylint.md)
 ## [Interactive Python (REPL)](interactive-repl.md)
 ### [Using IPython REPL](interactive-repl-ipython.md)
 ## [Debugging](debugging.md)
+### [Cross-platform Remote Debugging](debugging-cross-platform-remote.md)
+## [Publishing to Azure App Service](publishing-to-azure.md)
 ### [Azure Remote Debugging](debugging-azure-remote.md)
 ### [Troubleshooting Azure Remote Debugging](debugging-azure-remote-troubleshooting.md)
-### [Cross-platform Remote Debugging](debugging-cross-platform-remote.md)
+## Interacting with C++
+### [Creating a C++ Extension for Python](cpp-and-python.md)
 ### [Python/C++ Mixed-Mode Debugging](debugging-mixed-mode.md)
 ### [Symbols for Mixed-Mode Debugging](debugging-symbols-for-mixed-mode.md)
-## [Options](options.md)
 ## [Profiling](profiling.md)
 ## [Unit Testing](unit-testing.md)
-## [Using the Cookiecutter Extension](cookiecutter.md)
+## [Using the Cookiecutter Extension](cookiecutter.md)
+## [Installation for Visual Studio 2015 and earlier](installation.md)
+# Reference
+## [Options](options.md)

docs/python/includes/install-github-extension.md

@@ -0,0 +1,4 @@
+1. To connect to GitHub repositories, run the Visual Studio installer, select **Modify**, and select the **Individual components** tab. Scroll down to the **Code tools** section, select **GitHub extension for Visual Studio**, and select **Modify**.
+    
+    ![Selecting the GitHub extension in the Visual Studio installer](../media/installation-github-extension.png)
+    

docs/python/includes/project-from-existing.md

@@ -0,0 +1,19 @@
+1. Launch Visual Studio and select **File > New > Project**.
+
+1. In the **New Project** dialog, search for "Python", select the "From Existing Python code" template, give the project a name and location, and select **OK**.
+
+1. In the wizard that appears, set the path to your existing code, set a filter for file types, and specify any search paths that your project requires, then select **Next**. If you don't know what search paths are, leave that field blank.
+
+    ![New Project from Existing Code, step 1](../media/projects-from-existing-1.png)
+
+1. In the next dialog, select the startup file for your project and select **Next**. (If desired, select an environment; otherwise accept the defaults.) Note that the dialog shows only files in the root folder; if the file you want is in a subfolder, leave the startup file blank and set it later in Solution Explorer (described below). 
+
+    ![New Project from Existing Code, step 2](../media/projects-from-existing-2.png)
+
+1. Select the location in which to save the project file (a `.pyproj` file on disk). If applicable, you can also include auto-detection of virtual environments and customize the project for different web frameworks. If you're unsure of these options, leave them set to the defaults.
+
+    ![New Project from Existing Code, step 3](../media/projects-from-existing-3.png)
+
+1.  Select **Finish** and Visual Studio creates the project and opens it in Solution Explorer. If you want to move the `.pyproj` file elsewhere, select it in Solution Explorer and choose **File > Save As**. This action updates file references in the project but does not move any code files.
+
+1. To set a different startup file, locate the file in Solution Explorer, right-click, and select **Set as Startup File**.

docs/python/installation.md

@@ -1,7 +1,7 @@
 ---
 title: Installation for Python in Visual Studio | Microsoft Docs
 ms.custom: ""
-ms.date: 7/13/2017
+ms.date: 9/22/2017
 ms.reviewer: ""
 ms.suite: ""
 ms.technology: 
@@ -20,7 +20,7 @@ manager: "ghogen"
 
 To install Python support for Visual Studio, follow the instructions in the section that matches your version of Visual Studio:
 
-- [Visual Studio 2017](#visual-studio-2017)
+- [Visual Studio 2017](vs-tutorial-01-00.md)
 - [Visual Studio 2015](#visual-studio-2015)
 - [Visual Studio 2013 and earlier](#visual-studio-2013-and-earlier)
 
@@ -36,20 +36,8 @@ To quickly test Python support after following the installation steps, Open the
 
 ## Visual Studio 2017
 
-1. Install the Visual Studio 2017 from [https://www.visualstudio.com/vs/](https://www.visualstudio.com/vs/).
+Refer to [Tutorial Step 0: install Python support in Visual Studio 2017](vs-tutorial-01-00.md).
 
-1. In the Visual Studio installer, select the **Web & Cloud > Python Development**  workload.
-
-    ![Python development workload in the Visual Studio installer](media/installation-python-workload.png)
-
-    > [!Note]
-    > Python is also included in the **Data science and analytical applications** workload.
-
-1. On the right side of the installer, select the Python interpreters and other related tools you want to include. For example, if you plan on developing C++ extensions for Python, include the **Python native development tools** option.
-
-    ![Python development options in the Visual Studio installer](media/installation-python-options.png)
-
-1. If you already have interpreters installed on your computer, see [Creating an environment for an existing interpreter](python-environments.md#creating-an-environment-for-an-existing-interpreter).
 
 ## Visual Studio 2015