summaryrefslogtreecommitdiff
path: root/deps/npm/html/doc/files/package.json.html
diff options
context:
space:
mode:
Diffstat (limited to 'deps/npm/html/doc/files/package.json.html')
-rw-r--r--deps/npm/html/doc/files/package.json.html42
1 files changed, 35 insertions, 7 deletions
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index f435bb717..e914991e0 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -80,16 +80,44 @@ you can specify the value for "bugs" as a simple string instead of an
<h2 id="license">license</h2>
<p>You should specify a license for your package so that people know how they are
permitted to use it, and any restrictions you&#39;re placing on it.</p>
-<p>The simplest way, assuming you&#39;re using a common license such as BSD-3-Clause
-or MIT, is to just specify the standard SPDX ID of the license you&#39;re using,
-like this:</p>
+<p>If you&#39;re using a common license such as BSD-2-Clause or MIT, add a
+current SPDX license identifier for the license you&#39;re using, like this:</p>
<pre><code>{ &quot;license&quot; : &quot;BSD-3-Clause&quot; }
</code></pre><p>You can check <a href="https://spdx.org/licenses/">the full list of SPDX license IDs</a>.
Ideally you should pick one that is
<a href="http://opensource.org/licenses/alphabetical">OSI</a> approved.</p>
-<p>It&#39;s also a good idea to include a LICENSE file at the top level in
-your package.</p>
-<h2 id="people-fields-author-contributors">people fields: author, contributors</h2>
+<p>If your package is licensed under multiple common licenses, use an <a href="http://npmjs.com/package/spdx">SPDX license
+expression syntax version 2.0 string</a>, like this:</p>
+<pre><code>{ &quot;license&quot; : &quot;(ISC OR GPL-3.0)&quot; }
+</code></pre><p>If you are using a license that hasn&#39;t been assigned an SPDX identifier, or if
+you are using a custom license, use the following valid SPDX expression:</p>
+<pre><code>{ &quot;license&quot; : &quot;LicenseRef-LICENSE&quot; }
+</code></pre><p>Then include a LICENSE file at the top level of the package.</p>
+<p>Some old packages used license objects or a &quot;licenses&quot; property containing an
+array of license objects:</p>
+<pre><code>// Not valid metadata
+{ &quot;license&quot; :
+ { &quot;type&quot; : &quot;ISC&quot;
+ , &quot;url&quot; : &quot;http://opensource.org/licenses/ISC&quot;
+ }
+}
+
+// Not valid metadata
+{ &quot;licenses&quot; :
+ [
+ { &quot;type&quot;: &quot;MIT&quot;
+ , &quot;url&quot;: &quot;http://www.opensource.org/licenses/mit-license.php&quot;
+ }
+ , { &quot;type&quot;: &quot;Apache-2.0&quot;
+ , &quot;url&quot;: &quot;http://opensource.org/licenses/apache2.0.php&quot;
+ }
+ ]
+}
+</code></pre><p>Those styles are now deprecated. Instead, use SPDX expressions, like this:</p>
+<pre><code>{ &quot;license&quot;: &quot;ISC&quot; }
+
+{ &quot;license&quot;: &quot;(MIT OR Apache-2.0)&quot; }
+</code></pre><h2 id="people-fields-author-contributors">people fields: author, contributors</h2>
<p>The &quot;author&quot; is one person. &quot;contributors&quot; is an array of people. A &quot;person&quot;
is an object with a &quot;name&quot; field and optionally &quot;url&quot; and &quot;email&quot;, like this:</p>
<pre><code>{ &quot;name&quot; : &quot;Barney Rubble&quot;
@@ -510,5 +538,5 @@ ignored.</p>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
-<p id="footer">package.json &mdash; npm@2.9.1</p>
+<p id="footer">package.json &mdash; npm@2.10.1</p>