Merge branch 'live' into master

docs/extensibility/how-to-migrate-extensibility-projects-to-visual-studio-2017.md

@@ -186,7 +186,7 @@ To provide further guidance, we have identified a few common extension types and
 
 Extension Type | Display Name |	Id
 --- | --- | ---
-Editor | Visual Studio core editor	| Microsoft.VisualStudio.CoreEditor
+Editor | Visual Studio core editor	| Microsoft.VisualStudio.Component.CoreEditor
 Roslyn | C# and Visual Basic | Microsoft.VisualStudio.Component.Roslyn.LanguageServices
 WPF | Managed Desktop Workload Core | Microsoft.VisualStudio.Component.ManagedDesktop.Core
 Debugger | Just-In-Time debugger | Microsoft.VisualStudio.Component.Debugger.JustInTime

docs/ide/editorconfig-code-style-settings-reference.md

@@ -476,7 +476,7 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 
 | Value | Description | Applied 
 | ------------- |:-------------|:-------------|
-| True | Prefer `out` variables to be declared inline when possible. | **C#:** <br>`if (int.TryParse(value out int i) {...}`
+| True | Prefer `out` variables to be declared inline when possible. | **C#:** <br>`if (int.TryParse(value, out int i) {...}`
 | False | Prefer `out` variables to be declared explicitly.| **C#:** <br>`int i; if (int.TryParse(value, out i) {...}`
 
 #### Example editorconfig file:

docs/ide/visual-csharp-code-snippets.md

@@ -73,7 +73,7 @@ Code snippets are ready-made snippets of code you can quickly insert into your c
 |mbox|Creates a call to <xref:System.Windows.Forms.MessageBox.Show%2A?displayProperty=fullName>. You may have to add a reference to System.Windows.Forms.dll.|Inside a method, an indexer, a property accessor, or an event accessor.|  
 |namespace|Creates a [namespace](/dotnet/csharp/language-reference/keywords/namespace) declaration.|Inside a namespace (including the global namespace).|  
 |prop|Creates an [auto-implemented property](/dotnet/csharp/programming-guide/classes-and-structs/auto-implemented-properties) declaration.|Inside a class or a struct.|  
-ropfull|Creates a property declaration with get and set accessors.|Inside a class or a struct.|  
+propfull|Creates a property declaration with get and set accessors.|Inside a class or a struct.|  
 |propg|Creates a read-only [auto-implemented property](/dotnet/csharp/programming-guide/classes-and-structs/auto-implemented-properties) with a private "set" accessor.|Inside a class or a struct.|  
 |sim|Creates a [static](/dotnet/csharp/language-reference/keywords/static)[int](/dotnet/csharp/language-reference/keywords/int) Main method declaration.|Inside a class or a struct.|  
 |struct|Creates a [struct](/dotnet/csharp/language-reference/keywords/struct) declaration.|Inside a namespace (including the global namespace), a class, or a struct.|  
@@ -92,4 +92,4 @@ ropfull|Creates a property declaration with get and set accessors.|Inside a clas
  [How to: Create a New Snippet with Replacements](http://msdn.microsoft.com/en-us/8d56d43c-097a-475b-aa85-cae1554b6338)   
  [Template Parameters](../ide/template-parameters.md)   
  [How to: Use Surround-with Code Snippets](../ide/how-to-use-surround-with-code-snippets.md)   
-
+

docs/install/create-an-offline-installation-of-visual-studio.md

@@ -89,8 +89,6 @@ You might want to update your offline installer at a later date. Here's how.
 * To refresh your offline installation folder so that it includes the latest updates, run the ```--layout``` command again. Make sure to point to the same folder that you used before; this way, only those components that have been updated since you last ran ```--layout``` will be downloaded.
 
 
-If you want to update your offline installation, run the `--layout` command again. Make sure to point to the same folder that you used before; this way, only those components that have been updated since you last ran `--layout` will be downloaded.
-
 ### How to troubleshoot an offline installer
 Sometimes, things go wrong. Here is a table of known issues and some workarounds that might help.
 

docs/python/python-in-visual-studio.md

@@ -122,7 +122,7 @@ Supported features by Visual Studio version and edition:
 
 | Web | 2017 | 2015 | 2013 Comm | 2013 Desktop | 2013 Web | 2013 Pro+ | 2012 Pro+ | 2010 SP1 Pro+ |
 | --- | --- | --- | --- | --- | --- | --- | --- | ---|
-| Djano web project | ✔ | ✔ | ✔ | ✗ | ✔ | ✔ | ✔ | ✔ |
+| Django web project | ✔ | ✔ | ✔ | ✗ | ✔ | ✔ | ✔ | ✔ |
 | Bottle web project | ✔ | ✔ | ✔ | ✗ | ✔ | ✔ | ✔ | ✔ |
 | Flask web project | ✔ | ✔ | ✔ | ✗ | ✔ | ✔ | ✔ | ✔ |
 | Generic web project | ✔ | ✔ | ✔ | ✗ | ✔ | ✔ | ✔ | ✔ |
@@ -186,4 +186,4 @@ Supported features by Visual Studio version and edition:
 ## Additional resources
 
 - [Writing Kinect games with Python using PyKinect](https://github.com/Microsoft/PTVS/wiki/PyKinect) (GitHub wiki)
-- [WFastCGI bridge between IIS and Python](https://pypi.python.org/pypi/wfastcgi) (python.org)
+- [WFastCGI bridge between IIS and Python](https://pypi.python.org/pypi/wfastcgi) (python.org)