Merge pull request NuGet#666 from NuGet/live

Sync master with live

Author: Kraig Brockschmidt

docs/Consume-Packages/Configuring-NuGet-Behavior.md

@@ -32,17 +32,17 @@ In this topic:
 - [How settings are applied](#how-settings-are-applied)
 - [NuGetDefaults.Config file](#nuget-defaults-file)
 
-## Config file locations and uses
+## NuGet.Config file locations and uses
 
 | Scope | NuGet.Config file location | Description |
 | --- | --- | --- |
-| Project | Project folder or any folder up to the drive root | In a project folder, settings apply only to that project. In parent folders that contain multiple projects subfolders, settings apply to all projects in those subfolders. |
-| User | Windows: %APPDATA%\NuGet\NuGet.Config<br/>Mac/Linux: ~/.nuget/NuGet.Config | Settings apply to all operations, but are overridden by any project-level settings. When using CLI commands, you can specify a different config file using the `-configFile` switch to ignore any settings in the default user-level file. |
+| Project | Current folder (aka Project folder) or any folder up to the drive root.| In a project folder, settings apply only to that project. In parent folders that contain multiple projects subfolders, settings apply to all projects in those subfolders. |
+| User | Windows: %APPDATA%\NuGet\NuGet.Config<br/>Mac/Linux: ~/.nuget/NuGet.Config | Settings apply to all operations, but are overridden by any project-level settings. |
 | Computer | Windows: %ProgramFiles(x86)%\NuGet\Config<br/>Mac/Linux: $XDG_DATA_HOME (typically ~/.local/share) | Settings apply to all operations on the computer, but are overriden by any user- or project-level settings. |
 
 Notes for earlier versions of NuGet:
 - NuGet 3.3 and earlier used a `.nuget` folder for solution-wide settings. This file not used in NuGet 3.4+.
-- For NuGet 2.6 to 3.x, the computer-level config file on Windows was located in %ProgramData%\NuGet\Config[\\{IDE}[\\{Version}[\\{SKU}]]]\NuGet.Config, where *{IDE}* can be *VisualStudio*, *{Version}* was the Visual Studio version such as *14.0*, and *{SKU}* is either *Community*, *Pro*, or *Enterprise*. To migrate settings to NuGet 4.0+, simply copy the config file to %ProgramFiles(x86)%\NuGet\Config. On Linus, this previous location was /etc/opt, and on Mac, /Library/Application Support.
+- For NuGet 2.6 to 3.x, the computer-level config file on Windows was located in %ProgramData%\NuGet\Config[\\{IDE}[\\{Version}[\\{SKU}]]]\NuGet.Config, where *{IDE}* can be *VisualStudio*, *{Version}* was the Visual Studio version such as *14.0*, and *{SKU}* is either *Community*, *Pro*, or *Enterprise*. To migrate settings to NuGet 4.0+, simply copy the config file to %ProgramFiles(x86)%\NuGet\Config. On Linux, this previous location was /etc/opt, and on Mac, /Library/Application Support.
 
 ## Changing config settings
 

docs/Quickstart/Create-and-Publish-a-Package.md

@@ -121,14 +121,14 @@ Once you have a `.nupkg` file, you publish it to nuget.org using the `push` comm
 
 1. Once logged in, select your user name (on the upper right), then select **API Keys**.
 
-1. Select **Create**, provide a name for your key, select **Select Scopes > Push**Under **API Key**, enter * for **Glob pattern**, then select **Create**.
+1. Select **Create**, provide a name for your key, select **Select Scopes > Push** under **API Key**, enter * for **Glob pattern**, then select **Create**.
 
 1. Once the key is created, select **Copy** to retrieve the access key you'll need in the CLI:
 
     ![Copying the API key to the clipboard](media/QS_Create-02-APIKey.png)
 
     > [!Warning]
-    > Save your key in a secure location and keep is a secret. If your key is accidentally revealed, you can always regenerate it at any time. You can also remove the API key if you no longer want to push packages via the CLI.
+    > Save your key in a secure location and keep it secret. If your key is accidentally revealed, you can regenerate it at any time. You can also remove the API key if you no longer want to push packages via the CLI.
 
 1. At a command prompt, run the following command, specifying your package name and replacing the key with the value copied in step 4:
 

docs/Quickstart/Use-a-Package.md

@@ -23,15 +23,15 @@ NuGet packages are units of reusable code that other developers make available t
 
 Once installed, refer to the package in code with `using <namespace>` where \<namespace\> is specific to the package you're using. Once the reference is made, you can call the package through its API.
 
-The remainder of this topic walks through the process of using the Package Manager UI to install the popular [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/) package in a Universal Windows Platform (UWP) project. It then shows an example of using the package. You use a similar same workflow for virtually every NuGet package you use in a project.
+The remainder of this topic walks through the process of using the Package Manager UI to install the popular [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/) package in a Universal Windows Platform (UWP) project. It then shows an example of using the package. You use a similar workflow for other NuGet packages.
 
 - [Install pre-requisites](#install-pre-requisites)
 - [Create a project](#create-a-project)
 - [Add the Newtonsoft.Json NuGet package](#add-the-newtonsoftjson-nuget-package)
 - [Use the Newtonsoft.Json API in the app](#use-the-newtonsoftjson-api-in-the-app)
 
 > [!Tip]
-> **Start with nuget.org**: Installing packages from nuget.org is a common workflow that .NET developers use to find components they can reuse in their own applications. You can always search nuget.org directly or find and install packages within Visual Studio as shown in this topic.
+> **Start with nuget.org**: Installing packages from nuget.org is a common workflow that .NET developers use to find components they can use in their own applications. You can always search nuget.org directly or find and install packages within Visual Studio as shown in this topic.
 
 ## Install pre-requisites
 

docs/Reference/Errors-and-Warnings.md

@@ -131,7 +131,7 @@ The errors and warnings listed here are available only with [PackageReference-ba
 | **Common causes** | Packages contain dependency on exact versions of a package instead of open-ended ranges. |
 | **Example message** | *Unable to satisfy conflicting requests for {id}: {conflict path} Framework: {target graph}* |
 
-<a name="NU1107></a>
+<a name="NU1107"></a> 
 
 ### NU1107 (Previously NU1607)
 
@@ -141,7 +141,7 @@ The errors and warnings listed here are available only with [PackageReference-ba
 | **Common causes** | Packages with dependency constraints on exact versions do not allow other packages to increase the version if needed. |
 | **Example message** | *Version conflict detected for NuGet.Versioning. Reference the package directly from the project to resolve this issue.<br/>  NuGet.Packaging 3.5.0 -> NuGet.Versioning (= 3.5.0)<br/>  NuGet.Configuration 4.0.0 -> NuGet.Versioning (= 4.0.0)* |
 
-<a name="NU1108></a>
+<a name="NU1108"></a>
 
 ### NU1108 (Previously NU1606)
 
@@ -261,8 +261,6 @@ The errors and warnings listed here are available only with [PackageReference-ba
 
 ## Resolver conflict warnings
 
-[NU1608](#nu1608)
-
 ### NU1608
 
 | | |
@@ -273,8 +271,6 @@ The errors and warnings listed here are available only with [PackageReference-ba
 
 ## Package fallback warnings
 
-[NU1701](#nu1701)
-
 ### NU1701
 
 | | |
@@ -285,8 +281,6 @@ The errors and warnings listed here are available only with [PackageReference-ba
 
 ## Feed warnings
 
-[NU1801](#nu1801)
-
 ### NU1801
 
 | | |

docs/Release-Notes/NuGet-4.0-RTM.md

@@ -60,7 +60,7 @@ There is no workaround at this time.
 #### Issue:
 NuGet Package Manager does not display and does not allow add/update of DotNetCLITools. [NuGet#4256](https://github.com/NuGet/Home/issues/4256)
 
-* #### Workaround:
+#### Workaround:
 DotNetCLIToolReferences must be manually edited in your project file.
 
 ### NuGet restore will fail when you set PackageId property for projects
@@ -374,4 +374,3 @@ There is no workaround at this time.
 [Issues list 3](https://github.com/NuGet/Home/issues?q=is%3Aissue+is%3Aclosed+milestone%3A%224.0 RC3")  
 [Issues list 4](https://github.com/NuGet/Home/issues?q=is%3Aissue+is%3Aclosed+milestone%3A%224.0 RC2")  
 [Issues list 5](https://github.com/NuGet/Home/issues?q=is%3Aissue+is%3Aclosed+milestone%3A%224.0 RC")
-

docs/includes/install-methods.md

@@ -1,7 +1,7 @@
-Installing a package happens in three ways:
+You can install a NuGet package in three different ways:
 
 | Method | Description | Reference |
 | --- | --- | --- |
 | nuget.exe CLI: `nuget install <package_name>` | Downloads the package identified by \<package_name\> and expands its contents into a folder in the current directory. If no packages are specified, installs all packages listed in the project's `packages.config` file. No changes are made to any project files. Dependencies are also downloaded and expanded. | [CLI reference](../tools/nuget-exe-CLI-Reference.md) |
 | Package Manager Console (Visual Studio): `Install-Package <package_name>` | Downloads and installs the package into the current project, then update the project file to list the package as a dependency. | [Package Manager Console Guide](../tools/Package-Manager-Console.md) |
-| Package Manager UI (Visual Studio) | Provides a UI through which you can browse, select, and install packages into a project. Updates the project file to list the package as a dependency. | [Package Manager UI Reference](../tools/Package-Manager-UI.md) |
+| Package Manager UI (Visual Studio) | Provides a UI through which you can browse, select, and install packages into a project. Updates the project file to list the package as a dependency. | [Package Manager UI Reference](../tools/Package-Manager-UI.md) |