From 08ecde2928f8c89a2fdaa800ae845103750b9327 Mon Sep 17 00:00:00 2001 From: Kyle Mitchell Date: Fri, 17 Aug 2018 17:06:11 -0700 Subject: [PATCH] doc: Mention registry terms of use in manpage and registry doc (#54) * doc: Mention terms of use in npm-registry * doc: Mention registry terms of use in manpage * doc: Update terms of use language in README Credit: @kemitchell PR-URL: https://github.com/npm/cli/pull/54 --- README.md | 9 +++------ doc/cli/npm.md | 10 ++++++++++ doc/misc/npm-registry.md | 14 +++++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 22f046f1a85de..bb33879fd0118 100644 --- a/README.md +++ b/README.md @@ -16,17 +16,14 @@ Much more info will be available via `npm help` once it's installed. To install an old **and unsupported** version of npm that works on node v5 and prior, clone the git repo and dig through the old tags and branches. -**npm is configured to use npm, Inc.'s public package registry at - by default.** +**npm is configured to use npm, Inc.'s public registry at + by default.** Use of the npm public registry +is subject to terms of use available at . You can configure npm to use any compatible registry you like, and even run your own registry. Check out the [doc on registries](https://docs.npmjs.com/misc/registry). -Use of someone else's registry may be governed by terms of use. The -terms of use for the default public registry are available at -. - ## Super Easy Install npm is bundled with [node](https://nodejs.org/en/download/). diff --git a/doc/cli/npm.md b/doc/cli/npm.md index 43f029c5b23bd..32384547bcb0b 100644 --- a/doc/cli/npm.md +++ b/doc/cli/npm.md @@ -21,6 +21,16 @@ programs. Run `npm help` to get a list of available commands. +## IMPORTANT + +npm is configured to use npm, Inc.'s public registry at +https://registry.npmjs.org by default. Use of the npm public registry is +subject to terms of use available at https://www.npmjs.com/policies/terms. + +You can configure npm to use any compatible registry you like, and even run +your own registry. Use of someone else's registry may be governed by their +terms of use. + ## INTRODUCTION You probably got npm because you want to install stuff. diff --git a/doc/misc/npm-registry.md b/doc/misc/npm-registry.md index 3b84328ad66c9..ffbf0214bbf81 100644 --- a/doc/misc/npm-registry.md +++ b/doc/misc/npm-registry.md @@ -7,12 +7,20 @@ To resolve packages by name and version, npm talks to a registry website that implements the CommonJS Package Registry specification for reading package info. -Additionally, npm's package registry implementation supports several +npm is configured to use npm, Inc.'s public registry at + by default. Use of the npm public registry is +subject to terms of use available at . + +You can configure npm to use any compatible registry you like, and even run +your own registry. Use of someone else's registry may be governed by their +terms of use. + +npm's package registry implementation supports several write APIs as well, to allow for publishing packages and managing user account information. -The official public npm registry is at . It -is powered by a CouchDB database, of which there is a public mirror at +The npm public registry is powered by a CouchDB database, +of which there is a public mirror at . The code for the couchapp is available at .