Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
docs: Fix merge error in tls docs
Browse files Browse the repository at this point in the history
Fixes #1648.
  • Loading branch information
loganfsmyth authored and koichik committed Sep 4, 2011
1 parent 908ee33 commit bc0a552
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions doc/api/tls.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ thereafter.

[Here is some code that does it.](http://gist.github.com/848444)

<<<<<<< HEAD
### NPN and SNI

NPN (Next Protocol Negotitation) and SNI (Server Name Indication) are TLS
Expand All @@ -79,14 +78,13 @@ handshake extensions allowing you:
* NPN - to use one TLS server for multiple protocols (HTTP, SPDY)
* SNI - to use one TLS server for multiple hostnames with different SSL
certificates.
=======

### pair = tls.createSecurePair([credentials], [isServer], [requestCert], [rejectUnauthorized])

Creates a new secure pair object with two streams, one of which reads/writes
encrypted data, and one reads/writes cleartext data.
Generally the encrypted one is piped to/from an incoming encrypted data stream,
and the cleartext one is used as a replacement for the initial encrypted stream.
>>>>>>> origin/v0.4

- `credentials`: A credentials object from crypto.createCredentials( ... )

Expand Down

0 comments on commit bc0a552

Please sign in to comment.