Merge branch 'master' into tglee-vside

Author: TerryGLee

docs/ide/TOC.md

@@ -58,6 +58,7 @@
 # [Solutions and Projects in Visual Studio](solutions-and-projects-in-visual-studio.md)
 ## [Creating Solutions and Projects](creating-solutions-and-projects.md)
 ## [Adding and Removing Project Items](adding-and-removing-project-items.md)
+## [Project and Solution File Types](reference/project-and-solution-file-types.md)
 ## [Managing Project and Solution Properties](managing-project-and-solution-properties.md)
 ## [Managing references in a project](managing-references-in-a-project.md)
 ### [How to: Add or Remove References By Using the Reference Manager](how-to-add-or-remove-references-by-using-the-reference-manager.md)
@@ -122,6 +123,11 @@
 ### [How to: Change Text Case in the Editor](how-to-change-text-case-in-the-editor.md)
 ### [How to: Manage Editor Modes](how-to-manage-editor-modes.md)
 ### [How to: Manage Editor Windows](how-to-manage-editor-windows.md)
+### [How to: Change Fonts and Colors in the Editor](reference/how-to-change-fonts-and-colors-in-the-editor.md)
+### [How to: Manage Word Wrap in the Editor](reference/how-to-manage-word-wrap-in-the-editor.md)
+### [How to: Display Line Numbers in the Editor](reference/how-to-display-line-numbers-in-the-editor.md)
+### [How to: Display URLs as Links in the Editor](reference/how-to-display-urls-as-links-in-the-editor.md)
+### [Setting Language-Specific Editor Options](reference/setting-language-specific-editor-options.md)
 ## [Develop code in Visual Studio without projects or solutions](develop-code-in-visual-studio-without-projects-or-solutions.md)
 ## [Create portable, custom editor settings with EditorConfig](create-portable-custom-editor-options.md)
 ## [How to: Track Your Code by Customizing the Scrollbar](how-to-track-your-code-by-customizing-the-scrollbar.md)

docs/ide/reference/TOC.md

@@ -10,48 +10,49 @@
 ## [Go To Line](go-to-line.md)
 ## [Immediate Window](immediate-window.md)
 ## [Miscellaneous Files](miscellaneous-files.md)
