Merge branch 'lars/correct-doc-bugs' into maint

5 files changed, 62 insertions, 58 deletions

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index b3f850fc38..850557444d 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2014</year>
+      <year>2004</year><year>2015</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -418,10 +418,10 @@
 	    <c><![CDATA["publickey,keyboard-interactive,password"]]></c></p>
           </item>
 
-	  <tag><c><![CDATA[{auth_method_kb_interactive_data, PromptTexts}]]>
-	  <br/>where:
-	  <br/>PromptTexts = kb_int_tuple()  | fun(Peer::{IP::tuple(),Port::integer()}, User::string(), Service::string()) ->  kb_int_tuple()
-	  <br/>kb_int_tuple() = {Name::string(), Instruction::string(), Prompt::string(), Echo::boolean()}</c>
+	  <tag><c><![CDATA[{auth_method_kb_interactive_data, PromptTexts}]]></c>
+	  <br/><c>where:</c>
+	  <br/><c>PromptTexts = kb_int_tuple()  | fun(Peer::{IP::tuple(),Port::integer()}, User::string(), Service::string()) ->  kb_int_tuple()</c>
+	  <br/><c>kb_int_tuple() = {Name::string(), Instruction::string(), Prompt::string(), Echo::boolean()}</c>
 	  </tag>
 	  <item>
 	    <p>Sets the text strings that the daemon sends to the client for presentation to the user when using <c>keyboar-interactive</c> authentication. If the fun/3 is used, it is called when the actual authentication occurs and may therefore return dynamic data like time, remote ip etc.</p>
@@ -516,29 +516,29 @@
 	  <item>
 	    <p>Provides a function for password validation. This could used for calling an external system or if
 	    passwords should be stored as a hash. The fun returns:
-	      <list type="bulleted">
-		<item><c>true</c> if the user and password is valid and</item>
-		<item><c>false</c> otherwise.</item> 
-	      </list>
 	    </p>
+	    <list type="bulleted">
+	      <item><c>true</c> if the user and password is valid and</item>
+	      <item><c>false</c> otherwise.</item> 
+	    </list>
 	    <p>This fun can also be used to make delays in authentication tries for example by calling
 	      <seealso marker="stdlib:timer#sleep/1">timer:sleep/1</seealso>. To facilitate counting of failed tries
 	      the <c>State</c> variable could be used. This state is per connection only. The first time the pwdfun
 	      is called for a connection, the <c>State</c> variable has the value <c>undefined</c>.  
 	      The pwdfun can return - in addition to the values above - a new state
 	      as:
-	      <list type="bulleted">
-		<item><c>{true,  NewState:any()}</c> if the user and password is valid or</item>
-		<item><c>{false, NewState:any()}</c> if the user or password is invalid</item> 
-	      </list>
 	    </p>
+	    <list type="bulleted">
+	      <item><c>{true,  NewState:any()}</c> if the user and password is valid or</item>
+	      <item><c>{false, NewState:any()}</c> if the user or password is invalid</item> 
+	    </list>
 	    <p>A third usage is to block login attempts from a missbehaving peer. The <c>State</c> described above 
 	    can be used for this. In addition to the responses above, the following return value is introduced:
+	    </p>
 	    <list type="bulleted">
 	      <item><c>disconnect</c> if the connection should be closed immediately after sending a SSH_MSG_DISCONNECT
 	      message.</item>
 	    </list>
-	    </p>
 	  </item>
 
 	  <tag><c><![CDATA[{pwdfun, fun(User::string(), Password::string()) -> boolean()}]]></c></tag>
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml
index 79dd1e210e..f6ce44c015 100644
--- a/lib/ssh/doc/src/ssh_app.xml
+++ b/lib/ssh/doc/src/ssh_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>2012</year><year>2013</year>
+      <year>2012</year><year>2015</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -214,21 +214,21 @@
     <p>The following rfc:s are supported:</p>
     <list type="bulleted">
       <item><url href="https://tools.ietf.org/html/rfc4251">RFC 4251</url>, The Secure Shell (SSH) Protocol Architecture.
-      <p>Except
+      <p>Except</p>
       <list type="bulleted">
 	<item>9.4.6 Host-Based Authentication</item>
 	<item>9.5.2 Proxy Forwarding</item>
 	<item>9.5.3 X11 Forwarding</item>
       </list>
