fix conflicts

Author: kraigb

.openpublishing.redirection.json

@@ -700,6 +700,11 @@
             "redirect_url": "/visualstudio/debugger/index",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/debugger/how-to-use-intellitrace-step-back.md",
+            "redirect_url": "/visualstudio/debugger/view-historical-application-state",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/deployment/installshield-limited-edition.md",
             "redirect_url": "/visualstudio/deployment/deploying-applications-services-and-components",
@@ -715,6 +720,11 @@
             "redirect_url": "/visualstudio/deployment/deploying-clickonce-applications-for-testing-and-production-without-resigning",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/deployment/deploy-iis-with-web-deploy.md",
+            "redirect_url": "/iis/install/installing-publishing-technologies/installing-and-configuring-web-deploy-on-iis-80-or-later",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/designers/index.md",
             "redirect_url": "/visualstudio/designers/designing-user-interfaces",
@@ -6677,6 +6687,11 @@
             "redirect_url": "/visualstudio/cross-platform/visual-studio-tools-for-unity",
             "redirect_document_id": false
         },
+        {
+            "source_path": "subscriptions/vs-vsts.md",
+            "redirect_url": "/visualstudio/subscriptions/vs-azure-devops",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/sharepoint/requirements-for-developing-sharepoint-solutions.md",
             "redirect_url": "/visualstudio/sharepoint/getting-started-sharepoint-development-in-visual-studio",
@@ -6796,6 +6811,16 @@
             "source_path": "docs/vs-2015/profiling/how-to-attach-the-profiler-to-a-dotnet-framework-stand-alone-application-to-collect-concurrency-data-by-using-the-command-line.md",
             "redirect_url": "/visualstudio/profiling/how-to-attach-the-profiler-to-a-dotnet-app-and-collect-concurrency-data?view=vs-2015",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/vs-2015/debugger/what’s-new-for-the-debugger-in-visual-studio-2015.md",
+            "redirect_url": "/visualstudio/debugger/what-s-new-for-the-debugger-in-visual-studio-2015?view=vs-2015",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/vs-2015/extensibility/upgrading-custom-project-and-item-templates-for-visual-studio-%2215%22.md",
+            "redirect_url": "/visualstudio/extensibility/upgrading-custom-project-and-item-templates-for-visual-studio-2017?view=vs-2015",
+            "redirect_document_id": false
         }
     ]
 }

README.md

@@ -13,10 +13,10 @@ The documentation for Visual Basic and Visual C# are located in a separate repo
 
 ## Contributing to the documentation
 
-To contribute to this documentation, please see the [Contributing guide](CONTRIBUTING.md).
+To contribute to this documentation, please see the [Contributing guide](https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/CONTRIBUTING.md).
 We welcome your contributions to help us improve the Visual Studio docs. All the articles in this repository use GitHub flavored markdown.
 
-Several feature areas of Visual Studio have their own folders in this repo, such as **debugger** for topics on debugging, **ide** for topics on the Visual Studio interactive development environment (IDE), and so forth. The **/media** subfolder in each folder contains art files for the topics. The [Contributing guide](CONTRIBUTING.md) has more information.
+Several feature areas of Visual Studio have their own folders in this repo, such as **debugger** for topics on debugging, **ide** for topics on the Visual Studio interactive development environment (IDE), and so forth. The **/media** subfolder in each folder contains art files for the topics. The [Contributing guide](https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/CONTRIBUTING.md) has more information.
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
 

docs/ai/create-project-repo.md

@@ -11,9 +11,9 @@ Once you've [installed Visual Studio Tools for AI](installation.md), you can eas
 
 2. Launch Visual Studio.
 
-3. Select **View > Team Explorer...** to open the **Team Explorer** window in which you can connect to GitHub or Visual Studio Team Services, or clone a repository.
+3. Select **View > Team Explorer...** to open the **Team Explorer** window in which you can connect to GitHub or Azure DevOps, or clone a repository.
 
-    ![Team explorer window showing Visual Studio Team Services, GitHub, and cloning a repository](media\create-project-repo\team-explorer.png)
+    ![Team explorer window showing Azure DevOps, GitHub, and cloning a repository](media\create-project-repo\team-explorer.png)
 
 4. In the URL field under **Local Git Repositories**, enter `https://github.com/Microsoft/samples-for-ai`, enter a folder for the cloned files, and select **Clone**.
 

docs/ai/installation.md

@@ -1,6 +1,6 @@
 ---
-title: Installing AI Tools for Visual Studio
-description: Installation of AI Tools for Visual Studio
+title: Install AI Tools
+description: Describes how to install AI Tools for Visual Studio
 keywords: ai, visual studio
 author: lisawong19
 ms.author: liwong
