Merge branch 'master' into kraigb

Kraig Brockschmidt · web-flow · commit 1681deac0cfb · 2018-01-24T10:09:07.000-08:00
diff --git a/docs/API/package-publish-resource.md b/docs/API/package-publish-resource.md
@@ -133,5 +133,5 @@ X-NuGet-ApiKey | Header | string | yes      | For example, `X-NuGet-ApiKey: {USE
 
 Status Code | Meaning
 ----------- | -------
-204         | The package is now listed
+200         | The package is now listed
 404         | No package with the provided `ID` and `VERSION` exists
diff --git a/docs/Consume-Packages/Configuring-NuGet-Behavior.md b/docs/Consume-Packages/Configuring-NuGet-Behavior.md
@@ -22,13 +22,13 @@ NuGet's behavior is driven by the accumulated settings in one or more `NuGet.Con
 
 | 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
 
diff --git a/docs/Consume-Packages/Dependency-Resolution.md b/docs/Consume-Packages/Dependency-Resolution.md
@@ -18,9 +18,9 @@ ms.reviewer:
 
 Any time a package is installed or reinstalled, which includes being installed as part of a [restore](../consume-packages/package-restore.md) process, NuGet also installs any additional packages on which that first package depends.
 
-Those immediate dependencies might then also have dependencies on their own, which can continue to an arbitrary depth. This produces what's called a *dependency graph* that describes the relationships between packages are all levels.
+Those immediate dependencies might then also have dependencies on their own, which can continue to an arbitrary depth. This produces what's called a *dependency graph* that describes the relationships between packages at all levels.
 
-When multiple packages have the same dependency, then the same package ID can appear in the graph multiple times, potentially with different version constraints. However, only one version of a given package can be used in a project, so NuGet must choose which version is be used. The exact process depends on the package reference format being used.
+When multiple packages have the same dependency, then the same package ID can appear in the graph multiple times, potentially with different version constraints. However, only one version of a given package can be used in a project, so NuGet must choose which version is used. The exact process depends on the package reference format being used.
 
 ## Dependency resolution with PackageReference
 
diff --git a/docs/Create-Packages/Creating-a-Package.md b/docs/Create-Packages/Creating-a-Package.md
@@ -136,7 +136,7 @@ nuget locals -list global-packages
 Go into any *package\version* folder, copy the `.nupkg` file to a `.zip` file, then open that `.zip` file and examine the `.nuspec` within it.
 
 > [!Note]
