From 787dfe7cdec35d43f5f88311b60b6288e39e7ffb Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 13 Nov 2013 15:05:50 +0100
Subject: ftp: Add ftps documentation

---
 lib/inets/doc/src/ftp.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/inets/doc/src')

diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
index f8f11ec705..ac14d3f274 100644
--- a/lib/inets/doc/src/ftp.xml
+++ b/lib/inets/doc/src/ftp.xml
@@ -547,15 +547,14 @@
 	<v>Opts = options()</v>
 	<v>options() = [option()]</v>
 	<v>option() = start_option() | open_option()</v>
-	<!-- <v>start_options() = [start_option()]</v> -->
 	<v>start_option() = {verbose, verbose()} | {debug, debug()}</v>
 	<v>verbose() = boolean() (defaults to false)</v>
 	<v>debug() = disable | debug | trace (defaults to disable)</v>
-	<!-- <v>open_options() = [open_option()]</v> -->
-	<v>open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {timeout, timeout()} | {dtimeout, dtimeout()} | {progress, progress()}</v>
+	<v>open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {tls, tls_options()} | {timeout, timeout()} | {dtimeout, dtimeout()} | {progress, progress()}</v>
 	<v>ipfamily() = inet | inet6 | inet6fb4 (defaults to inet)</v>
 	<v>port() = integer() > 0 (defaults to 21)</v>
 	<v>mode() = active | passive (defaults to passive)</v>
+	<v>tls_options() = [<seealso marker="ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
 	<v>timeout() = integer() > 0 (defaults to 60000 milliseconds)</v>
 	<v>dtimeout() = integer() > 0 | infinity (defaults to infinity)</v>
 	<v>pogress() = ignore | {module(), function(), initial_data()} (defaults to ignore)</v>
@@ -570,6 +569,9 @@
           (without the inets service framework) and 
           open a session with the FTP server at <c>Host</c>. </p>
 
+	<p>If the option <c>{tls, tls_options()}</c> is present, the ftp session will be transported over tls (ftps, see RFC 4217). The list <c>tls_options()</c> may be empty. The function <seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> is used for establishing both the control connection and the data sessions.
+	</p>
+
         <p>A session opened in this way, is closed using the 
           <seealso marker="#close">close</seealso> function. </p>
 
-- 
cgit v1.2.3


From 38a6bfa58009e4106e0f7243a7ec36504fe736f5 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 19 Nov 2013 11:40:56 +0100
Subject: ftp: Add documentation.

---
 lib/inets/doc/src/ftp.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/inets/doc/src')

diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
index ac14d3f274..c6e37dc539 100644
--- a/lib/inets/doc/src/ftp.xml
+++ b/lib/inets/doc/src/ftp.xml
@@ -569,7 +569,7 @@
           (without the inets service framework) and 
           open a session with the FTP server at <c>Host</c>. </p>
 
-	<p>If the option <c>{tls, tls_options()}</c> is present, the ftp session will be transported over tls (ftps, see RFC 4217). The list <c>tls_options()</c> may be empty. The function <seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> is used for establishing both the control connection and the data sessions.
+	<p>If the option <c>{tls, tls_options()}</c> is present, the ftp session will be transported over tls (ftps, see RFC 4217). The list <c>tls_options()</c> may be empty. The function <seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> is used for securing both the control connection and the data sessions.
 	</p>
 
         <p>A session opened in this way, is closed using the 
-- 
cgit v1.2.3


From 5b10a6c858dc1e311af82f554abebd34108c6cce Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 19 Nov 2013 12:09:05 +0100
Subject: ftp: Linking rfc-refs.

---
 lib/inets/doc/src/ftp.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/inets/doc/src')

diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
index c6e37dc539..d528c2bb28 100644
--- a/lib/inets/doc/src/ftp.xml
+++ b/lib/inets/doc/src/ftp.xml
@@ -569,7 +569,8 @@
           (without the inets service framework) and 
           open a session with the FTP server at <c>Host</c>. </p>
 
-	<p>If the option <c>{tls, tls_options()}</c> is present, the ftp session will be transported over tls (ftps, see RFC 4217). The list <c>tls_options()</c> may be empty. The function <seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> is used for securing both the control connection and the data sessions.
+	<p>If the option <c>{tls, tls_options()}</c> is present, the ftp session will be transported over tls (ftps, see 
+<url href="http://www.ietf.org/rfc/rfc4217.txt">RFC 4217</url>). The list <c>tls_options()</c> may be empty. The function <seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> is used for securing both the control connection and the data sessions.
 	</p>
 
         <p>A session opened in this way, is closed using the 
@@ -817,8 +818,7 @@
         <p>Sets the file transfer type to <c>ascii</c> or <c>binary</c>. When
           an ftp session is opened, the default transfer type of the
           server is used, most often <c>ascii</c>, which is the default
-          according to RFC 959.</p>
-
+          according to <url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>.</p>
        <marker id="user3"></marker>
       </desc>
     </func>
@@ -945,7 +945,7 @@
   <section>
     <title>SEE ALSO</title>
     <p>file, filename, J. Postel and J. Reynolds: File Transfer Protocol
-      (RFC 959).
+      (<url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>).
       </p>
   </section>
   
-- 
cgit v1.2.3


From 0d57daec5738447eb033681834146bf31dfd266c Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 19 Nov 2013 16:05:24 +0100
Subject: ftp,ssl: Fixes broken type link (ssloption).

---
 lib/inets/doc/src/ftp.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/inets/doc/src')

diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
index d528c2bb28..4d559817c4 100644
--- a/lib/inets/doc/src/ftp.xml
+++ b/lib/inets/doc/src/ftp.xml
@@ -554,7 +554,7 @@
 	<v>ipfamily() = inet | inet6 | inet6fb4 (defaults to inet)</v>
 	<v>port() = integer() > 0 (defaults to 21)</v>
 	<v>mode() = active | passive (defaults to passive)</v>
-	<v>tls_options() = [<seealso marker="ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
+	<v>tls_options() = [<seealso marker="ssl:ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
 	<v>timeout() = integer() > 0 (defaults to 60000 milliseconds)</v>
 	<v>dtimeout() = integer() > 0 | infinity (defaults to infinity)</v>
 	<v>pogress() = ignore | {module(), function(), initial_data()} (defaults to ignore)</v>
-- 
cgit v1.2.3