Merge remote branch 'upstream/maint'

* upstream/maint: Document user_dir for the server
onlyafly · Feb 16, 2012 · ddfe258 · ddfe258
2 parents d158a49 + 815645f
commit ddfe258
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
@@ -234,6 +234,14 @@
 	    option <c>shell</c> which is much less work than implementing
 	    your own cli channel.
 	  </item>
+	  <tag><c><![CDATA[{user_dir, String}]]></c></tag>
+	  <item>
+	    <p>Sets the user directory e.i. the directory containing
+	    ssh configuration files for the user such as
+	    <c><![CDATA[known_hosts]]></c>, <c><![CDATA[id_rsa, id_dsa]]></c> and
+	    <c><![CDATA[authorized_key]]></c>. Defaults to the directory normally
+	    referred to as <c><![CDATA[~/.ssh]]></c> </p>
+	  </item>
           <tag><c><![CDATA[{system_dir, string()}]]></c></tag>
           <item>
             <p>Sets the system directory, containing the host files