Merge branch 'live' into master

Author: ghogen

docs/extensibility/keybinding-element.md

@@ -51,9 +51,9 @@ The KeyBinding element specifies keyboard shortcuts for the commands.
 |guid|Required.|  
 |id|Required.|  
 |editor|Required. The editor GUID indicates the editing context for which this keyboard shortcut will be active. The global binding scope value is "guidVSStd97".|  
-|key1|Required. Valid values include all typable alphanumerics, and also two-digit hexadecimal values preceded by 0x and VK_constants.|  
+|key1|Required. Valid values include all typable alphanumerics, and also two-digit hexadecimal values preceded by 0x and [VK_constants](https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731.aspx).|  
 |mod1|Optional. Any combination of CTRL, ALT, and SHIFT separated by space.|  
-|key2|Optional. Valid values include all typable alphanumerics, and also two-digit hexadecimal values preceded by 0x and VK_constants.|  
+|key2|Optional. Valid values include all typable alphanumerics, and also two-digit hexadecimal values preceded by 0x and [VK_constants](https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731.aspx).|  
 |mod2|Optional. Any combination of CTRL, ALT, and SHIFT separated by space.|  
 |emulator|Optional.|  
 |Condition|Optional. See [Conditional Attributes](../extensibility/vsct-xml-schema-conditional-attributes.md).|  
@@ -84,4 +84,4 @@ The KeyBinding element specifies keyboard shortcuts for the commands.
 
 ## See Also  
  [KeyBindings Element](../extensibility/keybindings-element.md)   
- [Visual Studio Command Table (.Vsct) Files](../extensibility/internals/visual-studio-command-table-dot-vsct-files.md)
+ [Visual Studio Command Table (.Vsct) Files](../extensibility/internals/visual-studio-command-table-dot-vsct-files.md)

docs/extensibility/ux-guidelines/colors-and-styling-for-visual-studio.md

