diff --git a/LICENSE b/LICENSE
index d768eb3e2dab1b..9e379a53f49df4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1037,7 +1037,17 @@ The externally maintained libraries used by Node.js are:
- marked, located at tools/doc/node_modules/marked, is licensed as follows:
"""
- Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
+ # License information
+
+ ## Contribution License Agreement
+
+ If you contribute code to this project, you are implicitly allowing your code
+ to be distributed under the MIT license. You are also implicitly verifying that
+ all code is your original work. ``
+
+ ## Marked
+
+ Copyright (c) 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -1056,6 +1066,20 @@ The externally maintained libraries used by Node.js are:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
+ ## Markdown
+
+ Copyright © 2004, John Gruber
+ http://daringfireball.net/
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name “Markdown” nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ This software is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
"""
- cpplint.py, located at tools/cpplint.py, is licensed as follows:
diff --git a/doc/api/buffer.md b/doc/api/buffer.md
index c219f00e4a1f48..c1c928d02799d9 100644
--- a/doc/api/buffer.md
+++ b/doc/api/buffer.md
@@ -206,8 +206,8 @@ changes:
`Buffer` instances are also [`Uint8Array`] instances. However, there are subtle
incompatibilities with [`TypedArray`]. For example, while
[`ArrayBuffer#slice()`] creates a copy of the slice, the implementation of
-[`Buffer#slice()`][`buf.slice()`] creates a view over the existing `Buffer`
-without copying, making [`Buffer#slice()`][`buf.slice()`] far more efficient.
+[`Buffer#slice()`] creates a view over the existing `Buffer`
+without copying, making [`Buffer#slice()`] far more efficient.
It is also possible to create new [`TypedArray`] instances from a `Buffer` with
the following caveats:
@@ -2603,6 +2603,7 @@ This value may depend on the JS engine that is being used.
[`ArrayBuffer#slice()`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer/slice
[`ArrayBuffer`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer
+[`Buffer#slice()`]: #buffer_buf_slice_start_end
[`Buffer.alloc()`]: #buffer_class_method_buffer_alloc_size_fill_encoding
[`Buffer.allocUnsafe()`]: #buffer_class_method_buffer_allocunsafe_size
[`Buffer.allocUnsafeSlow()`]: #buffer_class_method_buffer_allocunsafeslow_size
diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index e3d069e101aabd..ab33ff3a578d13 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -2409,7 +2409,7 @@ The following constants exported by `crypto.constants` apply to various uses of
the `crypto`, `tls`, and `https` modules and are generally specific to OpenSSL.
### OpenSSL Options
-
+
Constant |
@@ -2418,20 +2418,20 @@ the `crypto`, `tls`, and `https` modules and are generally specific to OpenSSL.
SSL_OP_ALL |
Applies multiple bug workarounds within OpenSSL. See
- https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html for
- detail. |
+ https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html
+ for detail.
SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION |
Allows legacy insecure renegotiation between OpenSSL and unpatched
clients or servers. See
- https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html. |
+ https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html.
SSL_OP_CIPHER_SERVER_PREFERENCE |
Attempts to use the server's preferences instead of the client's when
selecting a cipher. Behavior depends on protocol version. See
- https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html. |
+ https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html.
SSL_OP_CISCO_ANYCONNECT |
@@ -2565,6 +2565,7 @@ the `crypto`, `tls`, and `https` modules and are generally specific to OpenSSL.
### OpenSSL Engine Constants
+
diff --git a/test/doctool/test-doctool-json.js b/test/doctool/test-doctool-json.js
index e295014071a3c5..2b4ff54f0cae1b 100644
--- a/test/doctool/test-doctool-json.js
+++ b/test/doctool/test-doctool-json.js
@@ -130,7 +130,7 @@ const testData = [
{
textRaw: 'Something',
name: 'something',
- desc: '\n' +
+ desc: '\n\n
' +
'Describe Something
in more detail here.
\n',
type: 'module',
displayName: 'Something'
diff --git a/tools/doc/html.js b/tools/doc/html.js
index ae2da58b7a0131..44dfa7932144c3 100644
--- a/tools/doc/html.js
+++ b/tools/doc/html.js
@@ -214,8 +214,6 @@ function preprocessElements(lexed, filename) {
'') +
`${prefix} ${number}${noLinking ? '' : ''}${explication}`
.replace(/\n/g, ' ');
-
- lexed[index] = { type: 'html', text: token.text };
} else if (state === 'MAYBE_STABILITY_BQ') {
state = null;
lexed[index - 1] = { type: 'blockquote_start' };
diff --git a/tools/doc/node_modules/.bin/marked b/tools/doc/node_modules/.bin/marked
new file mode 120000
index 00000000000000..a8d872e9dc1fd9
--- /dev/null
+++ b/tools/doc/node_modules/.bin/marked
@@ -0,0 +1 @@
+../marked/bin/marked
\ No newline at end of file
diff --git a/tools/doc/node_modules/marked/.eslintignore b/tools/doc/node_modules/marked/.eslintignore
new file mode 100644
index 00000000000000..121531af8467c5
--- /dev/null
+++ b/tools/doc/node_modules/marked/.eslintignore
@@ -0,0 +1 @@
+*.min.js
diff --git a/tools/doc/node_modules/marked/.eslintrc.json b/tools/doc/node_modules/marked/.eslintrc.json
new file mode 100644
index 00000000000000..7fdd614117f1fd
--- /dev/null
+++ b/tools/doc/node_modules/marked/.eslintrc.json
@@ -0,0 +1,28 @@
+{
+ "extends": "standard",
+ "plugins": [
+ "standard"
+ ],
+ "parserOptions": { "ecmaVersion": 5 },
+ "rules": {
+ "semi": "off",
+ "indent": ["warn", 2, {
+ "VariableDeclarator": { "var": 2 },
+ "SwitchCase": 1,
+ "outerIIFEBody": 0
+ }],
+ "space-before-function-paren": "off",
+ "operator-linebreak": ["error", "before", { "overrides": { "=": "after" } }],
+ "no-cond-assign": "off",
+ "no-useless-escape": "off",
+ "no-return-assign": "off",
+ "one-var": "off",
+ "no-control-regex": "off"
+ },
+ "env": {
+ "node": true,
+ "browser": true,
+ "amd": true,
+ "jasmine": true
+ }
+}
diff --git a/tools/doc/node_modules/marked/.npmignore b/tools/doc/node_modules/marked/.npmignore
deleted file mode 100644
index 3fb773c0342dda..00000000000000
--- a/tools/doc/node_modules/marked/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.git*
-test/
diff --git a/tools/doc/node_modules/marked/.travis.yml b/tools/doc/node_modules/marked/.travis.yml
deleted file mode 100644
index 60d00ce140f37d..00000000000000
--- a/tools/doc/node_modules/marked/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: node_js
-node_js:
- - "0.10"
- - "0.8"
- - "0.6"
diff --git a/tools/doc/node_modules/marked/Gulpfile.js b/tools/doc/node_modules/marked/Gulpfile.js
deleted file mode 100644
index cebc16a650b0e9..00000000000000
--- a/tools/doc/node_modules/marked/Gulpfile.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var gulp = require('gulp');
-var uglify = require('gulp-uglify');
-var concat = require('gulp-concat');
-
-var preserveFirstComment = function() {
- var set = false;
-
- return function() {
- if (set) return false;
- set = true;
- return true;
- };
-};
-
-gulp.task('uglify', function() {
- gulp.src('lib/marked.js')
- .pipe(uglify({preserveComments: preserveFirstComment()}))
- .pipe(concat('marked.min.js'))
- .pipe(gulp.dest('.'));
-});
-
-gulp.task('default', ['uglify']);
diff --git a/tools/doc/node_modules/marked/LICENSE b/tools/doc/node_modules/marked/LICENSE
deleted file mode 100644
index a7b812ed618f11..00000000000000
--- a/tools/doc/node_modules/marked/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/tools/doc/node_modules/marked/LICENSE.md b/tools/doc/node_modules/marked/LICENSE.md
new file mode 100644
index 00000000000000..64b41a0e46378d
--- /dev/null
+++ b/tools/doc/node_modules/marked/LICENSE.md
@@ -0,0 +1,43 @@
+# License information
+
+## Contribution License Agreement
+
+If you contribute code to this project, you are implicitly allowing your code
+to be distributed under the MIT license. You are also implicitly verifying that
+all code is your original work. ``
+
+## Marked
+
+Copyright (c) 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## Markdown
+
+Copyright © 2004, John Gruber
+http://daringfireball.net/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name “Markdown” nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+This software is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
diff --git a/tools/doc/node_modules/marked/Makefile b/tools/doc/node_modules/marked/Makefile
index d9349f07996d34..7deead54c1458a 100644
--- a/tools/doc/node_modules/marked/Makefile
+++ b/tools/doc/node_modules/marked/Makefile
@@ -9,4 +9,7 @@ clean:
bench:
@node test --bench
+man/marked.1.txt:
+ groff -man -Tascii man/marked.1 | col -b > man/marked.1.txt
+
.PHONY: clean all
diff --git a/tools/doc/node_modules/marked/README.md b/tools/doc/node_modules/marked/README.md
index efa71aaaabc849..7d3af29378614c 100644
--- a/tools/doc/node_modules/marked/README.md
+++ b/tools/doc/node_modules/marked/README.md
@@ -1,45 +1,47 @@
-# marked
+
+
+
-> A full-featured markdown parser and compiler, written in JavaScript. Built
-> for speed.
+# Marked
-[][badge]
+[](https://www.npmjs.com/package/marked)
+[](https://cdn.jsdelivr.net/npm/marked@0.3.19/marked.min.js)
+[](https://packagephobia.now.sh/result?p=marked@0.3.19)
+[](https://www.npmjs.com/package/marked)
+[](https://travis-ci.org/markedjs/marked)
-## Install
+- ⚡ built for speed
+- ⬇️ low-level compiler for parsing markdown without caching or blocking for long periods of time
+- ⚖️ light-weight while implementing all markdown features from the supported flavors & specifications
+- 🌐 works in a browser, on a server, or from a command line interface (CLI)
-``` bash
-npm install marked --save
-```
+## Demo
-## Usage
+Checkout the [demo page](https://marked.js.org/demo/) to see marked in action ⛹️
-Minimal usage:
+## Docs
-```js
-var marked = require('marked');
-console.log(marked('I am using __markdown__.'));
-// Outputs: I am using markdown.
-```
+Our [documentation pages](https://marked.js.org) are also rendered using marked 💯
+
+## Installation
+
+**CLI:** `npm install -g marked`
-Example setting options with default values:
+**In-browser:** `npm install marked --save`
-```js
-var marked = require('marked');
-marked.setOptions({
- renderer: new marked.Renderer(),
- gfm: true,
- tables: true,
- breaks: false,
- pedantic: false,
- sanitize: true,
- smartLists: true,
- smartypants: false
-});
+## Usage
-console.log(marked('I am using __markdown__.'));
+**CLI**
+
+``` bash
+$ marked -o hello.html
+hello world
+^D
+$ cat hello.html
+hello world
```
-### Browser
+**Browser**
```html
@@ -47,360 +49,19 @@ console.log(marked('I am using __markdown__.'));
Marked in the browser
-
+