Merge branch 'master' of https://github.com/MicrosoftDocs/visualstudio-docs-pr into kraigb-feedback

Author: kraigb

.openpublishing.redirection.json

@@ -1817,12 +1817,22 @@
         },
         {
             "source_path": "docs/python/debugging-azure-remote.md",
-            "redirect_url": "/visualstudio/python/debugging-remote-python-code-on-azure",
+            "redirect_url": "/visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio",
             "redirect_document_id": false
         },
         {
             "source_path": "docs/python/debugging-azure-remote-troubleshooting.md",
-            "redirect_url": "/visualstudio/python/debugging-remote-python-code-on-azure-troubleshooting",
+            "redirect_url": "/visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/python/debugging-remote-python-code-on-azure.md",
+            "redirect_url": "/visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/python/debugging-remote-python-code-on-azure-troubleshooting.md",
+            "redirect_url": "/visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio",
             "redirect_document_id": false
         },
         {
@@ -1895,6 +1905,11 @@
             "redirect_url": "/visualstudio/python/python-interactive-repl-in-visual-studio",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/python/managing-python-on-azure-app-service.md.md",
+            "redirect_url": "/visualstudio/python/configure-web-apps-for-iis-windows",
+            "redirect_document_id": false
+        },        
         {
             "source_path": "docs/python/options.md",
             "redirect_url": "/visualstudio/python/python-support-options-and-settings-in-visual-studio",

docs/cross-platform/getting-started-with-visual-studio-tools-for-unity.md

@@ -41,7 +41,7 @@ The version of Visual Studio included with your Unity installation may not be th
 
 If you already have Visual Studio 2017 installed, or prefer to manually install, run the Visual Studio installer.
 
-1. [Download the Visual Studio installer](https://docs.microsoft.com/en-us/visualstudio/install/install-visual-studio), or open it if already installed.
+1. [Download the Visual Studio installer](/visualstudio/install/install-visual-studio), or open it if already installed.
 
 1. Click **Modify** (if already installed) or **Install** (for new installations) for your desired version of Visual Studio.
 

docs/cross-platform/install-and-configure-tools-to-build-using-ios.md

@@ -18,7 +18,7 @@ ms.workload:
 You can use Visual C++ for Cross-Platform Mobile Development to edit, debug and deploy iOS code to the iOS Simulator or to an iOS device, but because of licensing restrictions, the code must be built and run remotely on a Mac. To build and run iOS apps using Visual Studio, you need to set up and configure the remote agent, [vcremote](https://go.microsoft.com/fwlink/p/?LinkId=534988), on your Mac. The remote agent handles build requests from Visual Studio and runs the app on an iOS device connected to the Mac, or in the iOS Simulator on the Mac.
 
 > [!NOTE]
-> For information on using cloud-hosted Mac services instead of a Mac, see [Configure Visual Studio to connect to your cloud hosted Mac](https://docs.microsoft.com/en-us/visualstudio/cross-platform/tools-for-cordova/tips-workarounds/host-a-mac-in-the-cloud?view=toolsforcordova-2017#configure-visual-studio-to-connect-to-your-cloud-hosted-mac). The instructions are for building using Visual Studio Tools for Apache Cordova. To use the instructions to build using C++, substitute vcremote for remotebuild.
+> For information on using cloud-hosted Mac services instead of a Mac, see [Configure Visual Studio to connect to your cloud hosted Mac](/visualstudio/cross-platform/tools-for-cordova/tips-workarounds/host-a-mac-in-the-cloud?view=toolsforcordova-2017#configure-visual-studio-to-connect-to-your-cloud-hosted-mac). The instructions are for building using Visual Studio Tools for Apache Cordova. To use the instructions to build using C++, substitute vcremote for remotebuild.
 
 Once you have installed the tools to build using iOS, refer to this topic for ways to quickly configure and update the remote agent for iOS development in Visual Studio and on your Mac.
 

docs/cross-platform/system-requirements-for-the-visual-studio-emulator-for-android.md

@@ -121,11 +121,11 @@ Visual Studio Emulator for Android runs as a virtual machine on Hyper-V, the vir
  When you run the emulator, if you are not already a member of the Hyper-V Administrators group, you are prompted to join the group (the dialog box refers to the Windows Phone emulator). Joining the group requires administrator rights.  
 
 > [!IMPORTANT]
->  After you join the group, log off or reboot to make the change take effect.  
+> After you join the group, log off or reboot to make the change take effect.  
   
  ![Joining the Hyper-V Administrators security group](../cross-platform/media/android_emu_hyperv_admin.png "Android_Emu_HyperV_Admin")  
 
- To add yourself to a group manually, open the Local Users and Groups snap-in. For more information, see [Add a user account to a group](http://windows.microsoft.com/en-us/windows/add-user-account-to-group#1TC=windows-7). (This Windows 7 topic is also applicable to Windows 8.)  
+ To add yourself to a group manually, open the Local Users and Groups snap-in.  
 
 ##  <a name="BootableVHD"></a> Running the emulator from a bootable VHD is not supported  
  If you try to run an app on the Visual Studio Emulator for Android while you are running Windows from a bootable VHD, the emulator typically takes several minutes to start or fails to start. When the emulator fails to start, you see the following message: App deployment failed. Please try again.  
@@ -149,4 +149,4 @@ Visual Studio Emulator for Android runs as a virtual machine on Hyper-V, the vir
  In order for the emulator to emulate calls to the GPU, such as those used by OpenGL ES, your machine must have a DirectX compatible GPU with appropriate DirectX drivers installed.  
 
 ## See also  
- [Troubleshoot the Visual Studio Emulator for Android](../cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md)
+ [Troubleshoot the Visual Studio Emulator for Android](../cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md)

docs/cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md

@@ -128,7 +128,7 @@ This topic contains information to help you resolve issues that you may experien
 
      ![Android_Emu_V_Switch_Man](../cross-platform/media/android_emu_v_switch_man.png "Android_Emu_V_Switch_Man")  
 
-     If the setup is incorrect and you are using Windows 10, you might try  to [Reinstall network devices using netcfg -d command](http://windows.microsoft.com/en-us/windows-10/fix-network-connection-issues) (section 6).  
+     If the setup is incorrect and you are using Windows 10, you might try  to [Reinstall network devices using netcfg -d command](http://windows.microsoft.com/windows-10/fix-network-connection-issues) (section 6).  
 
 -   If these steps do not resolve the issue, see [Emulator fails to start (first use)](#NoStart) for information on 3rd party software that may be interfering with the emulator.  
 

docs/cross-platform/visual-studio-tools-for-unity.md

@@ -44,7 +44,7 @@ Visual Studio Tools for Unity supports the robust [debugging](using-visual-studi
 
 ### Visual Studio for Mac Tools for Unity
 
-Visual Studio for Mac also supports Unity projects. For more information, see the [Visual Studio for Mac Tools for Unity documentation](https://docs.microsoft.com/en-us/visualstudio/mac/unity-tools).
+Visual Studio for Mac also supports Unity projects. For more information, see the [Visual Studio for Mac Tools for Unity documentation](/visualstudio/mac/unity-tools).
 
 ## Next steps
 

docs/debugger/error-remote-debugging-monitor-msvsmon-exe-does-not-appear-to-be-running.md

@@ -32,13 +32,13 @@ This error message means that Visual Studio could not find the correct instance
  The following sections list some other reasons why you might have gotten this message, and what you can do to fix the issue.  
 
 ## The remote machine is not reachable  
- Try to [ping](https://technet.microsoft.com/en-us/library/ee624059\(v=ws.10\).aspx) the remote machine. If it doesn't reply to the ping, the remote tools won't be able to connect either. Try rebooting the remote machine and otherwise making sure that it is correctly configured on the network.  
+ Try to [ping](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/ee624059(v=ws.10)) the remote machine. If it doesn't reply to the ping, the remote tools won't be able to connect either. Try rebooting the remote machine and otherwise making sure that it is correctly configured on the network.  
 
 ## The version of the remote debugger doesn't match the version of Visual Studio  
  The version of Visual Studio that you are running locally needs to match the version of the remote debugging monitor that is running on the remote machine. To fix this, download and install the matching version of the remote debugging monitor. Go to the [Download Center](http://www.microsoft.com/en-us/download) to find the right version of the remote debugger.  
 
 ## The local and remote machines have different authentication modes  
- The local and remote machines need to use the same authentication mode. To fix this, make sure that both machines are using the same authentication mode. For more information about authentication modes, see [Windows Authentication Overview](https://technet.microsoft.com/en-us/library/hh831472.aspx).  
+ The local and remote machines need to use the same authentication mode. To fix this, make sure that both machines are using the same authentication mode. For more information about authentication modes, see [Windows Authentication Overview](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831472(v=ws.11)).  
 
 ## The remote debugger is running under a different user account  
  You can solve this in one of the following ways:  
@@ -69,4 +69,4 @@ This error message means that Visual Studio could not find the correct instance
  res://*\<Visual Studio installation directory>*\Common7\IDE\Remote%20Debugger\x64\msvsmon.exe/help.htm  
 
 ## See Also  
- [Remote Debugging Errors and Troubleshooting](../debugger/remote-debugging-errors-and-troubleshooting.md)
+ [Remote Debugging Errors and Troubleshooting](../debugger/remote-debugging-errors-and-troubleshooting.md)

docs/debugger/error-the-web-server-could-not-find-the-requested-resource.md

@@ -19,10 +19,12 @@ ms.workload:
 ---
 # Error: The Web Server Could Not Find the Requested Resource
 Due to security considerations, IIS has returned a generic error.  
-  
- One possible cause is the security configuration of the server. IIS 6.0 and earlier versions used an add-on program, known as URLScan, to filter out suspicious and malformed requests. IIS 7.0 has built-in Request Filtering for the same purpose. In both cases, overly restrictive request filtering can prevent Visual Studio from debugging the server.  
-  
- There are numerous possible causes of this error. A few of the most common causes include a problem with the IIS installation or configuration, the web site configuration, or permissions in the file system. You can try accessing the resource with a browser. Depending on how IIS is configured you might have to use a local browser on the server or inspect the IIS error log to get a detailed error message.  
+
+One possible cause is the security configuration of the server. IIS 6.0 and earlier versions used an add-on program, known as URLScan, to filter out suspicious and malformed requests. IIS 7.0 has built-in Request Filtering for the same purpose. In both cases, overly restrictive request filtering can prevent Visual Studio from debugging the server.  
+
+Another possible cause of this error is that the W3SVC service for IIS is not started. Check that this service is started (grayed out) in the Services window (*services.msc*).
+
+There are numerous additional possible causes of this error. A few of the most common causes include a problem with the IIS installation or configuration, the web site configuration, or permissions in the file system. You can try accessing the resource with a browser. Depending on how IIS is configured, you might have to use a local browser on the server or inspect the IIS error log to get a detailed error message.  
 
  For more information on troubleshooting IIS, see [IIS Management and Administration](/iis/manage/provisioning-and-managing-iis/iis-management-and-administration).  
 

docs/debugger/getting-started-with-the-debugger.md

@@ -25,7 +25,7 @@ This article introduces the features of the Visual Studio debugger in a step-by-
 |---------|---------|
 |  ![movie camera icon for video](../install/media/video-icon.png "Watch a video")  |    [Watch a video](https://mva.microsoft.com/en-US/training-courses-embed/getting-started-with-visual-studio-2017-17798/Debugger-Feature-tour-of-Visual-studio-2017-sqwiwLD6D_1111787171) on debugging that shows similar steps. |
 
-Although the demo app is C# and C++, the features are applicable to Visual Basic, JavaScript, and other languages supported by Visual Studio (except where noted). The screenshots are in C#. To switch between the C# and C++ sample code in this article, use the language filter in the upper right of this page.
+Although the demo app is C# and C++, the features are applicable to Visual Basic, JavaScript, and other languages supported by Visual Studio (except where noted). The screenshots are in C#.
 
 In this tutorial, you will:
 
@@ -55,6 +55,9 @@ In this tutorial, you will:
 
     Visual Studio creates the project.
 
+    > [!NOTE]
+    > To switch between the C# and C++ sample code in this article, use the language filter in the upper right of this page.
+
 4. In *Program.cs* (C#) or *get-started-debugging.cpp* (C++), replace the following code
 
     ```csharp