@@ -52,7 +52,7 @@ The steps in the [first procedure](../ide/how-to-create-item-templates.md#export
 
 3.  Modify the code file to indicate where parameter replacement should take place. For more information, see [How to: Substitute Parameters in a Template](../ide/how-to-substitute-parameters-in-a-template.md).  
 
-4.  On the **File** menu, click **Export Template**.  
+4.  On the **Project** menu, click **Export Template**.  
 
 5.  Click **Item Template**, select the project that contains the item, and click **Next**.  
 
@@ -160,7 +160,7 @@ The steps in the [first procedure](../ide/how-to-create-item-templates.md#export
 
 2.  Modify the project item until it is ready to be saved as a template.  
 
-3.  As appropriate, modify the code file to indicate where parameter replacement should occur. For more information about parameter replacement, see How to: Substitute Parameters in a Template.  
+3.  As appropriate, modify the code file to indicate where parameter replacement should occur. For more information about parameter replacement, see [How to: Substitute Parameters in a Template.](../ide/how-to-substitute-parameters-in-a-template.md)
 
 4.  Create an XML file and save it by using a .vstemplate file name extension, in the same directory as your new item template.  
 

docs/ide/how-to-create-item-templates.md

@@ -36,12 +36,19 @@ translation.priority.mt:
 ## Detecting existing Visual Studio instances
 We have made several tools available that will help you detect and manage installed Visual Studio instances on client machines:
 
-* [VSWhere](https://github.com/microsoft/vswhere): a C++ executable that helps you find the location of core Visual Studio tools from an installed instance of Visual Studio.
+* [VSWhere](https://github.com/microsoft/vswhere): an executable built into Visual Studio or available for separate distribution that helps you find the location of all Visual Studio instances on a particular machine.
 * [VSSetup.PowerShell](https://github.com/microsoft/vssetup.powershell): PowerShell scripts that use the Setup Configuration API to identify installed instances of Visual Studio.
 * [VS-Setup-Samples](https://github.com/microsoft/vs-setup-samples): C# and C++ samples that demonstrate how to use the Setup Configuration API to query an existing installation.
 
 In addition, the [Setup Configuration API](https://msdn.microsoft.com/en-us/library/microsoft.visualstudio.setup.configuration.aspx) provides interfaces for developers who want to build their own utilities for interrogating Visual Studio instances.
 
+## Using vswhere.exe
+`vswhere.exe` is automatically included in Visual Studio 2017 version 15.2 or above, or you may download it from [the releases page](https://github.com/Microsoft/vswhere/releases). Use `vswhere -?` to get help information about the tool. As an example, this command shows all releases of Visual Studio, including old versions of the product and prereleases, and outputs the results in JSON format:
+
+```cmd
+C:\Program Files (x86)\Microsoft Visual Studio\Installer> vswhere.exe -legacy -prerelease -format json
+```
+
 >[!TIP]
 >For more information about Visual Studio 2017 installation, see [Heath Stewart's blog articles](https://blogs.msdn.microsoft.com/heaths/tag/vs2017/).
 

docs/install/tools-for-managing-visual-studio-instances.md

@@ -52,7 +52,7 @@ Converts between .txt and .resx (XML-based resource format) files and common lan
 |`ExecuteAsTool`|Optional `Boolean` parameter.<br /><br /> If `true`, runs tlbimp.exe and aximp.exe from the appropriate target framework out-of-proc to generate the necessary wrapper assemblies. This parameter allows multi-targeting of `ResolveComReferences`.|  
 |`FilesWritten`|Optional <xref:Microsoft.Build.Framework.ITaskItem>`[]` output parameter.<br /><br /> Contains the names of all files written to disk. This includes the cache file, if any. This parameter is useful for implementations of Clean.|  
 |`MinimalRebuildFromTracking`|Optional `Boolean` parameter.<br /><br /> Gets or sets a switch that specifies whether tracked incremental build will be used. If `true`, incremental build is turned on; otherwise, a rebuild will be forced.|  
-|`NeverLockTypeAssemblies`|Optional `Boolean` parameter.<br /><br /> Specifies the name of the generated files, such as .resources files. If you do not specify a name, the name of the matching input file is used and the .resources file that is created is placed in the directory that contains the input file.|  
+|`NeverLockTypeAssemblies`|Optional `Boolean` parameter.<br /><br /> Gets or sets a Boolean value that specifies whether to create a new [AppDomain](https://docs.microsoft.com/dotnet/api/system.appdomain) to evaluate the resources (.resx) files (true) or to create a new [AppDomain](https://docs.microsoft.com/dotnet/api/system.appdomain) only when the resources files reference a user's assembly (false).|  
 |`OutputResources`|Optional <xref:Microsoft.Build.Framework.ITaskItem>`[]` output parameter.<br /><br /> Specifies the name of the generated files, such as .resources files. If you do not specify a name, the name of the matching input file is used and the .resources file that is created is placed in the directory that contains the input file.|  
 |`PublicClass`|Optional `Boolean` parameter.<br /><br /> If `true`, creates a strongly typed resource class as a public class.|  
 |`References`|Optional `String[]` parameter.<br /><br /> References to load types in .resx files from. Resx file data elements may have a .NET type. When the .resx file is read, this must be resolved. Typically, it is resolved successfully by using standard type loading rules. If you provide assemblies in `References`, they take precedence.<br /><br /> This parameter is not required for strongly typed resources.|  
@@ -105,4 +105,4 @@ Converts between .txt and .resx (XML-based resource format) files and common lan
 
 ## See Also  
  [Tasks](../msbuild/msbuild-tasks.md)   
- [Task Reference](../msbuild/msbuild-task-reference.md)
+ [Task Reference](../msbuild/msbuild-task-reference.md)

docs/msbuild/generateresource-task.md

@@ -52,9 +52,11 @@ Moves files to a new location.
 
 ## Remarks  
  Either the `DestinationFolder` parameter or the `DestinationFiles` parameter must be specified, but not both. If both are specified, the task fails and an error is logged.  
-  
+
+ The `Move` task creates folders as required for the desired destination files.
+
  In addition to having the parameters that are listed in the table, this task inherits parameters from the <xref:Microsoft.Build.Tasks.TaskExtension> class, which itself inherits from the <xref:Microsoft.Build.Utilities.Task> class. For a list of these additional parameters and their descriptions, see [TaskExtension Base Class](../msbuild/taskextension-base-class.md).  
 
 ## See Also  
  [Tasks](../msbuild/msbuild-tasks.md)   
- [Task Reference](../msbuild/msbuild-task-reference.md)
+ [Task Reference](../msbuild/msbuild-task-reference.md)

docs/msbuild/move-task.md

@@ -39,7 +39,7 @@ Documentation can be found on [azure-sdk-for-python.readthedocs.org](http://azur
 
 The [Azure SDK for Python Developer Center](http://azure.microsoft.com/develop/python/) also has a number of helpful resources, including a number of tutorials such as:
 
-  - Creating web apps with [Django](https://docs.microsoft.com/azure/service-bus-messaging/service-bus-python-how-to-use-topics-subscriptions) [Flask](https://docs.microsoft.com/azure/app-service-web/web-sites-python-create-deploy-flask-app), and [Bottle](https://docs.microsoft.com/azure/app-service-web/web-sites-python-create-deploy-bottle-app).
+  - Creating web apps with [Django](https://docs.microsoft.com/azure/app-service-web/web-sites-python-create-deploy-django-app) [Flask](https://docs.microsoft.com/azure/app-service-web/web-sites-python-create-deploy-flask-app), and [Bottle](https://docs.microsoft.com/azure/app-service-web/web-sites-python-create-deploy-bottle-app).
   - [Blob storage](https://docs.microsoft.com/azure/storage/storage-python-how-to-use-blob-storage)
   - [Table storage](https://docs.microsoft.com/azure/storage/storage-python-how-to-use-table-storage)
   - [Queue storage](https://docs.microsoft.com/azure/storage/storage-python-how-to-use-queue-storage)
@@ -59,4 +59,4 @@ For public APIs without documentation, the unit tests in the The [SDK's GitHub r
 
 The Git repository for the SDK is located at [https://github.com/Azure/azure-sdk-for-python](https://github.com/Azure/azure-sdk-for-python).
 
-[File issues at the repository](https://github.com/Azure/azure-sdk-for-python/issues) if you find any problems or have questions regarding the usage of the SDK.
+[File issues at the repository](https://github.com/Azure/azure-sdk-for-python/issues) if you find any problems or have questions regarding the usage of the SDK.

docs/python/azure-sdk-for-python.md

@@ -170,7 +170,7 @@ Instead of using the Kudu console through the Azure portal, you can run commands
 }
 ```
 
-For information about commands and authentication, see the [Kudu documentation](https://github.com/projectkudu/kudu/wiki/REST-API). You can also see credentials using the [`az webapp deployment list-publishing-profiles command`](https://docs.microsoft.com/cli/azure/webapp/deployment#list-publishing-profiles) from the Azure CLI. A helper library for posting Kudu commands is also available on GitHub](https://github.com/lmazuel/azure-webapp-publish/blob/master/azure_webapp_publish/kudu.py#L42).
+For information about commands and authentication, see the [Kudu documentation](https://github.com/projectkudu/kudu/wiki/REST-API). You can also see credentials using the [`az webapp deployment list-publishing-profiles command`](https://docs.microsoft.com/cli/azure/webapp/deployment#list-publishing-profiles) from the Azure CLI. A helper library for posting Kudu commands is also [available on GitHub](https://github.com/lmazuel/azure-webapp-publish/blob/master/azure_webapp_publish/kudu.py#L42).
 
 
 ### Copying libraries into app source code
@@ -181,4 +181,4 @@ The caveat is that these libraries must precisely match the version of Python on
 
 ### Avoiding virtual environments
 
-Although working in a virtual environment locally can help you fully understand the dependencies needed by your site, using virtual environments on App Service is not recommended. Instead, just install libraries into your main Python folder and deploy them with your app to avoid having conflicting dependencies.
+Although working in a virtual environment locally can help you fully understand the dependencies needed by your site, using virtual environments on App Service is not recommended. Instead, just install libraries into your main Python folder and deploy them with your app to avoid having conflicting dependencies.

docs/python/managing-python-on-azure-app-service.md

@@ -29,16 +29,16 @@ translation.priority.mt:
   - "tr-tr"
 ---
 # Configure unit tests by using a .runsettings file
-Unit tests in Visual Studio can be configured by using a *.runsettings file. (The file name doesn't matter, provided you use the extension '.runsettings.') For example, you can change the .NET Framework on which the tests will be run, the directory where test results are delivered, and the data collected during a test run.  
+Unit tests in Visual Studio can be configured by using a \*.runsettings file. (The file name doesn't matter, provided you use the extension '.runsettings.') For example, you can change the .NET Framework on which the tests will be run, the directory where test results are delivered, and the data collected during a test run.  
 
- If you don't want to do any special configuration, you don't need a *.runsettings file. The most frequent use is to customize [Code Coverage](../test/customizing-code-coverage-analysis.md).  
+ If you don't want to do any special configuration, you don't need a \*.runsettings file. The most frequent use is to customize [Code Coverage](../test/customizing-code-coverage-analysis.md).  
 
 > [!NOTE]
 >  **.runsettings and .testsettings**  
 >   
->  There are two types of file for configuring tests. *.runsettings are used for unit tests. And \*.testsettings for [lab environment tests](/devops-test-docs/test/specifying-test-settings-for-visual-studio-tests), web performance and load tests, and for customizing some types of diagnostic data adapters such as Intellitrace and event log adapters.  
+>  There are two types of file for configuring tests. \*.runsettings are used for unit tests. And \*.testsettings for [lab environment tests](/devops-test-docs/test/specifying-test-settings-for-visual-studio-tests), web performance and load tests, and for customizing some types of diagnostic data adapters such as Intellitrace and event log adapters.  
 >   
->  In previous editions of Visual Studio up to 2010, unit tests were also customized by using *.testsettings files. You can still do that, but the tests will run more slowly than if you use the equivalent configurations in a \*.runsettings file.  
+>  In previous editions of Visual Studio up to 2010, unit tests were also customized by using \*.testsettings files. You can still do that, but the tests will run more slowly than if you use the equivalent configurations in a \*.runsettings file.  
   
 ## Customizing tests with a .runsettings file  
 
@@ -55,7 +55,7 @@ Unit tests in Visual Studio can be configured by using a *.runsettings file. (Th
  ![Enabling a run settings file](../test/media/runsettings-1.png "RunSettings-1")  
 
 ##  <a name="example"></a> Copy this example .runsettings file  
- Here is a typical *.runsettings file. Each element of the file is optional, because every value has a default.  
+ Here is a typical \*.runsettings file. Each element of the file is optional, because every value has a default.  
 
 ```xml  
 <?xml version="1.0" encoding="utf-8"?>  

docs/test/configure-unit-tests-by-using-a-dot-runsettings-file.md

@@ -19,7 +19,7 @@ For working with iOS in Visual Studio you need the following pieces:
 
 * a Mac with macOS Sierra 10.12 or above
 * Xcode 8.3
-* An Apple ID. If you don't have an Apple ID already you can create a new one at https://appleid.apple.com. It's necessary yo have an Apple ID for installing and signing into Xcode.
+* An Apple ID. If you don't have an Apple ID already you can create a new one at https://appleid.apple.com. It's necessary to have an Apple ID for installing and signing into Xcode.
 
 ## Install
 
@@ -68,4 +68,4 @@ For working with iOS in Visual Studio you need the following pieces:
   ![Open Visual Studio](media/installer-image11.png)
 
 > [!NOTE]
-If you chose not install a platform or tool during the original installation (by unselecting it in step #6), you must run the [installer](https://www.visualstudio.com/vs/) again if you wish to add the components later.
+If you chose not install a platform or tool during the original installation (by unselecting it in step #6), you must run the [installer](https://www.visualstudio.com/vs/) again if you wish to add the components later.