Merge pull request #2358 from MicrosoftDocs/master

merge to live

Author: ghogen

docs/porting/port-migrate-and-upgrade-visual-studio-projects.md

@@ -1,7 +1,7 @@
 ---
 title: Port, Migrate, and Upgrade Projects
 description: A reference for the support in Visual Studio 2017 for projects created in earlier versions of Visual Studio, and how Visual Studio decides when it needs to migrate a project.
-ms.date: 03/14/2018
+ms.date: 06/19/2018
 ms.prod: visual-studio-dev15
 ms.technology: vs-ide-general
 ms.topic: conceptual
@@ -25,10 +25,9 @@ helpviewer_keywords:
 
 Each new version of Visual Studio generally supports most previous types of projects, files, and other assets. You can work with them [as you always have](../ide/solutions-and-projects-in-visual-studio.md), and provided that you don't depend on newer features, Visual Studio generally tries to preserve backwards compatibility with previous versions like Visual Studio 2015, Visual Studio 2013, and Visual Studio 2012. (See the [Release Notes](https://visualstudio.microsoft.com/vs/release-notes/) for which features are specific to which versions.)
 
-Support for some project types also changes over time. A newer version of Visual Studio may no longer support certain projects, or requires updating a project such that it's no longer backwards compatible. For current status on migration issues, refer to the [Visual Studio Developer Community site](https://developercommunity.visualstudio.com).
+Support for some project types also changes over time. A newer version of Visual Studio may no longer support certain projects at all, or requires updating a project such that it's no longer backwards compatible. For current status on migration issues, refer to the [Visual Studio Developer Community site](https://developercommunity.visualstudio.com).
 
