Skip to content
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

Jump to bottom

(v6.x backport) doc types fixes #13054

Closed
wants to merge 4 commits into from
Closed

(v6.x backport) doc types fixes #13054

wants to merge 4 commits into from

Conversation

silverwind
Copy link
Contributor

This is a backport for these commits:

ff13619
9be03a2
172be50
5f32024

cc: @MylesBorins

@nodejs-github-bot nodejs-github-bot added doc Issues and PRs related to the documentations. tools Issues and PRs related to the tools directory. v6.x labels May 16, 2017
This was referenced May 16, 2017
Closed
Closed
Closed
Closed
@silverwind
Copy link
Contributor Author

Once this has landed #9532 should be attempted to be backported.

@gibfahn gibfahn changed the base branch from v6.x to v6.x-staging May 16, 2017 16:44
@gibfahn
Copy link
Member

gibfahn commented May 16, 2017

This doesn't apply cleanly, I think because it was raised against v6.x not v6.x-staging.

@silverwind I've updated the base branch in this PR, could you rebase against v6.x-staging?

@silverwind
Copy link
Contributor Author

Meh, I was specifically asked to target v6.x 😢

@silverwind
Copy link
Contributor Author

How's it now?

@silverwind silverwind force-pushed the doc-types-backport branch 3 times, most recently from 1c6abfb to a207db0 Compare May 16, 2017 17:10
@silverwind
Copy link
Contributor Author

(Fixed a few oversights)

gibfahn pushed a commit that referenced this pull request May 16, 2017
@silverwind @gibfahn
doc: consistent case for primitive types
99ebb9a 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
gibfahn pushed a commit that referenced this pull request May 16, 2017
@silverwind @gibfahn
doc: linkify type[] syntax, support lowercase for primitives
0a1dbcb 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
gibfahn pushed a commit that referenced this pull request May 16, 2017
@silverwind @gibfahn
tools: fix lint issue in doctool
5fd1593 
PR-URL: #11658
Backport-PR-URL: #13054
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
gibfahn pushed a commit that referenced this pull request May 16, 2017
@silverwind @gibfahn
doc/tools: fix more type inconsistencies
59dd83e 
- fix a number of uppercase types
- lowercase 'integer'
- consistent formatting in crypto

PR-URL: #11697
Backport-PR-URL: #13054
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
@gibfahn
Copy link
Member

gibfahn commented May 16, 2017 •
edited
Loading

Thanks @silverwind.

Landed in:
99ebb9a
0a1dbcb
5fd1593
59dd83e

This is a backport of: #11167 #11658 #11697

@gibfahn gibfahn closed this May 16, 2017
@gibfahn
Copy link
Member

gibfahn commented May 16, 2017

FWIW the backporting guide should be clear about which branch to backport to, LMK if anything in that is unclear.

MylesBorins pushed a commit that referenced this pull request May 18, 2017
@silverwind @MylesBorins
doc: consistent case for primitive types
cce5ba0 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
MylesBorins pushed a commit that referenced this pull request May 18, 2017
@silverwind @MylesBorins
doc: linkify type[] syntax, support lowercase for primitives
71ca2cd 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
MylesBorins pushed a commit that referenced this pull request May 18, 2017
@silverwind @MylesBorins
tools: fix lint issue in doctool
7135a7b 
PR-URL: #11658
Backport-PR-URL: #13054
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins pushed a commit that referenced this pull request May 18, 2017
@silverwind @MylesBorins
doc/tools: fix more type inconsistencies
a07e25a 
- fix a number of uppercase types
- lowercase 'integer'
- consistent formatting in crypto

PR-URL: #11697
Backport-PR-URL: #13054
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
@silverwind
tools: fix lint issue in doctool
8098f49 
PR-URL: nodejs#11658
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@silverwind
doc/tools: fix more type inconsistencies
6014aa7 
- fix a number of uppercase types
- lowercase 'integer'
- consistent formatting in crypto

PR-URL: nodejs#11697
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
@silverwind
Copy link
Contributor Author

Done. I noticed docs for buffer.includes which was added in 5.3.0 were not there on the branch, so I left them in dbddd16.

gibfahn pushed a commit to gibfahn/node that referenced this pull request Jun 17, 2017
@silverwind @gibfahn
doc: consistent case for primitive types
6602954 
PR-URL: nodejs#11167
Backport-PR-URL: nodejs#13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
gibfahn pushed a commit to gibfahn/node that referenced this pull request Jun 17, 2017
@silverwind @gibfahn
doc: linkify type[] syntax, support lowercase for primitives
40babf1 
PR-URL: nodejs#11167
Backport-PR-URL: nodejs#13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
gibfahn pushed a commit to gibfahn/node that referenced this pull request Jun 17, 2017
@silverwind @gibfahn
tools: fix lint issue in doctool
e70cb6a 
PR-URL: nodejs#11658
Backport-PR-URL: nodejs#13054
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
gibfahn pushed a commit to gibfahn/node that referenced this pull request Jun 17, 2017
@silverwind @gibfahn
doc/tools: fix more type inconsistencies
311ef42 
- fix a number of uppercase types
- lowercase 'integer'
- consistent formatting in crypto

PR-URL: nodejs#11697
Backport-PR-URL: nodejs#13054
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
@gibfahn
Copy link
Member

gibfahn commented Jun 17, 2017

Landed in:

6602954
40babf1
e70cb6a
311ef42

@gibfahn gibfahn closed this Jun 17, 2017
gibfahn pushed a commit that referenced this pull request Jun 20, 2017
@silverwind @gibfahn
doc: consistent case for primitive types
dbcc7bd 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
gibfahn pushed a commit that referenced this pull request Jun 20, 2017
@silverwind @gibfahn
doc: linkify type[] syntax, support lowercase for primitives
fddb8ef 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
gibfahn pushed a commit that referenced this pull request Jun 20, 2017
@silverwind @gibfahn
tools: fix lint issue in doctool
c881b2c 
PR-URL: #11658
Backport-PR-URL: #13054
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
gibfahn pushed a commit that referenced this pull request Jun 20, 2017
@silverwind @gibfahn
doc/tools: fix more type inconsistencies
281191f 
- fix a number of uppercase types
- lowercase 'integer'
- consistent formatting in crypto

PR-URL: #11697
Backport-PR-URL: #13054
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
MylesBorins pushed a commit that referenced this pull request Jul 11, 2017
@silverwind @MylesBorins
doc: consistent case for primitive types
dd1fb98 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
MylesBorins pushed a commit that referenced this pull request Jul 11, 2017
@silverwind @MylesBorins
doc: linkify type[] syntax, support lowercase for primitives
b62cec8 
PR-URL: #11167
Backport-PR-URL: #13054
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
MylesBorins pushed a commit that referenced this pull request Jul 11, 2017
@silverwind @MylesBorins
tools: fix lint issue in doctool
beb8485 
PR-URL: #11658
Backport-PR-URL: #13054
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins pushed a commit that referenced this pull request Jul 11, 2017
@silverwind @MylesBorins
doc/tools: fix more type inconsistencies
8d04387 
- fix a number of uppercase types
- lowercase 'integer'
- consistent formatting in crypto

PR-URL: #11697
Backport-PR-URL: #13054
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
@vsemozhetbyt
Copy link
Contributor

@silverwind, @gibfahn There are some [WHATWG URL][] links without the reference in the doc/api/url.md after this backport.

@silverwind
Copy link
Contributor Author

Must've missed those. They are in v6.x now, right?

@vsemozhetbyt
Copy link
Contributor

@silverwind It seems only in v6.x-staging:
https://github.com/nodejs/node/blob/v6.x-staging/doc/api/url.md

silverwind added a commit to silverwind/node that referenced this pull request Jul 18, 2017
@silverwind
doc: remove leftover WHATWG url.format section
d860dc6 
The backport in nodejs#13054 contained a
leftover section from the WHATWG url.format, in addition to the existing
url.format. This removes this section.
@silverwind silverwind mentioned this pull request Jul 18, 2017
Closed
@silverwind
Copy link
Contributor Author

Filed #14351

MylesBorins pushed a commit that referenced this pull request Jul 18, 2017
@silverwind @MylesBorins
doc: remove leftover WHATWG url.format section
b95cc5f 
The backport in #13054 contained a
leftover section from the WHATWG url.format, in addition to the existing
url.format. This removes this section.
MylesBorins pushed a commit that referenced this pull request Jul 18, 2017
@silverwind @MylesBorins
doc: remove leftover WHATWG url.format section
fcb27fa 
The backport in #13054 contained a
leftover section from the WHATWG url.format, in addition to the existing
url.format. This removes this section.

PR-URL: #14351
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gibfahn gibfahn gibfahn approved these changes

Assignees
No one assigned
Labels
doc Issues and PRs related to the documentations. tools Issues and PRs related to the tools directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@silverwind @gibfahn @MylesBorins @vsemozhetbyt @nodejs-github-bot