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.

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

doc: harmonize description of ca argument #4213

Merged
merged 1 commit into from
Dec 9, 2015

Conversation

bnoordhuis
Copy link
Member

Different sections said different things about what the ca argument
should look like. This commit harmonizes them.

Ref: #4099

R=@rvagg

@bnoordhuis bnoordhuis added tls Issues and PRs related to the tls subsystem. https Issues or PRs related to the https subsystem. doc Issues and PRs related to the documentations. labels Dec 9, 2015
@@ -164,8 +164,9 @@ The following options from [`tls.connect()`][] can also be specified. However, a
- `key`: Private key to use for SSL. Default `null`.
- `passphrase`: A string of passphrase for the private key or pfx. Default `null`.
- `cert`: Public x509 certificate to use. Default `null`.
- `ca`: An authority certificate or array of authority certificates to check
the remote host against.
- `ca`: A string, a `Buffer` or an array of strings or `Buffer`s of trusted
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the second a should be ommitted.

@silverwind
Copy link
Contributor

LGTM with the grammatical nit above.

Different sections said different things about what the `ca` argument
should look like.  This commit harmonizes them.

Ref: nodejs#4099
PR-URL: nodejs#4213
Reviewed-By: Roman Reiss <[email protected]>
@bnoordhuis bnoordhuis closed this Dec 9, 2015
@bnoordhuis bnoordhuis deleted the update-ca-doc branch December 9, 2015 21:30
@bnoordhuis bnoordhuis merged commit 73a9a6f into nodejs:master Dec 9, 2015
@bnoordhuis
Copy link
Member Author

Landed with nit fixed in 73a9a6f.

bnoordhuis added a commit that referenced this pull request Dec 15, 2015
Different sections said different things about what the `ca` argument
should look like.  This commit harmonizes them.

Ref: #4099
PR-URL: #4213
Reviewed-By: Roman Reiss <[email protected]>
@rvagg rvagg mentioned this pull request Dec 17, 2015
bnoordhuis added a commit that referenced this pull request Dec 30, 2015
Different sections said different things about what the `ca` argument
should look like.  This commit harmonizes them.

Ref: #4099
PR-URL: #4213
Reviewed-By: Roman Reiss <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jan 19, 2016
Different sections said different things about what the `ca` argument
should look like.  This commit harmonizes them.

Ref: #4099
PR-URL: #4213
Reviewed-By: Roman Reiss <[email protected]>
@MylesBorins MylesBorins mentioned this pull request Jan 19, 2016
scovetta pushed a commit to scovetta/node that referenced this pull request Apr 2, 2016
Different sections said different things about what the `ca` argument
should look like.  This commit harmonizes them.

Ref: nodejs#4099
PR-URL: nodejs#4213
Reviewed-By: Roman Reiss <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc Issues and PRs related to the documentations. https Issues or PRs related to the https subsystem. tls Issues and PRs related to the tls subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants