Skip to content

doc: improve doc/markdown file organization coherence #31771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DavenportEmma wants to merge 36 commits into from
Closed

doc: improve doc/markdown file organization coherence #31771

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
19fbcc1
doc: merge CODE_OF_CONDUCT.md and coc.md
DavenportEmma Feb 13, 2020
82404d7
doc: change underscore to hyphen in file name
DavenportEmma Feb 13, 2020
7c306dc
doc: move guide file to doc/guides
DavenportEmma Feb 13, 2020
63535cd
doc: update guide name
DavenportEmma Feb 13, 2020
fd5de31
doc: move guides to appropriate directory
DavenportEmma Feb 13, 2020
0e71d06
doc: move files from doc/ to doc/guides
DavenportEmma Feb 13, 2020
aa9de2a
doc: rename and move STYLE_GUIDE.md
DavenportEmma Feb 13, 2020
36b7c22
update broken links in CODE_OF_CONDUCT.md
DavenportEmma Feb 13, 2020
09b6894
doc: update foundation name in onboarding
tniessen Feb 10, 2020
5e41765
doc: expand C++ README with information about exception handling
addaleax Feb 10, 2020
e5e011d
doc: add directions to mark a release line as lts
Feb 10, 2020
d565041
test: improve test-fs-stat-bigint
Trott Feb 11, 2020
9da57a8
test: fix flaky parallel/test-repl-history-navigation test
BridgeAR Feb 9, 2020
bc55b57
lib: fix few comment typos in fs/watchers.js
lundibundi Feb 9, 2020
b9a7625
stream: removed outdated TODO
ronag Feb 8, 2020
26cb448
doc: fix default server timeout description for https
puzpuzpuz Feb 8, 2020
9179141
doc: update contact email for @ryzokuken
ryzokuken Feb 7, 2020
94eb0f9
doc: fix typo on fs docs
juanarbol Feb 3, 2020
611a158
worker: add support for .cjs extension
aduh95 Feb 6, 2020
9e805b1
doc: add prerequisites information for Arch
ryzokuken Feb 7, 2020
d0ed431
benchmark: swap var for let in benchmarks
RamirezAlex Jul 31, 2019
4bf888d
benchmark: use let instead of var
dnlup Jan 31, 2020
9cbf6af
crypto: fix performance regression
ronag Feb 11, 2020
13c05cd
doc: add glossary.md
gengjiawen May 1, 2019
9a1c19b
test: mark test-fs-stat-bigint flaky on FreeBSD
Trott Feb 11, 2020
0875837
stream: fix async iterator destroyed error order
ronag Jan 11, 2020
ad79237
doc: merge CODE_OF_CONDUCT.md and coc.md
DavenportEmma Feb 13, 2020
e1bd95d
doc: change underscore to hyphen in file name
DavenportEmma Feb 13, 2020
07bc3ee
doc: move guide file to doc/guides
DavenportEmma Feb 13, 2020
12354ee
doc: update guide name
DavenportEmma Feb 13, 2020
695f089
doc: move guides to appropriate directory
DavenportEmma Feb 13, 2020
ee9573c
doc: move files from doc/ to doc/guides
DavenportEmma Feb 13, 2020
64397e2
doc: rename and move STYLE_GUIDE.md
DavenportEmma Feb 13, 2020
d50459f
update broken links in CODE_OF_CONDUCT.md
DavenportEmma Feb 13, 2020
6d9b3d8
Revert "doc: merge CODE_OF_CONDUCT.md and coc.md"
DavenportEmma Feb 14, 2020
1c6cf86
Merge branch 'issue31741' of github.com:ConorDavenport/node into issu…
DavenportEmma Feb 14, 2020
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
update broken links in CODE_OF_CONDUCT.md 
Updated broken links after merging doc/guides/contributing/coc.md
  • Loading branch information
@DavenportEmma
DavenportEmma committed Feb 13, 2020
commit 36b7c2261437991e5fa4e7f5e625ba1bc9c157d0
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code of Conduct
Copy link
Copy Markdown
Member

@jasnell jasnell Feb 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@conordavenport this one should be left as is, with the link over to the nodejs/admin repo

Copy link
Copy Markdown
Contributor Author

@DavenportEmma DavenportEmma Feb 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, thanks for pointing that out


The Node.js project has a [Code of Conduct][] that *all* contributors are
The Node.js project has a Code of Conduct that *all* contributors are
expected to follow. This code describes the *minimum* behavior expectations
for all contributors.

Expand All @@ -11,7 +11,7 @@ intended, above all else, to help establish a culture within the project that
allows anyone and everyone who wants to contribute to feel safe doing so.

Should any individual act in any way that is considered in violation of the
[Code of Conduct][], corrective actions will be taken. It is possible, however,
Code of Conduct, corrective actions will be taken. It is possible, however,
for any individual to *act* in such a manner that is not in violation of the
strict letter of the Code of Conduct guidelines while still going completely
against the spirit of what that Code is intended to accomplish.
Expand All @@ -23,7 +23,7 @@ disagreements are in good faith and everyone is working towards a common goal.
## Bad actors

All contributors to Node.js tacitly agree to abide by both the letter and
spirit of the [Code of Conduct][]. Failure, or unwillingness, to do so will
spirit of the Code of Conduct. Failure, or unwillingness, to do so will
result in contributions being respectfully declined.

A *bad actor* is someone who repeatedly violates the *spirit* of the Code of
Expand Down