fixed conflict

Author: Mikejo5000

.openpublishing.redirection.json

@@ -154,6 +154,186 @@
             "source_path": "docs/create-packages/publish-a-package.md",
             "redirect_url": "/nuget/nuget-org/publish-a-package",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/package-manager-ui.md",
+            "redirect_url": "/nuget/consume-packages/install-use-packages-visual-studio",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/package-manager-console.md",
+            "redirect_url": "/nuget/consume-packages/install-use-packages-powershell",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/dotnet-commands.md",
+            "redirect_url": "/nuget/reference/dotnet-commands",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/nuget-cli-reference.md",
+            "redirect_url": "/nuget/reference/nuget-cli-reference",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-add.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-add",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-config.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-delete.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-delete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-environment-variables.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-environment-variables",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-help.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-help",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-init.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-init",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-install.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-install",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-list.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-list",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-locals.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-locals",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-long-path.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-long-path",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-mirror.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-mirror",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-pack.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-pack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-push.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-push",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-restore.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-restore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-setapikey.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-setapikey",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-sign.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-sign",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-sources.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-sources",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-spec.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-spec",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-trusted-signers.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-trusted-signers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-update.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-update",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/cli-ref-verify.md",
+            "redirect_url": "/nuget/reference/cli-reference/cli-ref-verify",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/powershell-reference.md",
+            "redirect_url": "/nuget/reference/powershell-reference",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-add-bindingredirect.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-add-bindingredirect",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-find-package.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-find-package",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-get-package.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-get-package",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-get-project.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-get-project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-install-package.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-install-package",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-open-packagepage.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-open-packagepage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-register-tab-expansion.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-register-tabexpansion",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-sync-package.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-sync-package",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-uninstall-package.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-uninstall-package",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/tools/ps-ref-update-package.md",
+            "redirect_url": "/nuget/reference/ps-reference/ps-ref-update-package",
+            "redirect_document_id": false
         }
     ]
 }

docs/TOC.md

@@ -11,11 +11,11 @@
 ## [Overview and workflow](consume-packages/overview-and-workflow.md)
 ## [Find and choose packages](consume-packages/finding-and-choosing-packages.md)
 ## Install and manage packages
-### [Visual Studio](tools/package-manager-ui.md)
+### [Visual Studio](consume-packages/install-use-packages-visual-studio.md)
 ### [Visual Studio for Mac](/visualstudio/mac/nuget-walkthrough?toc=/nuget/toc.json)
 ### [dotnet CLI](consume-packages/install-use-packages-dotnet-cli.md)
 ### [nuget.exe CLI](consume-packages/install-use-packages-nuget-cli.md)
-### [PowerShell](tools/package-manager-console.md)
+### [PowerShell](consume-packages/install-use-packages-powershell.md)
 ## Configure NuGet
 ### Package restore options
 #### [Restore options](consume-packages/package-restore.md)
@@ -68,39 +68,39 @@
 ## [.nuspec](reference/nuspec.md)
 ## [nuget.config file](reference/nuget-config-file.md)
 ## [Target frameworks](reference/target-frameworks.md)
-## [dotnet CLI](tools/dotnet-Commands.md)
-## [nuget.exe CLI reference](tools/nuget-exe-cli-reference.md)
-### [add](tools/cli-ref-add.md)
-### [config](tools/cli-ref-config.md)
-### [delete](tools/cli-ref-delete.md)
-### [help or ?](tools/cli-ref-help.md)
-### [init](tools/cli-ref-init.md)
-### [install](tools/cli-ref-install.md)
-### [list](tools/cli-ref-list.md)
-### [locals](tools/cli-ref-locals.md)
-### [mirror](tools/cli-ref-mirror.md)
-### [pack](tools/cli-ref-pack.md)
-### [push](tools/cli-ref-push.md)
-### [restore](tools/cli-ref-restore.md)
-### [setapikey](tools/cli-ref-setapikey.md)
-### [sign](tools/cli-ref-sign.md)
-### [sources](tools/cli-ref-sources.md)
-### [spec](tools/cli-ref-spec.md)
-### [update](tools/cli-ref-update.md)
-### [verify](tools/cli-ref-verify.md)
-### [trusted-signers](tools/cli-ref-trusted-signers.md)
-### [Environment variables](tools/cli-ref-environment-variables.md)
-### [Long path support](tools/cli-ref-long-path.md)
-## [PowerShell reference](tools/powershell-reference.md)
-### [Add-BindingRedirect](tools/ps-ref-add-bindingredirect.md)
-### [Find-Package](tools/ps-ref-find-package.md)
-### [Get-Package](tools/ps-ref-get-package.md)
-### [Get-Project](tools/ps-ref-get-project.md)
-### [Install-Package](tools/ps-ref-install-package.md)
-### [Open-PackagePage](tools/ps-ref-open-packagepage.md)
-### [Sync-Package](tools/ps-ref-sync-package.md)
-### [Uninstall-Package](tools/ps-ref-uninstall-package.md)
-### [Update-Package](tools/ps-ref-update-package.md)
+## [dotnet CLI](reference/dotnet-Commands.md)
+## [nuget.exe CLI reference](reference/nuget-exe-cli-reference.md)
+### [add](reference/cli-reference/cli-ref-add.md)
+### [config](reference/cli-reference/cli-ref-config.md)
+### [delete](reference/cli-reference/cli-ref-delete.md)
+### [help or ?](reference/cli-reference/cli-ref-help.md)
+### [init](reference/cli-reference/cli-ref-init.md)
+### [install](reference/cli-reference/cli-ref-install.md)
+### [list](reference/cli-reference/cli-ref-list.md)
+### [locals](reference/cli-reference/cli-ref-locals.md)
+### [mirror](reference/cli-reference/cli-ref-mirror.md)
+### [pack](reference/cli-reference/cli-ref-pack.md)
+### [push](reference/cli-reference/cli-ref-push.md)
+### [restore](reference/cli-reference/cli-ref-restore.md)
+### [setapikey](reference/cli-reference/cli-ref-setapikey.md)
+### [sign](reference/cli-reference/cli-ref-sign.md)
+### [sources](reference/cli-reference/cli-ref-sources.md)
+### [spec](reference/cli-reference/cli-ref-spec.md)
+### [update](reference/cli-reference/cli-ref-update.md)
+### [verify](reference/cli-reference/cli-ref-verify.md)
+### [trusted-signers](reference/cli-reference/cli-ref-trusted-signers.md)
+### [Environment variables](reference/cli-reference/cli-ref-environment-variables.md)
+### [Long path support](reference/cli-reference/cli-ref-long-path.md)
+## [PowerShell reference](reference/powershell-reference.md)
+### [Add-BindingRedirect](reference/ps-reference/ps-ref-add-bindingredirect.md)
+### [Find-Package](reference/ps-reference/ps-ref-find-package.md)
+### [Get-Package](reference/ps-reference/ps-ref-get-package.md)
+### [Get-Project](reference/ps-reference/ps-ref-get-project.md)
+### [Install-Package](reference/ps-reference/ps-ref-install-package.md)
+### [Open-PackagePage](reference/ps-reference/ps-ref-open-packagepage.md)
+### [Sync-Package](reference/ps-reference/ps-ref-sync-package.md)
+### [Uninstall-Package](reference/ps-reference/ps-ref-uninstall-package.md)
+### [Update-Package](reference/ps-reference/ps-ref-update-package.md)
 ## NuGet API
 ### [Overview](api/overview.md)
 ### Resources

docs/api/overview.md

@@ -14,7 +14,7 @@ The NuGet API is a set of HTTP endpoints that can be used to download packages,
 and perform most other operations available in the official NuGet clients.
 
 This API is used by the NuGet client in Visual Studio, nuget.exe, and the .NET CLI to perform NuGet operations such as
-[`dotnet restore`](/dotnet/core/tools/dotnet-restore?tabs=netcore2x), search in the Visual Studio UI, and [`nuget.exe push`](../tools/cli-ref-push.md).
+[`dotnet restore`](/dotnet/core/tools/dotnet-restore?tabs=netcore2x), search in the Visual Studio UI, and [`nuget.exe push`](../reference/cli-reference/cli-ref-push.md).
 
 Note in some cases, nuget.org has additional requirements that are not enforced by other package sources. These differences are documented by the [nuget.org Protocols](nuget-protocols.md).
 

docs/archive/project-json-archive.md

@@ -137,7 +137,7 @@ The `<contentFiles>` element is used instead of `<files>` with `project.json`.
 
 ### Package manager options control
 
-*Originally in [Package Manager UI reference](../tools/package-manager-ui.md).*
+*Originally in [Package Manager UI reference](../consume-packages/install-use-packages-visual-studio.md).*
 
 Projects using `project.json` management format show only the **Show preview window** option.
 

docs/consume-packages/Finding-and-Choosing-Packages.md

@@ -35,7 +35,7 @@ Some packages list their supported frameworks directly in the nuget.org gallery,
 
 Fortunately, you can determine supported frameworks through two other means:
 
-1. Attempt to install a package into a project using the [`Install-Package`](../tools/ps-ref-install-package.md) command in the NuGet Package Manager Console. If the package is incompatible, this command shows you the package's supported frameworks.
+1. Attempt to install a package into a project using the [`Install-Package`](../reference/ps-reference/ps-ref-install-package.md) command in the NuGet Package Manager Console. If the package is incompatible, this command shows you the package's supported frameworks.
 
 1. Download the package from its page on nuget.org using the **Manual download** link under **Info**. Change the extension from `.nupkg` to `.zip`, and open the file to examine the content of its `lib` folder. There you see subfolders for each of the supported frameworks, where each subfolder is named with a target framework moniker (TFM; see [Target Frameworks](../reference/target-frameworks.md)). If you see no subfolders under `lib` and only a single DLL, then you must attempt to install the package in your project to discover its compatibility.
 
@@ -53,9 +53,9 @@ In Visual Studio, and when using the NuGet and dotnet CLI tools, NuGet does not
 
     ![The Include prerelease checkbox in Visual Studio](media/Prerelease_02-CheckPrerelease.png)
 
-- **Package Manager Console**: Use the `-IncludePrerelease` switch with the `Find-Package`, `Get-Package`, `Install-Package`, `Sync-Package`, and `Update-Package` commands. Refer to the [PowerShell Reference](../tools/powershell-reference.md).
+- **Package Manager Console**: Use the `-IncludePrerelease` switch with the `Find-Package`, `Get-Package`, `Install-Package`, `Sync-Package`, and `Update-Package` commands. Refer to the [PowerShell Reference](../reference/powershell-reference.md).
 
-- **nuget.exe CLI**: Use the `-prerelease` switch with the `install`, `update`, `delete`, and `mirror` commands. Refer to the [NuGet CLI reference](../tools/nuget-exe-cli-reference.md)
+- **nuget.exe CLI**: Use the `-prerelease` switch with the `install`, `update`, `delete`, and `mirror` commands. Refer to the [NuGet CLI reference](../reference/nuget-exe-cli-reference.md)
 
 - **dotnet.exe CLI**: Specify the exact pre-release version using the `-v` argument. Refer to the [dotnet add package reference](/dotnet/core/tools/dotnet-add-package).