| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
|
@svozza ... can you rebase your branch to the current v4.x-staging to clear out the extraneous commits here? |
Sorry, something went wrong.
|
Oh this is weird, I ddn't see all those extra commits. I'm not actually sure how this happened. I didn't have the v4.x-staging branch before I did this change. All I did was this: git checkout -b v4.x-staging upstream/v4.x-staging
git cherry-pick 4f6ad5c
git push -u origin v4.x-stagingMy branch said it was only 1 commit ahead when I made the PR and when I do git rebase upstream/v4.x-staging it tells me I'm up to date. |
Sorry, something went wrong.
|
OK. I think I've fixed it. |
Sorry, something went wrong.
There was a problem hiding this comment.
This should not have made it into the backport
ALPN support is only on v5.x +
Please move this section
Sorry, something went wrong.
There was a problem hiding this comment.
Ah yes, I wasn't sure about that ALPN stuff. I'll remove the references.
Sorry, something went wrong.
|
@svozza when you cherry picked did you have conflicts? It appears to me like you merged all of the latest changes as opposed to manually handling the conflicts, as such we have a bunch of documentation in here about ALPN which is not a feature in v4.x I would suggest you might find it easier in the sections with conflicts to opt for the version present in v4, not in your commit and simply reaudit those sections to make sure they are correct |
Sorry, something went wrong.
|
Done. |
Sorry, something went wrong.
There was a problem hiding this comment.
where did this come from?
Sorry, something went wrong.
|
@svozza I'm still seeing quite a bit of information in here of v5 specific documentation. Would you be open to redoing this fix from scratch using the v4 doc? Sorry for being tight on this, but I really don't want to accidentally merge incorrect docs |
Sorry, something went wrong.
|
Yeah, no problem. I think I made a mess of the rebase. |
Sorry, something went wrong.
|
@svozza thanks for all the hard work! |
Sorry, something went wrong.
|
@svozza let me know if I can help with anything |
Sorry, something went wrong.
|
Really sorry about the delay, will be able to get to it tonight though! |
Sorry, something went wrong.
|
So I just blew away the branch and started over. No rebasing or any messing around and I think it worked out much better. |
Sorry, something went wrong.
|
I apologize, I was commenting on a backport after the original commit was already accepted. I've removed my nits and will instead address these in a future PR |
Sorry, something went wrong.
|
Oh right, I was in the process of fixing them! :) I agree that 'This event is emitted...` reads better btw. |
Sorry, something went wrong.
|
@whitlockjc the review is appreciated. This backport ended up having to be a complete rewrite due to the differences (to a certain extent). |
Sorry, something went wrong.
|
Well, if I wasn't out of line, let me add them back. Thanks for stepping in @thealphanerd and @svozza for being so willing to help. <3. |
Sorry, something went wrong.
There was a problem hiding this comment.
For consistency, we might use "This event is emitted" like we did for the 'secure' event.
Sorry, something went wrong.
There was a problem hiding this comment.
Same as above for 'clientError' event.
Sorry, something went wrong.
Brings tls.markdown into alignment with the node.js styleguide, specifically regarding the use of personal pronouns. Also, fixes various typos, punctuation errors, missing definite/indefinite articles and other minor grammatical issues. PR-URL: nodejs#5706 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
|
Think I got them all! |
Sorry, something went wrong.
|
I'll take another peek. I also see a number of places where we're using a trailing . for option/argument descriptions that themselves are not full sentences. These have been there for some time and for consistency, using what was there makes sense. But if you wanted to clean those up, I wouldn't mind. (I might be in the wrong on that one so I'll state my opinion and let someone else decide.) |
Sorry, something went wrong.
|
@svozza Thanks for addressing the NOTE: and event inconsistencies. The inconsistencies with the trailing periods for argument/option documentation is rampant but this did not start with you. If no one else has an opinion on the argument/option documentation inconsistencies, LGTM. |
Sorry, something went wrong.
|
Yeah, I really wasn't sure what to do there so I left it originally. I was leaning towards putting fullstops everywhere but thought it might be best not to go down that rabbithole. |
Sorry, something went wrong.
|
Let's see what @thealphanerd has to say. Others welcome of course as well but he was last involved before myself. Great job regardless. |
Sorry, something went wrong.
|
If something is consistent in the docs and not specific to this change I think it should come in another update |
Sorry, something went wrong.
|
@thealphanerd That's what I was thinking. Seems you've assigned to yourself so I'll step out and let you merge when it's ready. Thanks for stepping in. |
Sorry, something went wrong.
|
cool.. can I get an official LGTM from you @whitlockjc |
Sorry, something went wrong.
|
ping @whitlockjc I'm going to close for now, please feel free to reopen |
Sorry, something went wrong.
| Back | FazBrowse Home | New Git URL |
This is a backport of #5706 (doc: align doc/api/tls.markdown with style guide) to the v4.x-staging branch as requested @thealphanerd.