-      </p>
+      <p/>
       </item>
 
       <item><url href="https://tools.ietf.org/html/rfc4252">RFC 4252</url>, The Secure Shell (SSH) Authentication Protocol.
-      <p>Except
+      <p>Except</p>
       <list type="bulleted">
 	<item>9. Host-Based Authentication: "hostbased"</item>
       </list>
-      </p>
+      <p/>
       </item>
 
       <item><url href="https://tools.ietf.org/html/rfc4253">RFC 4253</url>, The Secure Shell (SSH) Transport Layer Protocol.
@@ -236,32 +236,32 @@
       </item>
 
       <item><url href="https://tools.ietf.org/html/rfc4254">RFC 4254</url>, The Secure Shell (SSH) Connection Protocol.
-      <p>Except
+      <p>Except</p>
       <list type="bulleted">
 	<item>6.3. X11 Forwarding</item>
 	<item>7. TCP/IP Port Forwarding</item>
       </list>
-      </p>
+      <p/>
       </item>
 
       <item><url href="https://tools.ietf.org/html/rfc4256">RFC 4256</url>, Generic Message Exchange Authentication for
       the Secure Shell Protocol (SSH).
-      <p>Except
+      <p>Except</p>
       <list type="bulleted">
 	<item><c>num-prompts > 1</c></item>
 	<item>password changing</item>
 	<item>other identification methods than userid-password</item>
 	</list>
-      </p>
+      <p/>
       </item>
 
       <item><url href="https://tools.ietf.org/html/rfc4419">RFC 4419</url>, Diffie-Hellman Group Exchange for
       the Secure Shell (SSH) Transport Layer Protocol.
-       <p></p>
+       <p/>
       </item>
 
       <item><url href="https://tools.ietf.org/html/rfc4716">RFC 4716</url>, The Secure Shell (SSH) Public Key File Format.
-      <p></p>
+      <p/>
       </item>
 
       <item><url href="https://tools.ietf.org/html/rfc5647">RFC 5647</url>, AES Galois Counter Mode for
@@ -270,34 +270,35 @@
       This is resolved by OpenSSH in the ciphers [email protected] and [email protected] which are implemented.
       If the explicit ciphers and macs AEAD_AES_128_GCM or AEAD_AES_256_GCM are needed, 
       they could be enabled with the option preferred_algorithms.
+      </p>
       <warning>
-	If the client or the server is not Erlang/OTP, it is the users responsibility to check that 
-	other implementation has the same interpretation of AEAD_AES_*_GCM as the Erlang/OTP SSH before
-	enabling them. The  aes*[email protected] variants are always safe to use since they lack the
-	ambiguity.
+	<p>
+	  If the client or the server is not Erlang/OTP, it is the users responsibility to check that 
+	  other implementation has the same interpretation of AEAD_AES_*_GCM as the Erlang/OTP SSH before
+	  enabling them. The  aes*[email protected] variants are always safe to use since they lack the
+	  ambiguity.
+	</p>
       </warning>
-      </p>
-      <p>The second paragraph in section 5.1 is resolved as:
+      <p>The second paragraph in section 5.1 is resolved as:</p>
       <list type="ordered">
 	<item>If the negotiated cipher is AEAD_AES_128_GCM, the mac algorithm is set to  AEAD_AES_128_GCM.</item>
 	<item>If the negotiated cipher is AEAD_AES_256_GCM, the mac algorithm is set to  AEAD_AES_256_GCM.</item>
 	<item>If the mac algorithm is AEAD_AES_128_GCM, the cipher is set to AEAD_AES_128_GCM.</item>
 	<item>If the mac algorithm is AEAD_AES_256_GCM, the cipher is set to AEAD_AES_256_GCM.</item>
       </list>
-      The first rule that matches when read in order from the top is applied
-      </p>
+      <p>The first rule that matches when read in order from the top is applied</p>
       </item>
 	
       <item><url href="https://tools.ietf.org/html/rfc5656">RFC 5656</url>, Elliptic Curve Algorithm Integration in 
       the Secure Shell Transport Layer.