-## [Options Dialog Box (Visual Studio)](options-dialog-box-visual-studio.md)
-## [Environment Options Dialog Box](environment-options-dialog-box.md)
-### [General, Environment, Options Dialog Box](general-environment-options-dialog-box.md)
-### [AutoRecover, Environment, Options Dialog Box](autorecover-environment-options-dialog-box.md)
-### [Documents, Environment, Options Dialog Box](documents-environment-options-dialog-box.md)
-### [Extensions and Updates, Environment, Options Dialog Box](extensions-and-updates-environment-options-dialog-box.md)
-### [Find and Replace, Environment, Options Dialog Box](find-and-replace-environment-options-dialog-box.md)
-### [Fonts and Colors, Environment, Options Dialog Box](fonts-and-colors-environment-options-dialog-box.md)
-### [Import and Export Settings, Environment, Options Dialog Box](import-and-export-settings-environment-options-dialog-box.md)
-### [International Settings, Environment, Options Dialog Box](international-settings-environment-options-dialog-box.md)
-### [Keyboard, Environment, Options Dialog Box](keyboard-environment-options-dialog-box.md)
-### [Notifications, Environment, Options Dialog Box](notifications-environment-options-dialog-box.md)
-### [Quick Launch, Environment, Options Dialog Box](quick-launch-environment-options-dialog-box.md)
-### [Startup, Environment, Options Dialog Box](startup-environment-options-dialog-box.md)
-### [Synchronized Settings, Environment, Options Dialog Box](synchronized-settings-environment-options-dialog-box.md)
-### [Tabs and Windows, Environment, Options Dialog Box](tabs-and-windows-environment-options-dialog-box.md)
-### [Task List, Environment, Options Dialog Box](task-list-environment-options-dialog-box.md)
-### [Web Browser, Environment, Options Dialog Box](web-browser-environment-options-dialog-box.md)
-### [Options Page, Environment Node Properties](options-page-environment-node-properties.md)
-## [Text Editor Options Dialog Box](text-editor-options-dialog-box.md)
-### [How to: Change Fonts and Colors in the Editor](how-to-change-fonts-and-colors-in-the-editor.md)
-### [How to: Manage Word Wrap in the Editor](how-to-manage-word-wrap-in-the-editor.md)
-### [How to: Display Line Numbers in the Editor](how-to-display-line-numbers-in-the-editor.md)
-### [How to: Display URLs as Links in the Editor](how-to-display-urls-as-links-in-the-editor.md)
-### [Setting Language-Specific Editor Options](setting-language-specific-editor-options.md)
-### [Options, Text Editor, General](options-text-editor-general.md)
-### [Options, Text Editor, File Extension](options-text-editor-file-extension.md)
-### [Options, Text Editor, All Languages](options-text-editor-all-languages.md)
-### [Options, Text Editor, All Languages, Tabs](options-text-editor-all-languages-tabs.md)
-### [Options, Text Editor, Basic (Visual Basic)](options-text-editor-basic-visual-basic.md)
-### [Options, Text Editor, C/C++, Formatting](options-text-editor-c-cpp-formatting.md)
-### [Options, Text Editor, C/C++, Advanced](options-text-editor-c-cpp-advanced.md)
-### [Options, Text Editor, C/C++, Experimental](options-text-editor-c-cpp-experimental.md)
-### [Options, Text Editor, C#, Formatting](options-text-editor-csharp-formatting.md)
-### [Options, Text Editor, C#, Advanced](options-text-editor-csharp-advanced.md)
-### [Options, Text Editor, C#, IntelliSense](options-text-editor-csharp-intellisense.md)
-### [Options, Text Editor, JavaScript, Formatting](options-text-editor-javascript-formatting.md)
-### [Options, Text Editor, JavaScript, IntelliSense](options-text-editor-javascript-intellisense.md)
-### [Options, Text Editor, XAML, Formatting](options-text-editor-xaml-formatting.md)
-### [Options Page, Fonts and Colors Node Properties](options-page-fonts-and-colors-node-properties.md)
-### [Options Page, Text Editor Node Properties](options-page-text-editor-node-properties.md)
-## [Options Page, Debugging Node Properties](options-page-debugging-node-properties.md)
+## [Options Dialog Box](options-dialog-box-visual-studio.md)
+### [Environment Options Dialog Box](environment-options-dialog-box.md)
+#### [Environment - General](general-environment-options-dialog-box.md)
+#### [Environment - AutoRecover](autorecover-environment-options-dialog-box.md)
+#### [Environment - Documents](documents-environment-options-dialog-box.md)
+#### [Environment - Extensions and Updates](extensions-and-updates-environment-options-dialog-box.md)
+#### [Environment - Find and Replace](find-and-replace-environment-options-dialog-box.md)
+#### [Environment - Fonts and Colors](fonts-and-colors-environment-options-dialog-box.md)
+#### [Environment - Import and Export Settings](import-and-export-settings-environment-options-dialog-box.md)
+#### [Environment - International Settings](international-settings-environment-options-dialog-box.md)
+#### [Environment - Keyboard](keyboard-environment-options-dialog-box.md)
+#### [Environment - Notifications](notifications-environment-options-dialog-box.md)
+#### [Environment - Quick Launch](quick-launch-environment-options-dialog-box.md)
+#### [Environment - Startup](startup-environment-options-dialog-box.md)
+#### [Environment - Synchronized Settings](synchronized-settings-environment-options-dialog-box.md)
+#### [Environment - Tabs and Windows](tabs-and-windows-environment-options-dialog-box.md)
+#### [Environment - Task List](task-list-environment-options-dialog-box.md)
+#### [Environment - Web Browser](web-browser-environment-options-dialog-box.md)
+#### [Options Page, Environment Node Properties](options-page-environment-node-properties.md)
+##### [Options Page, Fonts and Colors Node Properties](options-page-fonts-and-colors-node-properties.md)
+### [Text Editor Options Dialog Box](text-editor-options-dialog-box.md)
+#### [Text Editor - General](options-text-editor-general.md)
+#### [Text Editor - File Extension](options-text-editor-file-extension.md)
+#### [Text Editor - All Languages](options-text-editor-all-languages.md)
+#### [Text Editor - All Languages, Tabs](options-text-editor-all-languages-tabs.md)
+#### [Text Editor - Basic (Visual Basic)](options-text-editor-basic-visual-basic.md)
+#### [Text Editor - C/C++, Formatting](options-text-editor-c-cpp-formatting.md)
+#### [Text Editor - C/C++, Advanced](options-text-editor-c-cpp-advanced.md)
+#### [Text Editor - C/C++, Experimental](options-text-editor-c-cpp-experimental.md)
+#### [Text Editor - C#, Formatting](options-text-editor-csharp-formatting.md)
+#### [Text Editor - C#, Advanced](options-text-editor-csharp-advanced.md)
+#### [Text Editor - C#, IntelliSense](options-text-editor-csharp-intellisense.md)
+#### [Text Editor - JavaScript, Formatting](options-text-editor-javascript-formatting.md)
+#### [Text Editor - JavaScript, IntelliSense](options-text-editor-javascript-intellisense.md)
+#### [Text Editor - XAML, Formatting](options-text-editor-xaml-formatting.md)
+#### [Options Page, Text Editor Node Properties](options-page-text-editor-node-properties.md)
+### [Options Page, Debugging Node Properties](options-page-debugging-node-properties.md)
+### [Projects and Solutions Options Dialog Box](projects-and-solutions-options-dialog-box.md)
+#### [Projects and Solutions - Build and Run](options-dialog-box-projects-and-solutions-build-and-run.md)
+#### [Projects and Solutions - Web Projects](options-dialog-box-projects-and-solutions-web-projects.md)
+#### [Projects and Solutions - VB Defaults](visual-basic-defaults-projects-options-dialog-box.md)
+#### [Projects and Solutions - VC++ Project Settings](vcpp-project-settings-projects-and-solutions-options-dialog-box.md)
+### [XAML Designer Options Dialog Box](xaml-designer.md)
 ## [Output Window](output-window.md)
 ## [Project Properties Reference](project-properties-reference.md)
 ### [Application Page, Project Designer (Visual Basic)](application-page-project-designer-visual-basic.md)
@@ -75,19 +76,12 @@
 ### [Services Page, Project Designer](services-page-project-designer.md)
 #### [Advanced Settings for Services Dialog Box](advanced-settings-for-services-dialog-box.md)
 ### [Signing Page, Project Designer](signing-page-project-designer.md)
-### [Visual Basic Defaults, Projects, Options Dialog Box](visual-basic-defaults-projects-options-dialog-box.md)
-### [VC++ Project Settings, Projects and Solutions, Options Dialog Box](vcpp-project-settings-projects-and-solutions-options-dialog-box.md)
-## [Project and Solution File Types](project-and-solution-file-types.md)
-## [Projects and Solutions, Options Dialog Box](projects-and-solutions-options-dialog-box.md)
-### [Options Dialog Box,  Projects and Solutions, Build and Run](options-dialog-box-projects-and-solutions-build-and-run.md)
-### [Options Dialog Box, Projects and Solutions, Web Projects](options-dialog-box-projects-and-solutions-web-projects.md)
 ## [Property Pages, JavaScript](property-pages-javascript.md)
 ## [Properties Window](properties-window.md)
 ## [Toolbox](toolbox.md)
 ### [Toolbox, Components Tab](toolbox-components-tab.md)
 ### [Toolbox, Data Tab](toolbox-data-tab.md)
 ### [Toolbox, HTML Tab](toolbox-html-tab.md)