-> When creating a `.nuspec` from a Visual Studio project, the manifest contains tokens that are be replaced with information from the project when the package is built. See [Creating the .nuspec from a Visual Studio project](#from-a-visual-studio-project).
+> When creating a `.nuspec` from a Visual Studio project, the manifest contains tokens that are replaced with information from the project when the package is built. See [Creating the .nuspec from a Visual Studio project](#from-a-visual-studio-project).
 
 ## Creating the .nuspec file
 
diff --git a/docs/Policies/NuGet-FAQ.md b/docs/Policies/NuGet-FAQ.md
@@ -162,9 +162,9 @@ If a package does not specify the licensing terms, contact the package owner dir
 
 ## Managing packages on nuget.org
 
-**Can I edit package metadata after it's been uploaded? Why do you recommend editing the nuspec and uploading a new package for making changes to package metadata?**
+**Can I edit package metadata after it's been uploaded? Why do you require editing the nuspec and uploading a new package for making changes to package metadata?**
 
-NuGet will be implementing package signing. A design principle of package signing is that signed package content must be immutable, which includes the nuspec. Editing the package metadata results in changes to the nuspec, invalidating existing signatures. We recommend modifying existing workflows to not require editing the package metadata after the package has been created.
+NuGet requires all packages to be signed. A design principle of package signing is that signed package content must be immutable, which includes the nuspec. Editing the package metadata results in changes to the nuspec, invalidating existing signatures. We recommend modifying existing workflows to not require editing the package metadata after the package has been created.
 
 Note that dependencies listed for your package are generated automatically from the package itself and cannot be edited.
 
diff --git a/docs/Quickstart/Create-and-Publish-a-Package.md b/docs/Quickstart/Create-and-Publish-a-Package.md
@@ -109,14 +109,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:
 
diff --git a/docs/Quickstart/Use-a-Package.md b/docs/Quickstart/Use-a-Package.md
@@ -22,15 +22,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
 
diff --git a/docs/Reference/Errors-and-Warnings.md b/docs/Reference/Errors-and-Warnings.md
@@ -13,6 +13,37 @@ ms.reviewer:
 - anangaur
 - karann-msft
 - unniravindranathan
+
+f1_keywords:
+  - "NU1000"
+  - "NU1001"
+  - "NU1002"
+  - "NU1003"
+  - "NU1100"
+  - "NU1101"
+  - "NU1102"
+  - "NU1103"
+  - "NU1104"
+  - "NU1105"
+  - "NU1106"
+  - "NU1107"
+  - "NU1108"
+  - "NU1201"
+  - "NU1202"
+  - "NU1203"
+  - "NU1401"
+  - "NU1500"
+  - "NU1501"
+  - "NU1502"
+  - "NU1503"
+  - "NU1601"
+  - "NU1602"
+  - "NU1603"
+  - "NU1604"
+  - "NU1605"
+  - "NU1608"
+  - "NU1701"
+  - "NU1801"
 ---
 
 # Errors and warnings
@@ -128,7 +159,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)
 
@@ -258,8 +289,6 @@ The errors and warnings listed here are available only with [PackageReference-ba
 
 ## Resolver conflict warnings
 
-[NU1608](#nu1608)
-
 ### NU1608
 
 | | |
@@ -270,8 +299,6 @@ The errors and warnings listed here are available only with [PackageReference-ba
 
 ## Package fallback warnings
 
-[NU1701](#nu1701)
-
 ### NU1701
 
 | | |
@@ -282,8 +309,6 @@ The errors and warnings listed here are available only with [PackageReference-ba
 
 ## Feed warnings
 
-[NU1801](#nu1801)
-
 ### NU1801
 
 | | |
diff --git a/docs/Reference/Package-Versioning.md b/docs/Reference/Package-Versioning.md
@@ -87,7 +87,8 @@ For nuget.org, a package is defined as a SemVer v2.0.0 package if either of the
 If you upload a SemVer v2.0.0-specific package to nuget.org, the package is invisible to older clients and available to only the following NuGet clients:
 
 - NuGet 4.3.0+
-- Visual Studio 2017 version 15.3+ 
+- Visual Studio 2017 version 15.3+
+- Visual Studio 2015 with [NuGet VSIX v3.6.0](https://dist.nuget.org/visualstudio-2015-vsix/latest/NuGet.Tools.vsix)
 - dotnet.exe (.NET SDK 2.0.0+)
 
 Third-party clients:
diff --git a/docs/Schema/nuspec.md b/docs/Schema/nuspec.md
@@ -80,7 +80,7 @@ These elements must appear within a `<metadata>` element.
 
 ### Optional metadata elements
 
-These elements must appear within a `<metadata>` element.
+These elements may appear within a `<metadata>` element.
 
 #### Single elements
 
@@ -540,7 +540,7 @@ These files are specified with a set of attributes that describe how they should
 | **exclude** | A semicolon-delimited list of files or file patterns to exclude from the `src` location. The wildcard character `*` is allowed, and the double wildcard `**` implies a recursive folder search. |
 | **buildAction** | The build action to assign to the content item for MSBuild, such as `Content`, `None`, `Embedded Resource`, `Compile`, etc. The default is `Compile`. |
 | **copyToOutput** | A Boolean indicating whether to copy content items to the build output folder. The default is false. |
-| **flatten** | A Boolean indicating whether to copy content items to a single folder in the build output (true), or to preserve the folder structure in the package (false). The default is false. |
+| **flatten** | A Boolean indicating whether to copy content items to a single folder in the build output (true), or to preserve the folder structure in the package (false). This flag only works when copyToOutput flag is set to true. The default is false. |
 
 When installing a package, NuGet applies the child elements of `<contentFiles>` from top to bottom. If multiple entries match the same file then all entries are applied. The top-most entry overrides the lower entries if there is a conflict for the same attribute.
 
diff --git a/docs/Tools/Package-Manager-Console.md b/docs/Tools/Package-Manager-Console.md
@@ -9,6 +9,8 @@ ms.date: 01/23/2018
 ms.topic: article
 ms.prod: nuget
 ms.technology: null
+f1_keywords: 
+  - "vs.nuget.packagemanager.console"
 description: Instructions for using the NuGet Package Manager Console in Visual Studio for working with packages.
 keywords: NuGet package manager console, NuGet powershell, managing NuGet packages
 ms.reviewer:
diff --git a/docs/Tools/Package-Manager-UI.md b/docs/Tools/Package-Manager-UI.md
@@ -11,6 +11,7 @@ f1_keywords:
   - "vs.toolsoptionspages.nuget_package_manager"
   - "vs.toolsoptionspages.nuget_package_manager.general"
   - "vs.toolsoptionspages.nuget_package_manager.package_sources"
+  - "vs.nuget.packagemanager.ui"
 description: Instructions for using the NuGet Package Manager UI in Visual Studio for working with NuGet packages.
 keywords: NuGet UI, NuGet package manager UI, NuGet in Visual Studio, managing NuGet packages, NuGet user interface, package manager in Visual Studio
 ms.reviewer:
@@ -34,7 +35,7 @@ In this topic:
 > [!Note]
 > If you're missing the NuGet Package Manager in Visual Studio 2015, check **Tools > Extensions and Updates...** and search for the *NuGet Package Manager* extension. If you're unable to use the extensions installer in Visual Studio, download the extension directly from [https://dist.nuget.org/index.html](https://dist.nuget.org/index.html).
 >
-> In Visual Studio 2017, NuGet and the NuGet Package Manager are automatically installed with any .NET-related workloads. Install it individuall by selecting the **Individual components > Code tools > NuGet package manager** option in the Visual Studio 2017 installer.
+> In Visual Studio 2017, NuGet and the NuGet Package Manager are automatically installed with any .NET-related workloads. Install it individually by selecting the **Individual components > Code tools > NuGet package manager** option in the Visual Studio 2017 installer.
 
 ## Finding and installing a package
 
diff --git a/docs/Tools/cli-ref-pack.md b/docs/Tools/cli-ref-pack.md
@@ -37,7 +37,7 @@ where `<nuspecPath>` and `<projectPath>` specify the `.nuspec` or project file,
 | --- | --- |
 | BasePath | Sets the base path of the files defined in the `.nuspec` file. |
 | Build | Specifies that the project should be built before building the package. |
-| Exclude | Specifies one or more wildcard patterns to exclude when creating a package. |
+| Exclude | Specifies one or more wildcard patterns to exclude when creating a package. To specify more than one pattern, repeat the -Exclude flag. See example below. |
 | ExcludeEmptyDirectories | Prevents inclusion of empty directories when building the package. |
 | ForceEnglishOutput | *(3.5+)* Forces nuget.exe to run using an invariant, English-based culture. |
 | Help | Displays help information for the command. |
@@ -94,5 +94,7 @@ nuget pack foo.csproj -Build -Symbols -Properties owners=janedoe,xiaop;version="
 
 nuget pack foo.nuspec -Version 2.1.0
 
-nuget pack foo.nuspec -Version 1.0.0 -MinClientVersion 3.2
+nuget pack foo.nuspec -Version 1.0.0 -MinClientVersion 2.5
+
+nuget pack Package.nuspec -exclude "*.exe" -exclude "*.bat"
 ```
diff --git a/docs/Tools/ps-ref-install-package.md b/docs/Tools/ps-ref-install-package.md
@@ -69,10 +69,10 @@ Install-Package Glimpse -Version 1.0.0 -Project MvcApplication1
 # Installs Ninject.Mvc3 but not its dependencies from c:\temp\packages
 Install-Package Ninject.Mvc3 -IgnoreDependencies -Source c:\temp\packages
 
-# Installs the package listed on the online packages.config into the current project.
+# Installs the package listed on the online packages.config into the current project
 Install-package https://raw.githubusercontent.com/json-ld.net/master/src/JsonLD/packages.config
 
-# Installs jquery 1.10.2 package, using the .nupkg file under local path of c:\temp\packages.
+# Installs jquery 1.10.2 package, using the .nupkg file under local path of c:\temp\packages
 Install-package c:\temp\packages\jQuery.1.10.2.nupkg
 
 # Installs the specific online package
diff --git a/docs/includes/install-methods.md b/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) |
