diff options
| author | Henrik Nord <[email protected]> | 2011-08-16 15:41:17 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-16 15:41:30 +0200 |
| commit | 8a0729f489d202f682023142d90dd61a155edc2c (patch) | |
| tree | 8c0b322787eb3ee12eb5224ee2612d92f3b3f442 /lib/ssl/doc/src/ssl_protocol.xml | |
| parent | 48d0c4adbe85450f1224311f9b8495affaae9c6a (diff) | |
| parent | 89ca4daa2eb4b928387133b0a9c60f55adea267d (diff) | |
| download | otp-8a0729f489d202f682023142d90dd61a155edc2c.tar.gz otp-8a0729f489d202f682023142d90dd61a155edc2c.tar.bz2 otp-8a0729f489d202f682023142d90dd61a155edc2c.zip | |
Merge branch 'cr/trivia' into dev
* cr/trivia:
replace "a ssl" with "an ssl"
reindent pkix_path_validation/3
Trivial documentation fixes
OTP-9464
Diffstat (limited to 'lib/ssl/doc/src/ssl_protocol.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl_protocol.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml index 6936408881..ca5cc8bc7a 100644 --- a/lib/ssl/doc/src/ssl_protocol.xml +++ b/lib/ssl/doc/src/ssl_protocol.xml @@ -31,11 +31,11 @@ </p> <p>By default erlang ssl is run over the TCP/IP protocol even - though you could plug in an other reliable transport protocol + though you could plug in any other reliable transport protocol with the same API as gen_tcp.</p> <p>If a client and server wants to use an upgrade mechanism, such as - defined by RFC2817, to upgrade a regular TCP/IP connection to a ssl + defined by RFC2817, to upgrade a regular TCP/IP connection to an ssl connection the erlang ssl API supports this. This can be useful for things such as supporting HTTP and HTTPS on the same port and implementing virtual hosting. |