From cdc749bfc82dcbefe13ce9ed7885936bd9a9a58b Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 22 Feb 2013 11:10:57 +0100
Subject: ssl: Add missing option and links

---
 lib/ssl/doc/src/ssl.xml     | 11 +++++++++--
 lib/ssl/doc/src/ssl_app.xml |  7 ++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index ab468c8d6b..6979fb5b5e 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -278,11 +278,18 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
 <p> {bad_cert, cert_expired}, {bad_cert, invalid_issuer}, {bad_cert, invalid_signature}, {bad_cert, unknown_ca},{bad_cert, selfsigned_peer}, {bad_cert, name_not_permitted}, {bad_cert, missing_basic_constraint}, {bad_cert, invalid_key_usage}</p>
       </item>
 
+      <tag>{versions, [protocol()]}</tag>
+      <item>TLS protocol versions that will be supported by started clients and servers.
+      This option overrides the application environment option <c>protocol_version</c>. If the
+      environment option is not set it defaults to all versions supported by the SSL application. See also
+      <seealso marker="ssl:ssl_app">ssl(6)</seealso>
+      </item>
+
       <tag>{hibernate_after, integer()|undefined}</tag>
-      <item>When an integer-value is specified, the <code>ssl_connection</code>
+      <item>When an integer-value is specified, the <c>ssl_connection</c>
             will go into hibernation after the specified number of milliseconds
             of inactivity, thus reducing its memory footprint. When
-            <code>undefined</code> is specified (this is the default), the process
+            <c>undefined</c> is specified (this is the default), the process
             will never go into hibernation.
       </item>
     </taglist>
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 84ad483617..0ee5b23e47 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -41,8 +41,9 @@
   <section>
     <title>ENVIRONMENT</title>
     <p>The following application environment configuration parameters
-      are defined for the SSL application. Refer to application(3) for
-      more information about configuration parameters.
+    are defined for the SSL application. See <seealso
+    marker="kernel:application">application(3)</seealso>for more
+    information about configuration parameters.
       </p>
     <p>Note that the environment parameters can be set on the command line,
       for instance,</p>
@@ -87,7 +88,7 @@
 
   <section>
     <title>SEE ALSO</title>
-    <p>application(3)</p>
+	<p><seealso marker="kernel:application">application(3)</seealso></p>
   </section>
   
 </appref>
-- 
cgit v1.2.3