-## [XAML Designer options page](xaml-designer.md)
 # [Devenv Command Line Switches](devenv-command-line-switches.md)
 ## [-? (devenv.exe)](q-devenv-exe.md)
 ## [-Build (devenv.exe)](build-devenv-exe.md)

docs/ide/reference/project-and-solution-file-types.md

@@ -50,10 +50,8 @@ manager: ghogen
  [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)] uses a variety of file formats to store information specific to projects. For more information, see the following Help topics:  
 
  [!INCLUDE[vcprvc](../../code-quality/includes/vcprvc_md.md)]  
- [File Types Created for Visual C++ Projects](/cpp/ide/file-types-created-for-visual-cpp-projects)  
-  
- [Creating and Managing Visual C++ Projects](/cpp/ide/creating-and-managing-visual-cpp-projects)  
-  
+ [File Types Created for Visual C++ Projects](/cpp/ide/file-types-created-for-visual-cpp-projects)    
+ [Creating and Managing Visual C++ Projects](/cpp/ide/creating-and-managing-visual-cpp-projects)    
  [Unicode](/cpp/mfc/unicode-in-mfc)  
 
 ## See Also  

docs/ide/reference/setting-language-specific-editor-options.md

@@ -18,10 +18,10 @@ author: "gewarren"
 ms.author: "gewarren"
 manager: ghogen
 ---
-# Setting Language-Specific Editor Options
-[!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)] offers a variety of Text Editor options that apply to specific programming languages.  
+# Setting language-specific editor options
+Visual Studio offers a variety of text editor options that apply to specific programming languages. You can configure options in the **Options** dialog box, which is accessed from the **Tools** menu. You can also configure some editor settings on a project- or codebase-basis by creating an EditorConfig file. See [Create portable, custom editor settings with EditorConfig](../../ide/create-portable-custom-editor-options.md).
 
-## In This Section  
+## Settings available in the Options dialog box  
  [Options, Text Editor, Basic (Visual Basic)](../../ide/reference/options-text-editor-basic-visual-basic.md)  
  Describes settings for end constructs, code reformatting, outlining, and error correction suggestions, among others, for [!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)] code.  
 
@@ -38,20 +38,12 @@ manager: ghogen
  Describes outlining, error identification, and XML documentation comment settings for C# and J#.  
 
  [Options, Text Editor, C#, IntelliSense](../../ide/reference/options-text-editor-csharp-intellisense.md)  
- Describes settings that specify how the IntelliSense completion list behaves when you work in C# and J# code.  
-  
- [Validation, CSS, Text Editor, Options Dialog Box](http://msdn.microsoft.com/Library/5afe0808-16bb-420f-b620-7ca1a4d9f2cc)  
- Describes statement completion and error correction settings for cascading style sheets (CSS).  
-  
- [Validation, HTML, Text Editor, Options Dialog Box](http://msdn.microsoft.com/Library/9c24ecfe-263e-4bf1-88de-d01be3992863)  
- Describes settings for checking HTML syntax based on the schema you select.  
+ Describes settings that specify how the IntelliSense completion list behaves when you work in C# and J# code. 
 
  [Options, Text Editor, XAML, Formatting](../../ide/reference/options-text-editor-xaml-formatting.md)  
  Describes settings for element and attribute arrangement in XAML documents.  
 
-## Related Sections  
- [Customizing the Editor](../../ide/customizing-the-editor.md)  
- Provides links to topics that explain the many aspects of the editor that you can set preferences for.  
-  
- [Personalize the Visual Studio IDE](../../ide/personalizing-the-visual-studio-ide.md)  
- Provides links to topics that explain how to customize your settings, key bindings, and other features of the integrated development environment (IDE).
+## See also  
+[Customizing the Editor](../../ide/customizing-the-editor.md)  
+[Create portable, custom editor settings with EditorConfig](../../ide/create-portable-custom-editor-options.md)  
+[Personalize the Visual Studio IDE](../../ide/personalizing-the-visual-studio-ide.md) — Provides links to topics that explain how to customize your settings, key bindings, and other features of the integrated development environment (IDE).

docs/ide/reference/visual-studio-reference.md

@@ -33,15 +33,12 @@ This section includes user interface reference, language equivalents, and other
  [MSBuild](../../msbuild/msbuild.md)
  Contains documents about how to use the Microsoft build platform, which is integrated into [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)].  
 
- [Resources for Troubleshooting IDE Errors](../../ide/reference/resources-for-troubleshooting-integrated-development-environment-errors.md)  
- Contains links to resources to help you resolve IDE error messages  
-  
- [Talk to Us](../../ide/talk-to-us.md)  
- Contains information about how to locate customer support for Visual Studio.  
-  
  [Accessibility for People with Disabilities](../../ide/reference/accessibility-for-people-with-disabilities.md)  
  Contains tips about how to change accessibility options.  
 
+ [Resources for Troubleshooting IDE Errors](../../ide/reference/resources-for-troubleshooting-integrated-development-environment-errors.md)  
+ Contains links to resources to help you resolve IDE error messages.  
+  
 ## Related Sections  
  [Visual Basic Reference](/dotnet/visual-basic/reference/index)  
  Contains [!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)] upgrading information and the [!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)] language and run-time reference.  

