Merge branch 'master' into gewarren-datatoolsfixes

Author: gewarren

docs/data-tools/how-to-save-and-edit-connection-strings.md

@@ -23,21 +23,20 @@ Connection strings in Visual Studio applications can be saved in the application
 Storing sensitive information (such as the password) within the connection string can affect the security of your application. Connection strings saved to the application configuration file are not encrypted or obfuscated, so it may be possible for someone to access the file and view its contents. Using Windows Integrated Security is a more secure way to control access to a database.
 
 If you do not choose to use Windows integrated security and your database requires a user name and password, you can omit them from the connection string, but your application will need to provide this information to successfully connect to the database. For example, you can create a dialog box that prompts the user for this information and dynamically builds the connection string at run time. Security can still be an issue if the information is intercepted on the way to the database. 
-For more information, see [Protecting Connection Information](https://msdn.microsoft.com/library/89211k9b.aspx).
-dotnet/docs/blob/master/docs/framework/data/adonet/protecting-connection-information
+For more information, see [Protecting Connection Information](/dotnet/framework/data/adonet/protecting-connection-information).
 
-## To save a connection string from within the data wizards
-Select the option to save the connection on the Save connection string to the application configuration file page.
+## To save a connection string from within the Data Source Configuration Wizard
+In the **Data Source Configuration Wizard**, select the option to save the connection on the Save the Connection String to the Application Configuration File page.
 
 ## To save a connection string directly into application settings
-- In Solution Explorer double-click the My Project icon (Visual Basic) or Properties icon (C#) to open the Project Designer.
+- In Solution Explorer, double-click the My Project icon (Visual Basic) or Properties icon (C#) to open the Project Designer.
 - Select the Settings tab.
 - Enter a Name for the connection string. Refer to this name when accessing the connection string in code.
 - Set the Type to (Connection string).
 - Leave the Scope set to Application.
 - Type your connection string into the Value field, or click the ellipsis (...) button in the Value field to open the Connection Properties dialog box to build your connection string.  
 
-## Editing Connection Strings Stored in Application Settings
+## Editing connection strings stored in application settings
 You can modify connection information that is saved in application settings by using the Project Designer.  
 
 ### To edit a connection string stored in application settings
@@ -46,18 +45,18 @@ You can modify connection information that is saved in application settings by u
 - Locate the connection you want to edit and select the text in the Value field.
 - Edit the connection string in the Value field, or click the ellipsis (...) button in the Value field to edit your connection with the Connection Properties dialog box.  
 
-## Editing Hard-Coded Connection Strings in Datasets
-You can modify connection information that is saved in code by using the Creating and Editing Typed Datasets.  
+## Editing connection strings for datasets
+You can modify connection information for each TableAdapter in a dataset.  
 
-### To edit a connection string stored in a Dataset
+### To edit a connection string for a TableAdapter in a dataset
 - In Solution Explorer, double-click the dataset (.xsd file) that has the connection you want to edit.
 - Select the TableAdapter or query that has the connection you want to edit.
-- In the Properties window expand the DefaultConnection node.
-- To quickly modify the connection string, edit the ConnectionString property, or click the down arrow on the DefaultConnection property and choose New Connection.
+- In the Properties window, expand the Connection node.
+- To quickly modify the connection string, edit the ConnectionString property, or click the down arrow on the Connection property and choose New Connection.
 
 ## Security
 Storing sensitive information (such as a password) within the connection string can affect the security of your application. Using Windows integrated security is a more secure way to control access to a database.
-For more information, see Securing Connection Strings and ADO.NET Secure Coding Guidelines.
+For more information, see [Protecting Connection Information](/dotnet/framework/data/adonet/protecting-connection-information).
 
 ## See Also  
  [Visual Studio data tools for .NET](../data-tools/visual-studio-data-tools-for-dotnet.md)

docs/install/install-visual-studio.md

@@ -2,7 +2,7 @@
 title: "Install Visual Studio 2017 | Microsoft Docs"
 description: "Learn how to install Visual Studio, step-by-step."
 ms.custom: ""
-ms.date: "07/28/2017"
+ms.date: "08/25/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology:
@@ -29,10 +29,17 @@ Want to know more about what else is new in this version? See our [release notes
 
 Ready to install? We'll walk you through it, step-by-step.
 
-## Check system requirements
-Before you begin, check the [system requirements](https://www.visualstudio.com/productinfo/vs2017-system-requirements-vs) to make sure that your computer is ready to install Visual Studio 2017.
+## Step 1 - Make sure your computer is ready for Visual Studio
+Before you begin installing Visual Studio
 
-## Download Visual Studio
+1. Check the [system requirements](https://www.visualstudio.com/productinfo/vs2017-system-requirements-vs). This helps you know whether your computer supports Visual Studio 2017.
+2. Apply the latest Windows Updates. This ensures that your computer has both the latest security updates and the required system components for Visual Studio.
+3. Reboot. This ensures that any pending installs or updates don't hinder the Visual Studio install.
+4. Free up space. Remove unneeded files and applications from your %SystemDrive% by, for example, running the Disk Cleanup app.
+
+For questions about running previous versions of Visual Studio side-by-side with Visual Studio 2017, see the [Visual Studio compatibility details](https://www.visualstudio.com/productinfo/vs2017-compatibility-vs#compatibility-with-previous-releases).
+
+## Step 2 - Download Visual Studio
 Next, download the Visual Studio bootstrapper file. To do so, click the following button, select the edition of Visual Studio 2017 that you want, click **Save**, and then click **Open folder**.
 
  > [!div class="button"]
@@ -44,7 +51,7 @@ Next, download the Visual Studio bootstrapper file. To do so, click the followin
 |---------|---------|
 |  ![film icon for video](media/video-icon.png "Watch a video")  |    [Watch a video](https://mva.microsoft.com/en-US/training-courses-embed/getting-started-with-visual-studio-2017-17798/Download-the-Visual-Studio-Installer-GgrESHD6D_3311787171) on how to download the Visual Studio bootstrapper file and select the edition of Visual Studio that's right for you. |
 
-## Install the installer  
+## Step 3 - Install the Visual Studio installer  
 Then, run the bootstrapper file to install the Visual Studio Installer. This new lightweight installer includes everything you need to both install and customize Visual Studio 2017.
 
 1.  From your **Downloads** folder, double-click the bootstrapper that matches or is similar to one of the following files:
@@ -57,10 +64,11 @@ Then, run the bootstrapper file to install the Visual Studio Installer. This new
 
 2.  We'll ask you to acknowledge the Microsoft [License Terms](https://www.visualstudio.com/license-terms/) and the Microsoft [Privacy Statement](https://go.microsoft.com/fwlink/?LinkID=824704). Click **Continue**.  
 
-   ![License Terms and Privacy Statement](media/vs2017-privacy-and-license-terms.PNG "Microsoft License Terms and Privacy Statement")  
+   ![License Terms and Privacy Statement](media/vs2017-privacy-and-license-terms.PNG "Microsoft License Terms and Privacy Statement")
+
+## Step 4 - Select workloads
 
-## Install workloads  
- After the installer is installed, you can use it to customize your installation by selecting the feature sets—or workloads—that you want. Here's how.
+After the installer is installed, you can use it to customize your installation by selecting the feature sets—or workloads—that you want. Here's how.
 
 1.  Find the workload you want in the **Installing Visual Studio** screen.
 
@@ -78,17 +86,17 @@ Then, run the bootstrapper file to install the Visual Studio Installer. This new
 |---------|---------|
 |  ![film icon for video](media/video-icon.png "Watch a video")  |    [Watch a video](https://mva.microsoft.com/en-US/training-courses-embed/getting-started-with-visual-studio-2017-17798/Install-Workloads-in-Visual-Studio-2017-jHE19HD6D_1611787171) on how to install the Visual Studio Installer and then install a workload. |
 
-## Install individual components
+## Step 5 - Select individual components (Optional)
 
-If you don't want to use the handy Workloads feature to customize your Visual Studio installation, you can do so by installing individual components instead. To do this, click the **Individual components** option from the Visual Studio Installer, select what you want, and then follow the prompts.
+If you don't want to use the Workloads feature to customize your Visual Studio installation, you can do so by installing individual components instead. To do this, click the **Individual components** option from the Visual Studio Installer, select what you want, and then follow the prompts.
 
   ![Visual Studio 2017 - Install individual components](media/vs2017-components.PNG "Install Visual Studio individual components")
 
   |         |         |
   |---------|---------|
   |  ![film icon for video](media/video-icon.png "Watch a video")  |   [Watch a video](https://mva.microsoft.com/en-US/training-courses-embed/getting-started-with-visual-studio-2017-17798/Install-Components-in-Visual-Studio-2017-ZMfaVID6D_7411787171) on how to install an individual component by using the Visual Studio Installer. |
 
-## Install language packs
+## Step 6 - Install language packs (Optional)
 
 By default, the installer program tries to match the language of the operating system when it runs for the first time. To install Visual Studio 2017 in a language of your choosing, click the **Language packs** option from the Visual Studio Installer, and follow the prompts.
 
@@ -102,6 +110,10 @@ By default, the installer program tries to match the language of the operating s
 
 Another way that you can change the default language is by running the installer from the command line. For example, you can force the installer to run in English by using the following command: `vs_installer.exe --locale en-US`. The installer will remember this setting when it is run the next time. The installer supports the following language tokens: zh-cn, zh-tw, cs-cz, en-us, es-es, fr-fr, de-de, it-it, ja-jp, ko-kr, pl-pl, pt-br, ru-ru, and tr-tr.
 
+## Step 7 - Launch Visual Studio
+
+After Visual Studio installation is complete, click the **Launch** button to [Get Started Developing with Visual Studio](../ide/get-started-developing-with-visual-studio.md).
+
 ## Get support
 Sometimes, things can go wrong. If your Visual Studio installation fails, see the [Troubleshooting Visual Studio 2017 installation and upgrade issues](troubleshooting-installation-issues.md) page for troubleshooting tips.
 

docs/install/troubleshooting-installation-issues.md

@@ -1,7 +1,7 @@
 ---
 title: "Troubleshooting installation issues | Microsoft Docs"
 description: "Sometimes, things can go wrong. If your Visual Studio installation or upgrade fails, this page can help."
-ms.date: "04/14/2017"
+ms.date: "08/24/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology:
@@ -43,15 +43,15 @@ The Visual Studio Installer bootstrapper is a minimal light-weight executable th
 ### Step 4 - Report a problem
 In some situations, such as those related to corrupted files, the problems may have to be looked at on a case-by-case basis:
 
-1. Download the [Microsoft Visual Studio and the .NET Framework Log Collection Tool](https://aka.ms/vscollect), and then run it. This tool collects and compiles available setup logs for Visual Studio, .NET Framework, and SQL Server installations.
+1. Collect your setup logs. See [How to get the Visual Studio installation logs](#how-to-get-the-visual-studio-installation-logs) below for details.
 2. Open the Visual Studio Installer, and then click **Report a problem** to open the Visual Studio Feedback tool.
 ![You can tab to the Provide Feedback button to open the feedback tool](media/report-a-problem.png)
 3. Give your problem report a title, and provide relevant details. Click **Next** to go to the **Attachments** section, and then attach the generated log file (typically, the file is at %TEMP%\vslogs.zip).
 ![Tab to the Report New Problem button, then follow through the steps](media/problem-report-details.png)
 4. Click **Next** to review your problem report, and then click **Submit**.
 
 ### Step 5 - Run InstallCleanup.exe to clean up installation files
-As a last resort, you can run InstallCleanup.exe. InstallCleanup.exe is a utility that's packaged with the Visual Studio Installer, and it cleans up installation files. This isn't a full reinstall. This utility deletes cache and instance data for Visual Studio 2017.
+As a last resort, you can run InstallCleanup.exe. InstallCleanup.exe is a tool that's packaged with the Visual Studio Installer, and it cleans up installation files. This tool doesn't perform a full reinstall. This tool deletes cache and instance data for Visual Studio 2017.
 
 1. Close the Visual Studio Installer.
 2. Open an administrator command prompt. To do this, follow these steps:
@@ -62,7 +62,7 @@ As a last resort, you can run InstallCleanup.exe. InstallCleanup.exe is a utilit
    ```
    C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\layout\InstallCleanup.exe
    ```
-4. Rerun the bootstrapper that's described in Step 3.
+4. Rerun the bootstrapper that's described in [Step 3 - Delete the Visual Studio Installer directory to fix upgrade problems](#step-3--delete-the-visual-studio-installer-directory-to-fix-upgrade-problems).
 5. Try to install or update Visual Studio again.
 
 ## How to troubleshoot an offline installer
@@ -71,4 +71,19 @@ Here is a table of known issues and some workarounds when installing from a loca
 | Issue       | Item                   | Solution |
 | ----------- | ---------------------- | -------- |
 | Users do not have access to files. | permissions (ACLs) | Make sure that you adjust the permissions (ACLs) so that they grant Read access to other users  *before* you share the offline install. |
-| New workloads, components, or languages fail to install.  | `--layout`  | Make sure you have internet access if you install from a partial layout and select workloads, components, or languages that are not available in the earlier layout. |
+| New workloads, components, or languages fail to install.  | `--layout`  | Make sure that you have internet access if you install from a partial layout and select workloads, components, or languages that were not downloaded previously in that partial layout. |
+
+## How to get the Visual Studio installation logs
+Setup logs are needed to troubleshoot most installation issues. When you submit an issue by using [Report A Problem](../ide/how-to-report-a-problem-with-visual-studio-2017) in the Visual Studio Installer, these logs are automatically included in your report. 
+
+If you contact Microsoft Support, you may need to provide these setup logs by using the [Microsoft Visual Studio and .NET Framework Log Collection Tool](https://aka.ms/vscollect). The log collection tool collects setup logs from all components installed by Visual Studio 2017, including .NET Framework, Windows SDK, and SQL Server. It also collects computer information, a Windows Installer inventory, and Windows event log information for Visual Studio Installer, Windows Installer, and System Restore. 
+
+To collect the logs
+
+1. [Download the tool](https://aka.ms/vscollect).
+2. Open an administrative command prompt.
+3. Run Collect.exe from the directory where you saved the tool.
+4. Find the resulting Vslogs.zip file in your %TEMP% directory, for example, C:\Users\YourName\AppData\Local\Temp\vslogs.zip.
+
+> [!NOTE]
+> The tool must be run under the same user account that the failed installation was run under. If you are running the tool from a different user account, set the –user:\<name\> option to specify the user account under which the failed installation was run. Run `Collect.exe -?` from an administrator command prompt for additional options and usage information.

docs/install/uninstall-visual-studio.md

@@ -2,7 +2,7 @@
 title: "Uninstall Visual Studio 2017 | Microsoft Docs"
 description: "Learn how to uninstall Visual Studio, step-by-step."
 ms.custom: ""
-ms.date: "03/27/2017"
+ms.date: "08/16/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology:
@@ -41,12 +41,11 @@ This page walks you through uninstalling Visual Studio, our integrated suite of
 If you change your mind later and want to reinstall Visual Studio 2017, start the Visual Studio Installer again, and then select **Install** from the selection screen.
 
 ## Uninstall Visual Studio Installer
-To completely remove Visual Studio 2017 and the Visual Studio Installer from your machine, uninstall it from Apps & Features.
+To completely remove all installations of Visual Studio 2017 as well as the Visual Studio Installer from your machine, uninstall it from Apps & Features.
 1. Open Apps & Features. For example, in Windows 10, select **Start**, and in the search bar, type **Apps and Features**.  
 2. Find **Microsoft Visual Studio 2017**.  
 3. Click **Uninstall**.  
 
-This removes all installations of Visual Studio 2017 on your machine as well as the Visual Studio Installer.
 
 ## See also  
 * [Install Visual Studio](install-visual-studio.md)

mac/TOC.md

@@ -12,7 +12,6 @@
 
 # [Customizing the IDE](customizing-the-ide.md)
 ## [Extending Visual Studio for Mac](extending-visual-studio-mac.md)
-### [Extending Visual Studio for Mac Walkthrough](extending-visual-studio-mac-walkthrough.md)
 
 
 # [Projects and Solutions](projects-and-solutions.md)
@@ -55,5 +54,7 @@
 ### [Setup](setup-vsmac-tools-unity.md)
 ### [Using Unity Tools](using-vsmac-tools-unity.md)
 
+# [Accessibility](accessibility.md)
+
 # [Troubleshooting](troubleshooting.md)
 ## [Report a Problem](report-a-problem.md)