aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src/ref_man.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-12-14 09:44:10 +0100
committerIngela Anderton Andin <[email protected]>2012-12-14 09:44:10 +0100
commit70892a1e03e441b24f879a9bb5f124defbab2e16 (patch)
treedeb09395eec02ee31efda4415070113a29d89128 /lib/ssh/doc/src/ref_man.xml
parent33124ad120c10e5057f25753a9d4b56f265b53dd (diff)
parent671cf55d2388ef3c30f8e0e6b3e5ec824b02da09 (diff)
downloadotp-70892a1e03e441b24f879a9bb5f124defbab2e16.tar.gz
otp-70892a1e03e441b24f879a9bb5f124defbab2e16.tar.bz2
otp-70892a1e03e441b24f879a9bb5f124defbab2e16.zip
Merge branch 'ia/ssh/add_users_guide/OTP-7786'
* ia/ssh/add_users_guide/OTP-7786: ssh: Document and clean up SSH behaviours ssh: Add Users Guide and enhance man pages ssh: Added User's Guide framework and minor enhancements
Diffstat (limited to 'lib/ssh/doc/src/ref_man.xml')
-rw-r--r--lib/ssh/doc/src/ref_man.xml15
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/ssh/doc/src/ref_man.xml b/lib/ssh/doc/src/ref_man.xml
index 9ab56b28ec..88203b5034 100644
--- a/lib/ssh/doc/src/ref_man.xml
+++ b/lib/ssh/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
<!DOCTYPE application SYSTEM "application.dtd">
<application xmlns:xi="http://www.w3.org/2001/XInclude">
<header>
<copyright>
- <year>2004</year><year>2010</year>
+ <year>2004</year><year>2012</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -22,19 +22,22 @@
</legalnotice>
<title>SSH Reference Manual</title>
- <prepared>Jakob Cederlund</prepared>
- <docno></docno>
+ <prepared>OTP</prepared>
<date>2007-10-06</date>
<rev>%VSN%</rev>
- <file>application.sgml</file>
+ <file>ref_man.xml</file>
</header>
<description>
<p>The SSH application is an erlang implementation of the
- secure shell protocol.</p>
+ secure shell protocol (SSH) as defined by RFC 4250 - 4254</p>
+
</description>
+ <xi:include href="ssh_app.xml"/>
<xi:include href="ssh.xml"/>
<xi:include href="ssh_channel.xml"/>
<xi:include href="ssh_connection.xml"/>
+ <xi:include href="ssh_client_key_api.xml"/>
+ <xi:include href="ssh_server_key_api.xml"/>
<xi:include href="ssh_sftp.xml"/>
<xi:include href="ssh_sftpd.xml"/>
</application>