@@ -21,19 +21,20 @@ Visual Studio Tools for AI can be installed on Windows 64-bit operating systems.
 
 This extension works with Visual Studio 2015 and Visual Studio 2017, Community edition or higher.
 
-To install, download from the [Visual Studio Marketplace](http://aka.ms/vstoolsforai) or from within Visual Studio
+You can download the tools from the [Visual Studio Marketplace](http://aka.ms/vstoolsforai), or from within Visual Studio:
 
-1. **Tools** > **Extensions and Updates**
+1. Select **Tools** > **Extensions and Updates**.
 
-![install CUDA on Windows](media\installation\extensions.png)
+   ![Extensions and Updates menu in Visual Studio](media\installation\extensions.png)
 
-1. **Search** in upper right-hand corner for "Tools for AI"
-2. Select **Visual Studio Tools for AI**
-3. Click **Download**
+2. In the **Extensions and Updates** dialog box, select **Online** on the left-hand side.
+3. In the search box in the upper right-hand corner, type or enter "tools for ai".
+4. Select **Visual Studio Tools for AI** from the results.
+5. Click **Download**.
 
 ## Prepare your local machine
 
-Before training deep learning models on your local computer you should make sure you have the latest applicable prerequisites installed. This includes making sure the latest drivers and libraries for your NVIDIA GPU (if you have one). You should also ensure you have installed Python and Python libraries such as NumPy, SciPy, and appropriate deep learning frameworks such as Microsoft Cognitive Toolkit (CNTK), TensorFlow, Caffe2, MXNet, Keras, Theano, PyTorch and/or Chainer that you plan to use in your project.
+Before training deep learning models on your local computer, make sure you have the applicable prerequisites installed. This includes making sure you have the latest drivers and libraries for your NVIDIA GPU (if you have one). You should also ensure you've installed Python and Python libraries such as NumPy, SciPy, and appropriate deep learning frameworks such as Microsoft Cognitive Toolkit (CNTK), TensorFlow, Caffe2, MXNet, Keras, Theano, PyTorch, and Chainer, that you plan to use in your project.
 
 > [!NOTE]
 > Software introduction in the following subsections is excerpted from their homepages.
@@ -44,17 +45,15 @@ Deep learning frameworks take advantage of NVIDIA GPU to let machines learn at a
 
 ### CUDA
 
-[CUDA](https://developer.nvidia.com/cuda-zone) is a parallel computing platform and programming model invented by NVIDIA.
-It enables dramatic increases in computing performance by harnessing the power of the GPU.
-Currently, CUDA Toolkit 8.0 is required by deep learning frameworks.
+[CUDA](https://developer.nvidia.com/cuda-zone) is a parallel computing platform and programming model invented by NVIDIA. It enables dramatic increases in computing performance by harnessing the power of the GPU. Currently, CUDA Toolkit 8.0 is required by deep learning frameworks.
 
 To install CUDA
 
 - Visit this [site](https://developer.nvidia.com/cuda-80-ga2-download-archive), download CUDA and install it.
 - Make sure to install the CUDA runtime libraries, and then add CUDA binary path to the %PATH% or $Path environment variable.
 - On Windows, this path is "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v8.0\bin" by default.
 
-![install CUDA on Windows](media\installation\install_cuda_win.png)
+![Install CUDA on Windows](media\installation\install_cuda_win.png)
 
 ### cuDNN
 
@@ -80,7 +79,7 @@ Python has been the primary programming language for deep learning applications.
 
 Deep learning frameworks rely on pip for their own installation.
 
-![install Python on Windows](media\installation\install_python_win.png)
+![Install Python on Windows](media\installation\install_python_win.png)
 
 Then, we need to verify whether Python 3.5 is installed correctly, and upgrade pip to the latest version by executing the following commands in a terminal:
 

docs/ai/job-details.md

@@ -4,11 +4,11 @@ ms.technology: vs-ai-tools
 # View recent job performance and details
 Once the jobs are submitted, you can view the list of jobs to see their status, duration and more.
 
-1. In the **Server Explorer** expand the specific compute context
-1. Double-click **Jobs**
+1. In the **Server Explorer**, expand the specific compute context.
+1. Double-click **Jobs**.
 1. You will see the list of jobs submitted to that compute context.
-1. Select a specific **Job** in the list to view details
+1. Select a specific **Job** in the list to view details.
 
 ![monitor jobs](media\job-details\monitor-jobs.png)
 
-> Job history submitted to Linux VMs is stored on the VM in the /tmp directory. Therefore, whenever it is rebooted the job history is cleared. For a permanent record of your job history please configure your VM as a compute context in Azure Machine learning, then Submit Job to Azure Machine Learning (selecting your VM as the compute context)
+> Job history submitted to Linux VMs is stored on the VM in the /tmp directory. Therefore, whenever it is rebooted the job history is cleared. For a permanent record of your job history, please configure your VM as a compute context in Azure Machine learning, then Submit Job to Azure Machine Learning (selecting your VM as the compute context).

docs/ai/manage-storage.md

@@ -3,18 +3,18 @@ ms.technology: vs-ai-tools
 ---
 # Browse storage to upload data or download models and logs
 
-You can browse all storage on the remote machine or Azure file share to enable uploading data or downloading models and logs. Or if you want to access logs and job outputs for a specific job you can do that as well in the job browser
+You can browse all storage on the remote machine or Azure file share to enable uploading data or downloading models and logs. Or, if you want to access logs and job outputs for a specific job, you can do that as well in the job browser.
 
 ## To access all data on the remote machine or file share
-1. Open the **Server Explorer**
-2. Expand the remote machine or Batch AI compute context
-3. Right click **Storage** then click **Browse**
+1. Open the **Server Explorer**.
+2. Expand the remote machine or Batch AI compute context.
+3. Right-click **Storage**; then, click **Browse**.
 
 	![storage](media\manage-storage\browse-storage.png)
 
-## To access job specific data on the remote machine or file share
+## To access job-specific data on the remote machine or file share
 1. Open the [Job History](job-details.md)
-2. Select the job
-3. Click **Working Folder** or click StdOut / Stderr for quick access to these important log files
+2. Select the job.
+3. Click **Working Folder** or click **StdOut / Stderr** for quick access to these important log files.
 
 	![storage](media\manage-storage\job-workingfolder.png)

docs/ai/monitor-gpu.md

@@ -4,11 +4,11 @@ ms.technology: vs-ai-tools
 # Monitoring GPU Utilization
 To monitor GPU utilization of remote Linux machines:
 
-1. In **Server Explorer**, expand **Remote Machines**
-2. **Right click** the remote machine you want to monitor
+1. In **Server Explorer**, expand **Remote Machines**.
+2. **Right-click** the remote machine you want to monitor.
 
     ![gpu heatmap](media\monitor-gpu\gpu-heatmap-0.png)
 
-2. Click **Show Heat Map**
+2. Click **Show Heat Map**.
 
     ![gpu heatmap](media\monitor-gpu\heatmap.png)

docs/ai/monitor-tensorboard.md

@@ -5,10 +5,10 @@ ms.technology: vs-ai-tools
 
 You can visualize your model training progress with TensorBoard.
 
-1. Right click your project and click **Run TensorBoard** then select the directory of your output TensorBoard logs.
+1. Right-click your project and click **Run TensorBoard**; then, select the directory of your output TensorBoard logs.
 
     ![run tensorboard](media\monitor-tensorboard\run-tensorboard.png)
 
-1. Notice the error decreasing overtime, which means the quality is improving
+1. Notice the error decreasing over time, which means the quality is improving.
 
     ![run tensorboard](media\monitor-tensorboard\tensorboard.png)

docs/ai/tensorflow-local.md

@@ -46,7 +46,7 @@ Download this [GitHub repository](https://github.com/Microsoft/samples-for-ai) c
 
 ![Open solution](media\tensorflow-local\open-solution.png)
 
-- Find the MNIST Project in **Solution Explorer**, right-click and select **Set as StartUp Project**.
+- Find the MNIST project in **Solution Explorer**, right-click and select **Set as StartUp Project**.
 
 - Click **Start**.
 

docs/ai/train-model.md

@@ -29,9 +29,9 @@ It's integrated with Visual Studio Tools for AI so you can dynamically scale out
 
     ![Sample gallery](media\train-model\batchai.png)
 
-3. Select **View > Team Explorer...** to open the **Team Explorer** window in which you can connect to GitHub or Visual Studio Team Services, or clone a repository.
+3. Select **View > Team Explorer...** to open the **Team Explorer** window in which you can connect to GitHub or Azure DevOps, or clone a repository.
 
-    ![Team explorer window showing Visual Studio Team Services, GitHub, and cloning a repository](media\train-model\team-explorer.png)
+    ![Team explorer window showing Azure DevOps, GitHub, and cloning a repository](media\train-model\team-explorer.png)
 
 4. In the URL field under **Local Git Repositories**, enter `https://github.com/Microsoft/samples-for-ai`, enter a folder for the cloned files, and select **Clone**.
 

docs/code-quality/annotating-structs-and-classes.md

@@ -19,6 +19,7 @@ f1_keywords:
   - "_Field_size_bytes_full_"
   - "_Field_size_full_"
   - "_Field_size_full_opt_"
+  - "_Field_z_"
 ms.assetid: b8278a4a-c86e-4845-aa2a-70da21a1dd52
 author: mikeblome
 ms.author: mblome
@@ -47,9 +48,11 @@ You can annotate struct and class members by using annotations that act like inv
 
      A field that has both readable and writable size in elements (or bytes) as specified by `size`.
 
--   `_Struct_size_bytes_(size)`
+-   `_Field_z_`
 
-     A field that has both readable and writable size in elements (or bytes) as specified by `size`.
+     A field that has a null-terminated string.
+
+-   `_Struct_size_bytes_(size)`
 
      Applies to struct or class declaration.  Indicates that a valid object of that type may be larger than the declared type, with the number of bytes being specified by `size`.  For example:
 
@@ -77,4 +80,4 @@ You can annotate struct and class members by using annotations that act like inv
  [Annotating Locking Behavior](../code-quality/annotating-locking-behavior.md)
  [Specifying When and Where an Annotation Applies](../code-quality/specifying-when-and-where-an-annotation-applies.md)
  [Intrinsic Functions](../code-quality/intrinsic-functions.md)
- [Best Practices and Examples](../code-quality/best-practices-and-examples-sal.md)
+ [Best Practices and Examples](../code-quality/best-practices-and-examples-sal.md)

docs/code-quality/c28113.md

@@ -18,7 +18,7 @@ ms.workload:
 # C28113
 warning C28113: Accessing a local variable via an Interlocked function
 
- The driver is using an Interlocked executive support routine, such as [InterlockedDecrement](http://msdn.microsoft.com/library/windows/hardware/ff547871.aspx), to access a local variable.
+ The driver is using an Interlocked executive support routine, such as [InterlockedDecrement](https://docs.microsoft.com/windows-hardware/drivers/ddi/content/wdm/nf-wdm-interlockeddecrement), to access a local variable.
 
  Although drivers are permitted to pass the address of a local variable to another function, and then use an interlocked function to operate on that variable, it's important to verify that the stack will not be swapped out to disk unexpectedly and that the variable has the correct life time across all threads that might use it.
 

docs/code-quality/c28125.md

@@ -18,7 +18,7 @@ ms.workload:
 # C28125
 warning C28125: The function must be called from within a try/except block
 
- The driver is calling a function that must be called from within a try/except block, such as [ProbeForRead](http://msdn.microsoft.com/library/windows/hardware/ff559876.aspx), [ProbeForWrite](http://msdn.microsoft.com/library/windows/hardware/ff559879.aspx), [MmProbeAndLockPages](http://msdn.microsoft.com/library/windows/hardware/ff554664.aspx).
+ The driver is calling a function that must be called from within a try/except block, such as [ProbeForRead](https://docs.microsoft.com/windows-hardware/drivers/ddi/content/wdm/nf-wdm-probeforread), [ProbeForWrite](https://docs.microsoft.com/windows-hardware/drivers/ddi/content/wdm/nf-wdm-probeforwrite), [MmProbeAndLockPages](https://docs.microsoft.com/windows-hardware/drivers/ddi/content/wdm/nf-wdm-mmprobeandlockpages).
 
 ## Example
  The following code example generates this warning:

docs/code-quality/c28137.md

@@ -21,7 +21,7 @@ warning C28137: The variable argument should instead be a (literal) constant
  This warning is reported when a function call is missing a required (literal) constant. Consult the documentation for the function.
 
 ## Example
- For example, the [ExAcquireResourceExclusiveLite](http://msdn.microsoft.com/library/windows/hardware/ff544351.aspx) routine requires a value of TRUE or FALSE for the `Wait` parameter. The following example code generates this warning:
+ For example, the [ExAcquireResourceExclusiveLite](https://docs.microsoft.com/windows-hardware/drivers/ddi/content/wdm/nf-wdm-exacquireresourceexclusivelite) routine requires a value of TRUE or FALSE for the `Wait` parameter. The following example code generates this warning:
 
 ```
 ExAcquireResourceExclusiveLite(Resource, Wait);

docs/code-quality/c6029.md

@@ -23,7 +23,7 @@ warning C6029: possible buffer overrun in call to \<function>: use of unchecked
  Generally, whenever you read data from an untrusted external source, make sure to verify it for validity. It is usually appropriate to verify the size to make sure it is in the expected range.
 
 ## Example
- The following code generates this warning by calling the annotated function [ReadFile](http://msdn2.microsoft.com/library/aa365467.aspx) two times. After the first call, the Post attribute property marks the second parameter value untrusted. Therefore, passing an untrusted value in the second call to `ReadFile` generates this warning as shown in the following code:
+ The following code generates this warning by calling the annotated function [ReadFile](https://docs.microsoft.com/windows/desktop/api/fileapi/nf-fileapi-readfile) two times. After the first call, the Post attribute property marks the second parameter value untrusted. Therefore, passing an untrusted value in the second call to `ReadFile` generates this warning as shown in the following code:
 
  \#include "windows.h"