-      <p>Except
+      <p>Except</p>
       <list type="bulleted">
 	<item>5.   ECMQV Key Exchange</item>
 	<item>6.4. ECMQV Key Exchange and Verification Method Name</item>
 	<item>7.2. ECMQV Message Numbers</item>
 	<item>10.2. Recommended Curves</item>
       </list>
-      </p>
+      <p/>
       </item>
       
       <item><url href="https://tools.ietf.org/html/rfc6668">RFC 6668</url>, SHA-2 Data Integrity Verification for
diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml
index 064a623eb6..150d46a9a2 100644
--- a/lib/ssh/doc/src/ssh_connection.xml
+++ b/lib/ssh/doc/src/ssh_connection.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2014</year>
+      <year>2015</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -31,15 +31,15 @@
     <rev></rev>
   </header>
   <module>ssh_connection</module>
-  <modulesummary>This module provides API functions to send
-  <url href="http://www.ietf.org/rfc/rfc4254.txt"> SSH Connection Protocol </url>
-  events to the other side of an SSH channel.
+  <modulesummary>
+    This module provides API functions to send SSH Connection Protocol 
+    events to the other side of an SSH channel.
   </modulesummary>
 
   <description>
-    <p>The SSH Connection Protocol is used by clients and servers,
-    that is, SSH channels, to communicate over the SSH connection. The
-    API functions in this module send SSH Connection Protocol events,
+    <p>The <url href="http://www.ietf.org/rfc/rfc4254.txt">SSH Connection Protocol</url> 
+    is used by clients and servers, that is, SSH channels, to communicate over the 
+    SSH connection. The API functions in this module send SSH Connection Protocol events,
     which are received as messages by the remote channel.
     If the receiving channel is an Erlang process, the
     messages have the format
diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml
index efb2c436e8..a0694ca8d9 100644
--- a/lib/ssh/doc/src/ssh_server_key_api.xml
+++ b/lib/ssh/doc/src/ssh_server_key_api.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2012</year>
-      <year>2013</year>
+      <year>2015</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -75,7 +75,7 @@
 	<d>Host key algorithm. Is to support <c>'ssh-rsa' | 'ssh-dss'</c>, but more algorithms
 	can be handled.</d>
 	<v>DaemonOptions = proplists:proplist()</v>
-	<d>Options provided to  <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>.</d>
+	<d>Options provided to <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>.</d>
 	<v>Key = private_key()</v>
 	<d>Private key of the host matching the <c>Algorithm</c>.</d>
 	<v>Reason = term()</v>
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index 17800fac5d..c6ca0f161a 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2005</year><year>2014</year>
+      <year>2005</year><year>2015</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -61,20 +61,23 @@
 
   <funcs>
      <func>
-      <name>apread(ChannelPid, Handle, Position, Len) -> {async, N} | {error, Error}</name>
-      <v>ChannelPid = pid()</v>
-        <v>Handle = term()</v>
-        <v>Position = integer()</v>
-        <v>Len = integer()</v>
-        <v>N = term()</v>
-        <v>Reason = term()</v>
-
-	<desc><p>The <c><![CDATA[apread]]></c> function reads from a specified position,
-	combining the <c><![CDATA[position]]></c> and <c><![CDATA[aread]]></c> functions.</p>
+       <name>apread(ChannelPid, Handle, Position, Len) -> {async, N} | {error, Reason}</name>
+       <fsummary>Reads asynchronously from an open file.</fsummary>
+       <type>
+	 <v>ChannelPid = pid()</v>
+         <v>Handle = term()</v>
+         <v>Position = integer()</v>
+         <v>Len = integer()</v>
+         <v>N = term()</v>
+         <v>Reason = term()</v>
+       </type>
+       
+       <desc><p>The <c><![CDATA[apread]]></c> function reads from a specified position,
+       combining the <c><![CDATA[position]]></c> and <c><![CDATA[aread]]></c> functions.</p>
 	<p><seealso marker="#apread-4">ssh_sftp:apread/4</seealso></p> </desc>
-      </func>
-
-      <func>
+     </func>
+     
+     <func>
 	<name>apwrite(ChannelPid, Handle, Position, Data) -> ok | {error, Reason}</name>
 	<fsummary>Writes asynchronously to an open file.</fsummary>
 	<type>