Merge pull request #3201 from MicrosoftDocs/master

11/1 AM Publish

Author: Taojunshen

.openpublishing.publish.config.json

@@ -96,6 +96,7 @@
   "git_repository_branch_open_to_public_contributors": "master",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
+  "need_pr_comments": false,
   "contribution_branch_mappings": {},
   "dependent_repositories": [
     {

.openpublishing.redirection.json

@@ -6817,6 +6817,11 @@
             "redirect_url": "/visualstudio/extensibility/upgrading-custom-project-and-item-templates-for-visual-studio-2017?view=vs-2015",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/docker/index.md",
+            "redirect_url": "/dotnet/standard/containerized-lifecycle-architecture/design-develop-containerized-apps/visual-studio-tools-for-docker?toc=/visualstudio/docker/toc.json&bc=/visualstudio/docker/breadcrumb/toc.json",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/cross-platform/visual-studio-and-xamarin.md",
             "redirect_url": "/xamarin/",
@@ -6856,11 +6861,6 @@
             "source_path": "docs/cross-platform/application-lifecycle-management-alm-with-xamarin-apps.md",
             "redirect_url": "/xamarin/tools/ci/devops/",
             "redirect_document_id": true
-        },
-        {
-            "source_path": "docs/docker/index.md",
-            "redirect_url": "/dotnet/standard/containerized-lifecycle-architecture/design-develop-containerized-apps/visual-studio-tools-for-docker?toc=/visualstudio/docker/toc.json&bc=/visualstudio/docker/breadcrumb/toc.json",
-            "redirect_document_id": false
         }
     ]
 }

docs/azure/toc.yml

@@ -5,15 +5,15 @@
   expanded: true
   items:
   - name: Publish an ASP.NET Core app to Azure 
-    href: /aspnet/core/tutorials/publish-to-azure-webapp-using-vs?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json&view=aspnetcore-2.1
+    href: /aspnet/core/tutorials/publish-to-azure-webapp-using-vs?view=aspnetcore-2.1
   - name: Publish a .NET TODO List Web App to Azure
-    href: /dotnet/azure/dotnet-quickstart-vs?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json&view=azure-dotnet
+    href: /dotnet/azure/dotnet-quickstart-vs?view=azure-dotnet
   - name: Publish Azure Functions
     href: /azure/azure-functions/functions-develop-vs?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
   - name: Continuous deployment to Azure with Visual Studio and Git with ASP.NET Core 
-    href: /aspnet/core/host-and-deploy/azure-apps/azure-continuous-deploymenttoc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json&?view=aspnetcore-2.1
+    href: /aspnet/core/host-and-deploy/azure-apps/azure-continuous-deployment?view=aspnetcore-2.1
   - name: Continuous deployment to Azure with Azure Pipelines
-    href: /azure/devops/pipelines/get-started-yaml?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json&view=vsts
+    href: /azure/devops/pipelines/get-started-yaml?view=vsts
   - name: Publish an ASP.NET Web App to an Azure VM
     href: /azure/virtual-machines/windows/publish-web-app-from-visual-studio?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
 - name: Connect to Azure Services
@@ -35,7 +35,7 @@
     - name: Facial recognition
       href: /azure/cognitive-services/face/vs-face-connected-service?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
     - name: Computer Vision
-      href: /azure/cognitive-services/computer-vision/vs-computer-vision-connected-service?toc=/visualstudio/azure/vs-azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
+      href: /azure/cognitive-services/computer-vision/vs-computer-vision-connected-service?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
 - name: Cloud Services
   expanded: false
   items:

docs/cross-platform/index.md

@@ -1,16 +1,16 @@
 ---
 layout: LandingPage
+title: Mobile Development with C++
+description: Create native C++ apps for iOS, Android and Windows devices with Visual Studio.
+ms.date: 10/31/2018
 author: jasongroce
-ms.author: apexprodleads
+ms.author: jasgro
 ms.topic: landing-page
 ms.prod: visual-studio-dev15
 ms.technology: vs-ide-mobile
-title: Mobile Development with C++ Documentation | Microsoft Docs
-description: Create native C++ apps for iOS, Android and Windows devices with Visual Studio.
 ms.workload:
   - apexprodleads
 ---
-
 # Mobile development with C++ documentation
 
 Create native C++ apps for iOS, Android, and Windows devices with Visual Studio.

docs/data-tools/directly-access-the-database-with-a-tableadapter.md

@@ -27,39 +27,41 @@ ms.workload:
   - "data-storage"
 ---
 # Directly access the database with a TableAdapter
+
 In addition to the `InsertCommand`, `UpdateCommand`, and `DeleteCommand`, TableAdapters are created with methods that can be run directly against the database. You can call these methods (`TableAdapter.Insert`, `TableAdapter.Update`, and `TableAdapter.Delete`) to manipulate data directly in the database.
 
