Merge pull request #1447 from MicrosoftDocs/master

merge to live

Author: ghogen

.openpublishing.redirection.json

@@ -34,7 +34,7 @@
             "source_path": "docs/code-quality/measuring-complexity-and-maintainability-of-managed-code.md",
             "redirect_url": "/visualstudio/code-quality/code-metrics-values/",
             "redirect_document_id": false
-        },        
+        },
         {
             "source_path": "docs/code-quality/suppress-warnings-by-using-the-suppressmessage-attribute.md",
             "redirect_url": "/visualstudio/code-quality/in-source-suppression-overview",
@@ -983,7 +983,7 @@
         {
             "source_path": "docs/ide/using-the-toolbox.md",
             "redirect_url": "/visualstudio/ide/reference/toolbox",
-            "redirect_document_id": false 
+            "redirect_document_id": false
         },
         {
             "source_path": "docs/ide/viewing-types-and-relationships-class-designer.md",
@@ -1995,6 +1995,21 @@
             "source_path": "docs/cross-platform/visual-studio-tools-for-unity-azure-setup.md",
             "redirect_url": "/sandbox/gamedev/unity/samples/azure-mobile-apps-unity-racer",
             "redirect_document_id": false
+        },
+        {
+          "source_path": "docs/ide/reference/proxy-authorization-required.md",
+          "redirect_url": "visualstudio/install/troubleshooting-network-related-errors-in-visual-studio",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "docs/ide/whitelisting-urls-in-a-private-network.md",
+          "redirect_url": "visualstudio/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "docs/install/install-visual-studio-behind-a-firewall-or-proxy-server.md",
+          "redirect_url": "visualstudio/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server",
+          "redirect_document_id": false
         }
     ]
-}
+}

docs/TOC.md

@@ -23,9 +23,8 @@
 ### Install on a network
 #### [Create a network-based installation of Visual Studio](install/create-a-network-installation-of-visual-studio.md)
 #### [Update a network-based installation of Visual Studio](install/update-a-network-installation-of-visual-studio.md)
-#### [Installing Visual Studio behind a firewall or proxy server](install/install-visual-studio-behind-a-firewall-or-proxy-server.md)
-#### [Correcting proxy authorization errors](ide/reference/proxy-authorization-required.md)
-#### [Whitelisting URLs in a private network](ide/whitelisting-urls-in-a-private-network.md)
+#### [Install and use Visual Studio behind a firewall or proxy server](install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md)
+##### [Troubleshooting network errors when you install or use Visual Studio](install/troubleshooting-network-related-errors-in-visual-studio.md)
 ### Deploy in an enterprise
 #### [Automate Visual Studio installation with a response file](install/automated-installation-with-response-file.md)
 #### [Automatically apply product keys when deploying Visual Studio](install/automatically-apply-product-keys-when-deploying-visual-studio.md)
@@ -188,6 +187,7 @@
 ### [Office and Sharepoint Development](vsto/office-and-sharepoint-development-in-visual-studio.md)
 ### [Work with XML and XSLT Files](xml-tools/xml-tools-in-visual-studio.md)
 ### Additional Tutorials
+#### [Create a WPF app with C# or Visual Basic](ide/walkthrough-create-a-simple-application-with-visual-csharp-or-visual-basic.md)
 #### [Tutorial 1: Create a Picture Viewer (C#)](ide/tutorial-1-create-a-picture-viewer.md)
 ##### [Step 1: Create a Windows Forms Application Project](ide/step-1-create-a-windows-forms-application-project.md)
 ##### [Step 2: Run Your Program](ide/step-2-run-your-program.md)

docs/designers/TOC.md

@@ -24,7 +24,6 @@
 ### [Getting Started with WPF](getting-started-with-wpf.md)
 #### [Introduction to WPF](introduction-to-wpf.md)
 #### [Walkthrough: My First WPF Desktop Application](walkthrough-my-first-wpf-desktop-application2.md)
-#### [Create a WPF app with C# or Visual Basic](../ide/walkthrough-create-a-simple-application-with-visual-csharp-or-visual-basic.md)
 #### [WPF Community Resources](wpf-community-resources.md)
 #### [WPF Data Binding with LINQ to XML](wpf-data-binding-with-linq-to-xml.md)
 ##### [WPF Data Binding with LINQ to XML Overview](wpf-data-binding-with-linq-to-xml-overview.md)

docs/ide/reference/proxy-authorization-required.md

@@ -4,11 +4,11 @@ ms.custom: ""
 ms.date: "11/04/2016"
 ms.reviewer: ""
 ms.suite: ""
-ms.technology: 
+ms.technology:
   - "vs-ide-general"
 ms.tgt_pltfrm: ""
 ms.topic: "article"
-f1_keywords: 
+f1_keywords:
   - "VS.Message.0x00005A89"
   - "VS.Message.0x00005A8E"
   - "VS_E_NAMETOOLONG"
@@ -98,19 +98,22 @@ caps.latest.revision: 13
 author: "gewarren"
 ms.author: "gewarren"
 manager: ghogen
-ms.workload: 
+ms.workload:
   - "multiple"
 ---
 # Resources for Troubleshooting Integrated Development Environment Errors
 Not all error messages have a specific associated Help topic. If the information in the error message does not help you resolve the problem, you can consult other resources such as Knowledge Base articles, the developer community, or product support.  
-  
+
 ## Knowledge Base Articles  
  You can search the Knowledge Base (KB) online for articles about product issues. Not all issues have a corresponding KB article, but errors encountered by a significant number of customers are typically documented. You can access KB articles on the [Microsoft Support](http://go.microsoft.com/fwlink/?linkid=1782) Web site.  
-  
+
 ## The Developer Community  
  Forums let you interact with other developers, and also Microsoft employees. If you encounter an error that you cannot find a resolution for, you can post questions about the issue on a forum. You can also search the newsgroups to see whether others have posted about the same issue.  
-  
+
  You can access forums, blogs, chats, and other resources on the [Microsoft Technical Communities](http://go.microsoft.com/fwlink/?LinkID=144922) Web site.  
-  
+
 ## Product Support  
- If you still have questions after you try the other resources, you can contact Microsoft support services by visiting the [Microsoft Support](http://go.microsoft.com/fwlink/?linkid=1782) Web site. For information about product support available in your area, see [Talk to Us](../../ide/talk-to-us.md).
+ If you still have questions after you try the other resources, you can contact Microsoft support services by visiting the [Microsoft Support](http://go.microsoft.com/fwlink/?linkid=1782) Web site. For information about product support available in your area, see [Talk to Us](../../ide/talk-to-us.md).
+
+ ## See also
+ * [Troubleshooting proxy errors](/visualstudio/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server#troubleshooting-proxy-errors)