docs/ide/reference/web-browser-environment-options-dialog-box.md

@@ -38,28 +38,28 @@ Sets options for both the internal Web browser and Internet Explorer. To access
 > [!IMPORTANT]
 >  Opening certain files or components from the Web can execute code on your computer.  
   
- Home page  
+## Home page
  Sets the page displayed when you open the IDE Web Browser.  
 
- Search page  
+## Search page
  Lets you designate a Search page for the internal Web browser. This location can differ from the search page used by instances of Internet Explorer initiated outside of the integrated development environment (IDE).  
 
- View Source in  
+## View source in
  Sets the editor used to open a Web page when you choose **View Source** on the page from the internal Web browser.  
 
--   **Source editor** Select to view source in the [Writing Code](../../ide/writing-code-in-the-code-and-text-editor.md).  
+-   **Source editor** Select to view source in the [editor](../../ide/writing-code-in-the-code-and-text-editor.md).  
 
--   **HTML editor** Select to view source in the [HTML Designer](http://msdn.microsoft.com/Library/640043cc-3657-4677-a091-bc315e636477). Use this selection to edit the Web page in one of two views: Design view or the standard text-based Source view.  
+-   **HTML editor** Select to view source in the [HTML designer](http://msdn.microsoft.com/Library/640043cc-3657-4677-a091-bc315e636477). Use this selection to edit the Web page in one of two views: Design view or the standard text-based Source view.  
 
 -   **External editor** Select to view source in another editor. Specify the path of any editor you choose, for example, Notepad.exe.  
 
-Internet Explorer Options  
+## Internet Explorer Options  
 Click to change options for Internet Explorer in the **Internet Properties** dialog box. Changes made in this dialog box affect both the internal Web browser and instances of Internet Explorer initiated outside of the Visual Studio IDE (for example, from the Start menu).  
 
 > [!NOTE]
->  Use the Browse With dialog box to replace the Visual Studio internal Web browser, which is a version of Internet Explorer, by using a different, external Web browser.  
+>  Use the **Browse With** dialog box to replace the Visual Studio internal Web browser with a browser of your choice. You can access the Browse With dialog box from the right-click or context menu of, for example, an HTML file in your project.
   
-## See Also  
+## See also  
  [Environment Options Dialog Box](../../ide/reference/environment-options-dialog-box.md)   
  [General, Environment, Options Dialog Box](../../ide/reference/general-environment-options-dialog-box.md)   
  [HTML Designer](http://msdn.microsoft.com/Library/640043cc-3657-4677-a091-bc315e636477)