- If you don't want to create these direct methods, set the TableAdapter's `GenerateDbDirectMethods` property to `false` in the **Properties** window. If any queries are added to a TableAdapter in addition to the TableAdapter's main query, they are standalone queries that don't generate these `DbDirect` methods.
+If you don't want to create these direct methods, set the TableAdapter's `GenerateDbDirectMethods` property to `false` in the **Properties** window. If any queries are added to a TableAdapter in addition to the TableAdapter's main query, they are standalone queries that don't generate these `DbDirect` methods.
 
 ## Send commands directly to a database
- Call the TableAdapter `DbDirect` method that performs the task you are trying to accomplish.
 
-#### To insert new records directly into a database
+Call the TableAdapter `DbDirect` method that performs the task you are trying to accomplish.
+
+### To insert new records directly into a database
 
 -   Call the TableAdapter's `Insert` method, passing in the values for each column as parameters. The following procedure uses the `Region` table in the Northwind database as an example.
 
     > [!NOTE]
-    >  If you do not have an instance available, instantiate the TableAdapter that you want to use.
+    > If you do not have an instance available, instantiate the TableAdapter that you want to use.
 
      [!code-vb[VbRaddataSaving#15](../data-tools/codesnippet/VisualBasic/directly-access-the-database-with-a-tableadapter_1.vb)]
      [!code-csharp[VbRaddataSaving#15](../data-tools/codesnippet/CSharp/directly-access-the-database-with-a-tableadapter_1.cs)]
 
-#### To update records directly in a database
+### To update records directly in a database
 
 -   Call the TableAdapter's `Update` method, passing in the new and original values for each column as parameters.
 
     > [!NOTE]
-    >  If you do not have an instance available, instantiate the TableAdapter that you want to use.
+    > If you do not have an instance available, instantiate the TableAdapter that you want to use.
 
      [!code-vb[VbRaddataSaving#18](../data-tools/codesnippet/VisualBasic/directly-access-the-database-with-a-tableadapter_2.vb)]
      [!code-csharp[VbRaddataSaving#18](../data-tools/codesnippet/CSharp/directly-access-the-database-with-a-tableadapter_2.cs)]
 
-#### To delete records directly from a database
+### To delete records directly from a database
 
 -   Call the TableAdapter's `Delete` method, passing in the values for each column as parameters of the `Delete` method. The following procedure uses the `Region` table in the Northwind database as an example.
 
     > [!NOTE]
-    >  If you do not have an instance available, instantiate the TableAdapter that you want to use.
+    > If you do not have an instance available, instantiate the TableAdapter that you want to use.
 
      [!code-vb[VbRaddataSaving#21](../data-tools/codesnippet/VisualBasic/directly-access-the-database-with-a-tableadapter_3.vb)]
      [!code-csharp[VbRaddataSaving#21](../data-tools/codesnippet/CSharp/directly-access-the-database-with-a-tableadapter_3.cs)]

docs/data-tools/extend-the-functionality-of-a-tableadapter.md

@@ -19,18 +19,20 @@ ms.workload:
   - "data-storage"
 ---
 # Extend the functionality of a TableAdapter
+
 You can extend the functionality of a TableAdapter by adding code to the TableAdapter's partial class file.
 
- The code that defines a TableAdapter is regenerated when any changes are made to the TableAdapter in the **Dataset Designer**, or when a wizard  modifies the configuration of a TableAdapter. To prevent your code from being deleted during the regeneration of a TableAdapter, add code to the TableAdapter's partial class file.
+The code that defines a TableAdapter is regenerated when any changes are made to the TableAdapter in the **Dataset Designer**, or when a wizard  modifies the configuration of a TableAdapter. To prevent your code from being deleted during the regeneration of a TableAdapter, add code to the TableAdapter's partial class file.
 
- Partial classes allow code for a specific class to be divided among multiple physical files. For more information, see [Partial](/dotnet/visual-basic/language-reference/modifiers/partial) or [partial (Type)](/dotnet/csharp/language-reference/keywords/partial-type).
+Partial classes allow code for a specific class to be divided among multiple physical files. For more information, see [Partial](/dotnet/visual-basic/language-reference/modifiers/partial) or [partial (Type)](/dotnet/csharp/language-reference/keywords/partial-type).
 
 ## Locate TableAdapters in code
- While TableAdapters are designed with the **Dataset Designer**, the TableAdapter classes that are generated are not  nested classes of <xref:System.Data.DataSet>. TableAdapters are located in a namespace based on the name of the TableAdapter's associated dataset. For example, if your application contains a dataset named `HRDataSet`, the TableAdapters would be located in the `HRDataSetTableAdapters` namespace. (The naming convention follows this pattern: *DatasetName* + `TableAdapters`).
 
- The following example assumes a TableAdapter named `CustomersTableAdapter`is in a project with `NorthwindDataSet`.
+While TableAdapters are designed with the **Dataset Designer**, the TableAdapter classes that are generated are not  nested classes of <xref:System.Data.DataSet>. TableAdapters are located in a namespace based on the name of the TableAdapter's associated dataset. For example, if your application contains a dataset named `HRDataSet`, the TableAdapters would be located in the `HRDataSetTableAdapters` namespace. (The naming convention follows this pattern: *DatasetName* + `TableAdapters`).
+
+The following example assumes a TableAdapter named `CustomersTableAdapter`is in a project with `NorthwindDataSet`.
 
-#### To create a partial class for a TableAdapter
+### To create a partial class for a TableAdapter
 
 1.  Add a new class to your project by going to the **Project** menu and selecting **Add Class**.
 

docs/data-tools/filter-and-sort-data-in-a-windows-forms-application.md

@@ -23,12 +23,13 @@ ms.workload:
   - "data-storage"
 ---
 # Filter and sort data in a Windows Forms application
+
 You filter data by setting the <xref:System.Windows.Forms.BindingSource.Filter%2A> property to a string expression that returns the desired records.
 
- You sort data by setting the <xref:System.Windows.Forms.BindingSource.Sort%2A> property to the column name on which you want to sort; append `DESC` to sort in descending order, or append `ASC` to sort in ascending order.
+You sort data by setting the <xref:System.Windows.Forms.BindingSource.Sort%2A> property to the column name on which you want to sort; append `DESC` to sort in descending order, or append `ASC` to sort in ascending order.
 
 > [!NOTE]
->  If your application does not use <xref:System.Windows.Forms.BindingSource> components, you can filter and sort data by using <xref:System.Data.DataView> objects. For more information, see [DataViews](/dotnet/framework/data/adonet/dataset-datatable-dataview/dataviews).
+> If your application does not use <xref:System.Windows.Forms.BindingSource> components, you can filter and sort data by using <xref:System.Data.DataView> objects. For more information, see [DataViews](/dotnet/framework/data/adonet/dataset-datatable-dataview/dataviews).
 
 ## To filter data by using a BindingSource component
 

docs/data-tools/handle-a-concurrency-exception.md

@@ -156,31 +156,31 @@ When you attempt to perform an update and an exception is raised, you generally
 
 1. Add the following code below the `Form1_Load` method:
 
-     [!code-csharp[VbRaddataConcurrency#1](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_1.cs)]
-     [!code-vb[VbRaddataConcurrency#1](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_1.vb)]
+   [!code-csharp[VbRaddataConcurrency#1](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_1.cs)]
+   [!code-vb[VbRaddataConcurrency#1](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_1.vb)]
 
 2. Replace the `CustomersBindingNavigatorSaveItem_Click` method to call the `UpdateDatabase` method so it looks like the following:
 
-     [!code-csharp[VbRaddataConcurrency#2](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_2.cs)]
-     [!code-vb[VbRaddataConcurrency#2](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_2.vb)]
+   [!code-csharp[VbRaddataConcurrency#2](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_2.cs)]
+   [!code-vb[VbRaddataConcurrency#2](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_2.vb)]
 
 ### Display choices to the user
 
 The code you just wrote calls the `CreateMessage` procedure to display error information to the user. For this walkthrough, you use a message box to display the different versions of the record to the user. This enables the user to choose whether to overwrite the record with the changes or cancel the edit. Once the user selects an option (clicks a button) on the message box, the response is passed to the `ProcessDialogResult` method.
 
 Create the message by adding the following code to the **Code Editor**. Enter this code below the `UpdateDatabase` method:
 
-     [!code-csharp[VbRaddataConcurrency#4](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_3.cs)]
-     [!code-vb[VbRaddataConcurrency#4](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_3.vb)]
+[!code-csharp[VbRaddataConcurrency#4](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_3.cs)]
+[!code-vb[VbRaddataConcurrency#4](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_3.vb)]
 
 ### Process the user's response
 
 You also need code to process the user's response to the message box. The options are either to overwrite the current record in the database with the proposed change, or abandon the local changes and refresh the data table with the record that's currently in the database. If the user chooses **Yes**, the <xref:System.Data.DataTable.Merge%2A> method is called with the *preserveChanges* argument set to **true**. This causes the update attempt to be successful, because the original version of the record now matches the record in the database.
 
 Add the following code below the code that was added in the previous section:
 
-     [!code-csharp[VbRaddataConcurrency#3](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_4.cs)]
-     [!code-vb[VbRaddataConcurrency#3](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_4.vb)]
+[!code-csharp[VbRaddataConcurrency#3](../data-tools/codesnippet/CSharp/handle-a-concurrency-exception_4.cs)]
+[!code-vb[VbRaddataConcurrency#3](../data-tools/codesnippet/VisualBasic/handle-a-concurrency-exception_4.vb)]
 
 ## Test the form