-> [!Important]
-> This present article provides details only for project types in Visual Studio 2017 that involve migration. It does not include supported project types that have no migration issues; that list is found on [Platform Targeting and Compatibility](/visualstudio/productinfo/vs2017-compatibility-vs). Note also that some project types are no longer supported in Visual Studio 2017 at all and therefore cannot be migrated.
+This present article provides details only for project types that Visual Studio 2017 can migrate. The article excludes project types that are no longer supported in Visual Studio 2017 and cannot therefore be migrated. The article also excludes supported project types that have no migration issues; that list is found on [Platform Targeting and Compatibility](https://www.visualstudio.com/productinfo/vs2017-compatibility-vs).
 
 > [!Important]
 > Certain project types require installing the appropriate workloads through the Visual Studio installer. If you don't have the workload installed, Visual Studio reports an unknown or incompatible project type. In that case, check your installation options and try again. Again, see the [Platform Targeting and Compatibility](/visualstudio/productinfo/vs2017-compatibility-vs) article for details on project support in Visual Studio 2017.

docs/python/interactive-repl-ipython.md

@@ -1,7 +1,7 @@
 ---
 title: IPython REPL (interactive window)
 description: Using the Visual Studio interactive window in IPython mode for a user-friendly interactive development environment with Interactive Parallel Computing features.
-ms.date: 07/13/2017
+ms.date: 06/19/2018
 ms.prod: visual-studio-dev15
 ms.technology: vs-python
 ms.topic: conceptual
@@ -22,9 +22,9 @@ For this walkthrough you should have the [Anaconda](https://www.continuum.io) en
 > [!Note]
 > IronPython does not support IPython, despite the fact that you can select it on the Interactive Options form. FOr more information see the [feature request](https://github.com/Microsoft/PTVS/issues/84).
 
-1. Open Visual Studio, switch to the Python Environments window (**View > Other Windows > Python Environments**), and select the Python environment that appeared when you started IPython.
+1. Open Visual Studio, switch to the Python Environments window (**View > Other Windows > Python Environments**), and select an Anaconda environment.
 
-1. Look at the **Packages** (or **pip**) tab and ensure that `IPython` and `matplotlib` are listed. If not, install them here.
+1. Examine the **Packages (Conda)** tab (which may appear as **pip** or **Packages**) for that environment to make sure that `IPython` and `matplotlib` are listed. If not, install them here. (See [Python Environments Windows - Packages tab](python-environments-window-tab-reference.md).)
 
 1. Select the **Overview** tab and select **Use IPython interactive mode.** (In Visual Studio 2015, select **Configure interactive options** to open the **Options** dialog, then set **Interactive Mode** to IPython, and select **OK**).
 
@@ -44,7 +44,7 @@ For this walkthrough you should have the [Anaconda](https://www.continuum.io) en
 
     ![Inline graph in the interactive window](media/ipython-repl-04.png)
 
-1. Instead of typing in the REPL, you can instead write code in the editor, select it, right-click, and select the **Send to interactive** command (or press Ctrl-Enter). Try pasting the code below into a new file in the editor, selecting it with Ctrl-A, then sending to the interactive window. (Note that Visual Studio sends the code as one unit to avoid giving you intermediate or partial graphs. Also note that if you don't have a Python project open with a different environment selected, Visual Studio opens an interactive window for whatever environment is selected as your default in the **Python Environments** window.)
+1. Instead of typing in the REPL, you can instead write code in the editor, select it, right-click, and select the **Send to interactive** command (or press Ctrl+Enter). Try pasting the code below into a new file in the editor, selecting it with Ctrl-A, then sending to the interactive window. (Visual Studio sends the code as one unit to avoid giving you intermediate or partial graphs. And if you don't have a Python project open with a different environment selected, Visual Studio opens an interactive window for whatever environment is selected as your default in the **Python Environments** window.)
 
     ```python
     from mpl_toolkits.mplot3d import Axes3D

docs/python/learn-django-in-visual-studio-step-01-project-and-solution.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 1: Get started with the Django web framework in Visual Studio
+# Tutorial: Get started with the Django web framework in Visual Studio
 
 [Django](https://www.djangoproject.com/) is a high-level Python framework designed for rapid, secure, and scalable web development. This tutorial explores the Django framework in the context of the project templates that Visual Studio provides to streamline the creation of Django-based web apps.
 
@@ -202,7 +202,7 @@ At this point, the basic Django project does not contain any apps. You create an
 > [!div class="nextstepaction"]
 > [Create a Django app with views and page templates](learn-django-in-visual-studio-step-02-create-an-app.md)
 
-## Going deeper
+## Go deeper
 
 - Django project code: [Writing your first Django app, part 1](https://docs.djangoproject.com/en/2.0/intro/tutorial01/) (docs.djangoproject.com)
 - Administrative utility: [django-admin and manage.py](https://docs.djangoproject.com/en/2.0/ref/django-admin/) (docs.djangoproject.com)

docs/python/learn-django-in-visual-studio-step-02-create-an-app.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 2: Create a Django app with views and page templates
+# Step 2: Create a Django app with views and page templates
 
 **Previous step: [Create a Visual Studio project and solution](learn-django-in-visual-studio-step-01-project-and-solution.md)**
 
@@ -267,7 +267,7 @@ Answer: When Django looks for a template referred to in the `render` function, i
 > [!div class="nextstepaction"]
 > [Serve static files, add pages, and use template inheritance](learn-django-in-visual-studio-step-03-serve-static-files-and-add-pages.md)
 
-## Going deeper
+## Go deeper
 
 - [Writing your first Django app, part 1 - views](https://docs.djangoproject.com/en/2.0/intro/tutorial01/#write-your-first-view) (docs.djangoproject.com)
 - For more capabilities of Django templates, such as includes and inheritance, see [The Django template language](https://docs.djangoproject.com/en/2.0/ref/templates/language/) (docs.djangoproject.com)

docs/python/learn-django-in-visual-studio-step-03-serve-static-files-and-add-pages.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 3: Serve static files, add pages, and use template inheritance
+# Step 3: Serve static files, add pages, and use template inheritance
 
 **Previous step: [Create a Django app with views and page templates](learn-django-in-visual-studio-step-02-create-an-app.md)**
 
@@ -272,7 +272,7 @@ The following steps demonstrate inheritance:
 > [!div class="nextstepaction"]
 > [Use the full Django Web Project template](learn-django-in-visual-studio-step-04-full-django-project-template.md)
 
-## Going deeper
+## Go deeper
 
 - [Writing your first Django app, part 3 (views)](https://docs.djangoproject.com/en/2.0/intro/tutorial03/) (docs.djangoproject.com)
 - For more capabilities of Django templates, such as control flow, see [The Django template language](https://docs.djangoproject.com/en/2.0/ref/templates/language/) (docs.djangoproject.com)

docs/python/learn-django-in-visual-studio-step-04-full-django-project-template.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 4: Use the full Django Web Project template
+# Step 4: Use the full Django Web Project template
 
 **Previous step: [Serve static files, add pages, and use template inheritance](learn-django-in-visual-studio-step-03-serve-static-files-and-add-pages.md)**
 
@@ -210,7 +210,7 @@ Answer: The lack of the trailing '$' in the regular expression was a simple over
 > [!div class="nextstepaction"]
 > [Authenticate users in Django](learn-django-in-visual-studio-step-05-django-authentication.md)
 
-## Going deeper
+## Go deeper
 
 - [Writing your first Django app, part 4 - forms and generic views](https://docs.djangoproject.com/en/2.0/intro/tutorial04/) (docs.djangoproject.com)
 - Tutorial source code on GitHub: [Microsoft/python-sample-vs-learning-django](https://github.com/Microsoft/python-sample-vs-learning-django)

docs/python/learn-django-in-visual-studio-step-05-django-authentication.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 5: Authenticate users in Django
+# Step 5: Authenticate users in Django
 
 **Previous step: [Use the full Django Web Project template](learn-django-in-visual-studio-step-04-full-django-project-template.md)**
 
@@ -28,7 +28,7 @@ In this step you learn:
 
 The following steps exercise the authentication flow and describe the parts of the project that are involved:
 
-1. If you have not already followed the instructions in the `readme.html` file in the project root to create a super user (administrator) account, do so now.
+1. If you've not already followed the instructions in the `readme.html` file in the project root to create a super user (administrator) account, do so now.
 
 1. Run the app from Visual Studio using **Debug** > **Start Debugging** (F5). When the app appears in the browser, observe that **Log in** appears on the upper right of the nav bar.
 
@@ -57,7 +57,7 @@ The following steps exercise the authentication flow and describe the parts of t
     {% endif %}
     ```
 
-1. Because no user is authenticated when you first start the app, this template code renders only the "Log in" link to the relative path "login". As specified in `urls.py` as shown in the previous section, that route is mapped to the `django.contrib.auth.views.login` view that is given the following data:
+1. Because no user is authenticated when you first start the app, this template code renders only the "Log in" link to the relative path "login". As specified in `urls.py` (as shown in the previous section), that route is mapped to the `django.contrib.auth.views.login` view. That view receives the following data:
 
     ```python
     {
@@ -90,7 +90,7 @@ The following steps exercise the authentication flow and describe the parts of t
                                        'placeholder':'Password'}))
     ```
 
-    As you can see, this form class derives from `AuthenticationForm` and specifically overrides the username and password fields to add placeholder text. The Visual Studio template includes this explicit code on the assumption that you'll likely want to customize the form, such as adding password strength validation.
+    As you can see, this form class derives from `AuthenticationForm` and specifically overrides the username and password fields to add placeholder text. The Visual Studio template includes this explicit code on the assumption that you likely want to customize the form, such as adding password strength validation.
 
 1. When you navigate to the login page, then, the app renders the `login.html` template. The variables `{{ form.username }}` and `{{ form.password }}` render the `CharField` forms from `BootstrapAuthenticationForm`. There's also a built-in section to show validation errors, and a ready-made element for social logins if you choose to add those services.
 
@@ -139,13 +139,13 @@ The following steps exercise the authentication flow and describe the parts of t
     {% endblock %}
     ```
 
-1. When you submit the form, Django attempts to authenticate the credentials you provide (such as the super user's credentials). If authentication fails, you remain on the same page but `form.errors` set to true. If authentication is successful, Django navigates to the relative URL in the "next" field, `<input type="hidden" name="next" value="/" />`, which in this case is the home page (`/`).
+1. When you submit the form, Django attempts to authenticate your credentials (such as the super user's credentials). If authentication fails, you remain on the current page but `form.errors` set to true. If authentication is successful, Django navigates to the relative URL in the "next" field, `<input type="hidden" name="next" value="/" />`, which in this case is the home page (`/`).
 
 1. Now, when the home page is rendered again, the `user.is_authenticated` property is true when the `loginpartial.html` template is rendered. As a result, you see a "Hello (username)" message and "Log off". You can use `user.is_authenticated` in other parts of the app to check authentication.
 
     ![Hello message and logoff control on the Django Web Project app page](media/django/step05-logoff-control.png)
 
-1. To check whether the authenticated user is authorized to access specific resources, you'll need to retrieve user-specific permissions from your database for that user. For more details, see [Using the Django authentication system](https://docs.djangoproject.com/en/2.0/topics/auth/default/#permissions-and-authorization) (Django docs).
+1. To check whether the authenticated user is authorized to access specific resources, you need to retrieve user-specific permissions from your database. For more information, see [Using the Django authentication system](https://docs.djangoproject.com/en/2.0/topics/auth/default/#permissions-and-authorization) (Django docs).
 
 1. The super user or administrator, in particular, is authorized to access the built-in Django administrator interfaces using the relative URLs "/admin/" and "/admin/doc/". To enable these interfaces, open the Django project's `urls.py` and remove the comments from the following entries:
 
@@ -195,14 +195,14 @@ The following steps exercise the authentication flow and describe the parts of t
 
 ### Question: what is the purpose of the {% crsf_token %} tag that appears in the \<form\> elements?
 
-Answer: The `{% crsf_token %}` tag includes Django's built-in [cross-site request forgery (crsf) protection](https://docs.djangoproject.com/en/2.0/ref/csrf/) (Django docs). You typically add this tag to any element that involves POST, PUT, or DELETE request methods, such as a form, and the template rendering function (`render`) inserts the necessary protection.
+Answer: The `{% crsf_token %}` tag includes Django's built-in [cross-site request forgery (crsf) protection](https://docs.djangoproject.com/en/2.0/ref/csrf/) (Django docs). You typically add this tag to any element that involves POST, PUT, or DELETE request methods, such as a form. The template rendering function (`render`) then inserts the necessary protection.
 
 ## Next steps
 
 > [!div class="nextstepaction"]
 > [Use the Polls Django Web Project template](learn-django-in-visual-studio-step-06-polls-django-web-project-template.md)
 
-## Going deeper
+## Go deeper
 
 - [User authentication in Django](https://docs.djangoproject.com/en/2.0/topics/auth/) (docs.djangoproject.com)
 - Tutorial source code on GitHub: [Microsoft/python-sample-vs-learning-django](https://github.com/Microsoft/python-sample-vs-learning-django)

docs/python/learn-django-in-visual-studio-step-06-polls-django-web-project-template.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 6: Use the Polls Django Web Project template
+# Step 6: Use the Polls Django Web Project template
 
 **Previous step: [Authenticate users in Django](learn-django-in-visual-studio-step-05-django-authentication.md)**
 

docs/python/learn-flask-visual-studio-step-01-project-solution.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 1: Get started with the Flask web framework in Visual Studio
+# Tutorial: Get started with the Flask web framework in Visual Studio
 
 [Flask](http://flask.pocoo.org/) is a lightweight Python framework for web applications that provides the basics for URL routing and page rendering.
 
@@ -246,7 +246,7 @@ At this point, the basic Flask project contains the startup code and page code i
 > [!div class="nextstepaction"]
 > [Create a Flask app with views and page templates](learn-flask-visual-studio-step-02-create-app.md)
 
-## Going deeper
+## Go deeper
 
 - [Flask Quickstart](http://flask.pocoo.org/docs/1.0/quickstart/) (flask.pocoo.org)
 - Tutorial source code on GitHub: [Microsoft/python-sample-vs-learning-flask](https://github.com/Microsoft/python-sample-vs-learning-flask)

docs/python/learn-flask-visual-studio-step-02-create-app.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 2: Create a Flask app with views and page templates
+# Step 2: Create a Flask app with views and page templates
 
 **Previous step: [Create a Visual Studio project and solution](learn-flask-visual-studio-step-01-project-solution.md)**
 
@@ -212,7 +212,7 @@ Answer: Yes, you can use subfolders and then refer to the relative path under `t
 > [!div class="nextstepaction"]
 > [Serve static files, add pages, and use template inheritance](learn-flask-visual-studio-step-03-serve-static-files-add-pages.md)
 
-## Going deeper
+## Go deeper
 
 - [Flask Quickstart - Rendering Templates](http://flask.pocoo.org/docs/1.0/quickstart/#rendering-templates) (flask.pocoo.org)
 - Tutorial source code on GitHub: [Microsoft/python-sample-vs-learning-flask](https://github.com/Microsoft/python-sample-vs-learning-flask)

docs/python/learn-flask-visual-studio-step-03-serve-static-files-add-pages.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 3: Serve static files, add pages, and use template inheritance
+# Step 3: Serve static files, add pages, and use template inheritance
 
 **Previous step: [Create a Flask app with views and page templates](learn-flask-visual-studio-step-02-create-app.md)**
 
@@ -278,7 +278,7 @@ The following steps demonstrate inheritance:
 > [!div class="nextstepaction"]
 > [Use the full Flask Web Project template](learn-flask-visual-studio-step-04-full-flask-project-template.md)
 
-## Going deeper
+## Go deeper
 
 - For more capabilities of Jinja templates, such as control flow, see [Jinja Template Designer Documentation](http://jinja.pocoo.org/docs/2.10/templates) (jinja.pocoo.org)
 - For  details on using `url_for`, see [url_for](http://flask.pocoo.org/docs/1.0/api/?highlight=url_for#flask.url_for) within the Flask Application object documentation (flask.pocoo.org)

docs/python/learn-flask-visual-studio-step-04-full-flask-project-template.md

@@ -13,7 +13,7 @@ ms.workload:
   - data-science
 ---
 
-# Tutorial step 4: Use the full Flask Web Project template
+# Step 4: Use the full Flask Web Project template
 
 **Previous step: [Serve static files, add pages, and use template inheritance](learn-flask-visual-studio-step-03-serve-static-files-add-pages.md)**
 
@@ -226,7 +226,7 @@ Feel free to experiment with both Jinja and Jade syntaxes to see which one works
 > [!div class="nextstepaction"]
 > [The Polls Flask Web Project template](learn-flask-visual-studio-step-05-polls-flask-web-project-template.md)
 
-## Going deeper
+## Go deeper
 
 - [Writing your first Flask app, part 4 - forms and generic views](https://docs.djangoproject.com/en/2.0/intro/tutorial04/) (docs.djangoproject.com)
 - [Jade on GitHib (Documentation)](https://github.com/liuliqiang/pyjade) (github.com)