make doc

2 files changed, 10 insertions, 50 deletions

diff --git a/man1/changelog.1 b/man1/changelog.1
index 5fad88704..b6dd5ad1d 100644
--- a/man1/changelog.1
+++ b/man1/changelog.1
@@ -529,5 +529,15 @@ Packages without "main" modules don\'t export modules\.
 .br
 No shims! (Still has symlinks, though)
 .
+.IP "\(bu" 4
+0\.3\.1\-0\.3\.5:
+Ease up on permission forcing\.
+.
+.br
+Fix bugs around proxy handling\.
+.
+.br
+Remove support for invalid JSON (since node doesn\'t support it)
+.
 .IP "" 0
 
diff --git a/man1/json.1 b/man1/json.1
index f8a4654bd..3468d5a47 100644
--- a/man1/json.1
+++ b/man1/json.1
@@ -569,53 +569,3 @@ specify "*" as the version), then any version of node will do\.
 If you specify an "engines" field, then npm will require that "node" be
 somewhere on that list\. If "engines" is omitted, then npm will just assume
 that it works on node\.
-.
-.SH "overlay"
-npm responds to the \fBnode\fR and \fBnpm\fR env\-specific package\.json values, which
-you can hang on the "overlay" key\.
-.
-.P
-For example:
-.
-.IP "" 4
-.
-.nf
-{ "name" : "foo"
-, "version" : 7
-, "description" : "generic description"
-, "overlay" :
-  { "node" :
-    { "name" : "bar"
-    , "description" : "description for node"
-    }
-  , "npm" :
-    { "version" : "1\.0\.7"
-    , "description" : "description for npm"
-    }
-  , "narwhal" :
-    { "description" : "description for narwhal" }
-  }
-}
-.
-.fi
-.
-.IP "" 0
-.
-.P
-In this case, this is what npm will treat it as:
-.
-.IP "" 4
-.
-.nf
-{ "name" : "bar"
-, "version" : "1\.0\.7"
-, "description" : "description for npm"
-}
-.
-.fi
-.
-.IP "" 0
-.
-.P
-This way, even if npm is not exactly the same as some other package management
-system, you can still use both, and it can be a happy planet\.