Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tools: update marked to 0.4.0
Update marked to 0.4.0 for use with the tools/doc/*.js tools.
  • Loading branch information
Trott committed Jul 2, 2018
commit 676c1bb5047261a4e3dee2b84752cca16cbfb0ed
26 changes: 25 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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. `</legalese>`

## 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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/doctool/test-doctool-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const testData = [
{
textRaw: 'Something',
name: 'something',
desc: '<!-- This is not a metadata comment -->\n<p>' +
desc: '<!-- This is not a metadata comment -->\n\n<p>' +
'Describe <code>Something</code> in more detail here.</p>\n',
type: 'module',
displayName: 'Something'
Expand Down
1 change: 1 addition & 0 deletions tools/doc/node_modules/.bin/marked

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tools/doc/node_modules/marked/.eslintignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions tools/doc/node_modules/marked/.eslintrc.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions tools/doc/node_modules/marked/.npmignore

This file was deleted.

5 changes: 0 additions & 5 deletions tools/doc/node_modules/marked/.travis.yml

This file was deleted.

22 changes: 0 additions & 22 deletions tools/doc/node_modules/marked/Gulpfile.js

This file was deleted.

19 changes: 0 additions & 19 deletions tools/doc/node_modules/marked/LICENSE

This file was deleted.

43 changes: 43 additions & 0 deletions tools/doc/node_modules/marked/LICENSE.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions tools/doc/node_modules/marked/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading