Merge branch 'master' of https://github.com/microsoft/visualstudio-docs-pr into v-elicas062518

Author: LizCasey

.openpublishing.redirection.json

@@ -330,6 +330,11 @@
             "redirect_url": "https://github.com/microsoft/sql-server-samples/releases/tag/wide-world-importers-v1.0",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/data-tools/saving-data.md",
+            "redirect_url": "/visualstudio/data-tools/save-data-back-to-the-database",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/debugger/0x-2x-4x-msaa-variants.md",
             "redirect_url": "/visualstudio/debugger/graphics/0x-2x-4x-msaa-variants",
@@ -1254,6 +1259,21 @@
             "redirect_url": "/visualstudio/ide/class-designer/working-with-visual-cpp-code",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/ide/how-to-disable-the-hosting-process.md",
+            "redirect_url": "/visualstudio/debugger/debugger-settings-and-preparation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/ide/hosting-process-vshost-exe.md",
+            "redirect_url": "/visualstudio/debugger/debugger-settings-and-preparation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/ide/reference/project-and-solution-file-types.md",
+            "redirect_url": "/visualstudio/ide/solutions-and-projects-in-visual-studio",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/install/index.md",
             "redirect_url": "/visualstudio/install/install-visual-studio",
@@ -5399,7 +5419,7 @@
            "source_path":  "scripting-docs/javascript/reference/at-set-statement-javascript.md",
            "redirect_url":  "https://developer.mozilla.org/docs/Web/JavaScript/Microsoft_JavaScript_extensions/at-set",
            "redirect_document_id":  false
-       },        
+       },
         {
             "source_path": "docs/cross-platform/visual-studio-tools-for-unity-azure-configure.md",
             "redirect_url": "/sandbox/gamedev/unity/samples/azure-mobile-apps-unity-racer",

docs/data-tools/additional-resources-for-troubleshooting-data-access-errors.md

@@ -1,6 +1,6 @@
 ---
-title: Additional resources for troubleshooting data access errors
-ms.date: 11/04/2016
+title: Data access forums
+ms.date: 06/27/2018
 ms.topic: troubleshooting
 f1_keywords:
   - "DSD_ImportXmlSchemaSameFileWrnHelpId"
@@ -222,38 +222,30 @@ ms.assetid: 357c9f0a-9d59-4db4-9b7c-b96cad839961
 author: gewarren
 ms.author: gewarren
 manager: douge
-robots: noindex,nofollow
 ms.prod: visual-studio-dev15
 ms.technology: vs-data-tools
 ms.workload:
   - "data-storage"
 ---
-# Additional resources for troubleshooting data access errors
+# Troubleshoot data access errors on the forums
 
-You can find assistance with troubleshooting errors and warnings in the Microsoft Developer Network (MSDN) public forums. The following table lists the data-related forums available on MSDN.
+You can find assistance with troubleshooting errors and warnings in the Microsoft Developer Network (MSDN) public forums. Here are some data-related forums available on MSDN:
 
- [Windows forms data controls and databinding](http://go.microsoft.com/fwlink/?LinkId=160179)
- Provides a forum for questions about and general discussions of data access in Windows Forms.
+- [Windows Forms data controls and databinding](https://social.msdn.microsoft.com/Forums/windows/en-US/home?forum=winformsdatacontrols)
 
- [ADO.NET DataSet forum](http://go.microsoft.com/fwlink/?LinkId=160180)
- Provides a forum for questions about and general discussions of Datasets.
+- [ADO.NET DataSet forum](https://social.msdn.microsoft.com/Forums/en-US/home?forum=adodotnetdataset)
 
- [ADO.NET entity framework and LINQ to entities](http://go.microsoft.com/fwlink/?LinkId=191520)
- Provides a forum for questions about and general discussions of Entity Framework applications and the LINQ to Entities language.
+- [ADO.NET Entity Framework and LINQ to Entities](https://social.msdn.microsoft.com/Forums/en-US/home?forum=adodotnetentityframework)
 
- [WCF data services forum](http://go.microsoft.com/fwlink/?LinkId=160181)
- Provides a forum for questions about and general discussions of data services.
+- [WCF data services forum](https://social.msdn.microsoft.com/Forums/en-US/home?forum=adodotnetdataservices)
 
- [SQL Server data access forum](http://go.microsoft.com/fwlink/?LinkID=160184)
- Provides a forum for questions about and general discussions of accessing data in Microsoft SQL Server.
+- [SQL Server data access forum](https://social.msdn.microsoft.com/Forums/sqlserver/en-US/home?forum=sqldataaccess)
 
- [LINQ to SQL forum](http://go.microsoft.com/fwlink/?LinkId=160183)
- Provides a forum for questions about and general discussions of LINQ to SQL.
+- [LINQ to SQL forum](https://social.msdn.microsoft.com/Forums/en-US/home?forum=linqtosql)
 
- [ADO.NET data providers forum](http://go.microsoft.com/fwlink/?LinkId=160182)
- Provides a forum for questions about and general discussions of the different .NET Framework Data Providers.
+- [ADO.NET data providers forum](https://social.msdn.microsoft.com/Forums/en-US/home?forum=adodotnetdataproviders)
 
- For information about how to troubleshoot connectivity to SQL Server, see [How to troubleshoot connecting to the SQL Server database engine](http://go.microsoft.com/fwlink/?LinkID=246151).
+For information about how to troubleshoot connectivity to SQL Server, see [Troubleshoot connecting to the SQL Server database engine](https://social.technet.microsoft.com/wiki/contents/articles/2102.how-to-troubleshoot-connecting-to-the-sql-server-database-engine.aspx).
 
 ## See also
 

docs/data-tools/read-xml-data-into-a-dataset.md

@@ -24,50 +24,37 @@ ms.workload:
   - "data-storage"
 ---
 # Read XML data into a dataset
-ADO.NET provides simple methods for working with XML data. In this walkthrough, you  create a Windows application that  loads XML data into a dataset. The dataset is then displayed in a <xref:System.Windows.Forms.DataGridView> control. Finally, an XML schema based on the contents of the XML file is displayed in a text box.
 
- This walkthrough consists of five main steps:
-
-1.  Creating a new project
-
-2.  Creating an XML file to be read into the dataset
-
-3.  Creating the user interface
-
-4.  Creating the dataset, reading the XML file, and displaying it in a <xref:System.Windows.Forms.DataGridView> control
-
-5.  Adding code to display the XML schema based on the XML file in a <xref:System.Windows.Forms.TextBox> control
+ADO.NET provides simple methods for working with XML data. In this walkthrough, you create a Windows application that loads XML data into a dataset. The dataset is then displayed in a <xref:System.Windows.Forms.DataGridView> control. Finally, an XML schema based on the contents of the XML file is displayed in a text box.
 
 > [!NOTE]
->  The dialog boxes and menu commands you see might differ from those described in Help depending on your active settings or the edition you're using. To change your settings, on the **Tools** menu, select **Import and Export Settings**. For more information, see [Personalize the Visual Studio IDE](../ide/personalizing-the-visual-studio-ide.md).
+> The dialog boxes and menu commands you see might differ from those described in Help depending on your active settings or the edition you're using. To change your settings, on the **Tools** menu, select **Import and Export Settings**. For more information, see [Personalize the Visual Studio IDE](../ide/personalizing-the-visual-studio-ide.md).
 
 ## Create a new project
- In this step, you  create a Visual Basic or Visual C# project that  contains this walkthrough.
 
-#### To create the new Windows project
+In this step, you create a Visual Basic or Visual C# project.
 
-1. In Visual Studio, on the **File** menu, select **New**, **Project...**.
+1. In Visual Studio, on the **File** menu, select **New** > **Project**.
 
 2. Expand either **Visual C#** or **Visual Basic** in the left-hand pane, then select **Windows Desktop**.
 
 3. In the middle pane, select the **Windows Forms App** project type.
 
 4. Name the project **ReadingXML**, and then choose **OK**.
 
-     The **ReadingXML** project is created and added to **Solution Explorer**.
+   The **ReadingXML** project is created and added to **Solution Explorer**.
 
 ## Generate the XML file to be read into the dataset
- Because this walkthrough focuses on reading XML data into a dataset, the contents of an XML file is provided.
 
-#### To create the XML file that will be read into the dataset
+Because this walkthrough focuses on reading XML data into a dataset, the contents of an XML file is provided.
 
 1.  On the **Project** menu, select **Add New Item**.
 
-2.  Select **XML File**, name the file `authors.xml`, and then select **Add**.
+2.  Select **XML File**, name the file **authors.xml**, and then select **Add**.
 
-     The XML file loads into the designer and is ready for edit.
+   The XML file loads into the designer and is ready for edit.
 
-3.  Paste the following code into the editor below the XML declaration:
+3.  Paste the following XML data into the editor below the XML declaration:
 
     ```xml
     <Authors_Table>
@@ -132,7 +119,8 @@ ADO.NET provides simple methods for working with XML data. In this walkthrough,
 4.  On the **File** menu, select **Save authors.xml**.
 
 ## Create the user interface
- The user interface for this application consists of the following:
+
+The user interface for this application consists of the following:
 
 -   A <xref:System.Windows.Forms.DataGridView> control that displays the contents of the XML file as data.
 
@@ -144,7 +132,7 @@ ADO.NET provides simple methods for working with XML data. In this walkthrough,
 
     -   A second button extracts the schema from the dataset, and through a <xref:System.IO.StringWriter> displays it in the <xref:System.Windows.Forms.TextBox> control.
 
-#### To add controls to the form
+### To add controls to the form
 
 1.  Open `Form1` in design view.
 
@@ -168,9 +156,8 @@ ADO.NET provides simple methods for working with XML data. In this walkthrough,
     ||**Text**|`Show Schema`|
 
 ## Create the dataset that receives the XML data
- In this step, you create a new dataset named `authors`. For more information about datasets, see [Dataset tools in Visual Studio](../data-tools/dataset-tools-in-visual-studio.md).
 
-#### To create a new dataset that receives the XML data
+In this step, you create a new dataset named `authors`. For more information about datasets, see [Dataset tools in Visual Studio](../data-tools/dataset-tools-in-visual-studio.md).
 
 1.  In **Solution Explorer**, select the source file for **Form1**, and then select the **View Designer** button on the **Solution Explorer** toolbar.
 
@@ -183,11 +170,10 @@ ADO.NET provides simple methods for working with XML data. In this walkthrough,
 4.  In the **Properties** window, set the **Name** and <xref:System.Data.DataSet.DataSetName%2A> properties for`AuthorsDataSet`.
 
 ## Create the event handler to read the XML file into the dataset
- The **Read XML** button reads the XML file into the dataset. It then sets properties on the <xref:System.Windows.Forms.DataGridView> control that bind it to the dataset.
 
-#### To add code to the ReadXmlButton_Click event handler
+The **Read XML** button reads the XML file into the dataset. It then sets properties on the <xref:System.Windows.Forms.DataGridView> control that bind it to the dataset.
 
-1.  In **Solution Explorer**, select **Form1**,  and then select the **View Designer** button on the **Solution Explorer** toolbar.
+1.  In **Solution Explorer**, select **Form1**, and then select the **View Designer** button on the **Solution Explorer** toolbar.
 
 2.  Select the **Read XML** button.
 
@@ -201,25 +187,23 @@ ADO.NET provides simple methods for working with XML data. In this walkthrough,
 4.  In the `ReadXMLButton_Click` event handler code, change the `filepath =` entry to the correct path.
 
 ## Create the event handler to display the schema in the textbox
- The **Show Schema** button creates a <xref:System.IO.StringWriter> object that's filled with the schema and is displayed in the <xref:System.Windows.Forms.TextBox>control.
 
-#### To add code to the ShowSchemaButton_Click event handler
+The **Show Schema** button creates a <xref:System.IO.StringWriter> object that's filled with the schema and is displayed in the <xref:System.Windows.Forms.TextBox>control.
 
 1.  In **Solution Explorer**, select **Form1**, and then select the **View Designer** button.
 
 2.  Select the **Show Schema** button.
 
      The **Code Editor** opens at the `ShowSchemaButton_Click` event handler.
 
-3.  Type the following code into the `ShowSchemaButton_Click` event handler.
+3.  Paste the following code into the `ShowSchemaButton_Click` event handler.
 
      [!code-csharp[VbRaddataFillingAndExecuting#3](../data-tools/codesnippet/CSharp/read-xml-data-into-a-dataset_2.cs)]
      [!code-vb[VbRaddataFillingAndExecuting#3](../data-tools/codesnippet/VisualBasic/read-xml-data-into-a-dataset_2.vb)]
 
 ## Test the form
- You can now test the form to make sure it behaves as expected.
 
-#### To test the form
+You can now test the form to make sure it behaves as expected.
 
 1.  Select **F5** to run the application.
 
@@ -231,14 +215,15 @@ ADO.NET provides simple methods for working with XML data. In this walkthrough,
 
      The text box displays the XML schema for the XML file.
 
-## Next Steps
- This walkthrough teaches you the basics of reading an XML file into a dataset, as well as creating a schema based on the contents of the XML file. Here are some tasks that you might do next:
+## Next steps
+
+This walkthrough teaches you the basics of reading an XML file into a dataset, as well as creating a schema based on the contents of the XML file. Here are some tasks that you might do next:
 
 -   Edit the data in the dataset and write it back out as XML. For more information, see <xref:System.Data.DataSet.WriteXml%2A>.
 
--   Edit the data in the dataset and write it out to a database. For more information, see [Saving Data](../data-tools/saving-data.md).
+-   Edit the data in the dataset and write it out to a database.
 
 ## See also
 
-- [Accessing data in Visual Studio](../data-tools/accessing-data-in-visual-studio.md)
-- [XML Tools in Visual Studio](../xml-tools/xml-tools-in-visual-studio.md)
+- [Access data in Visual Studio](../data-tools/accessing-data-in-visual-studio.md)
+- [XML tools in Visual Studio](../xml-tools/xml-tools-in-visual-studio.md)