diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-28 10:45:29 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-28 10:45:29 +0100 |
| commit | e9bd9d3cec027bf6147af8355f3faff330602a45 (patch) | |
| tree | bb688d5037d99c73aa4fc9268c004e23b14ac7ef | |
| parent | 1265cf07e3c4f1cf10fb2541951eae7ff35d25b4 (diff) | |
| parent | f67ee57b37c0f7d819781dc23230048cc776532b (diff) | |
| download | otp-e9bd9d3cec027bf6147af8355f3faff330602a45.tar.gz otp-e9bd9d3cec027bf6147af8355f3faff330602a45.tar.bz2 otp-e9bd9d3cec027bf6147af8355f3faff330602a45.zip | |
Merge branch 'fredrik/ssh/dialyzer-and-doc'
* fredrik/ssh/dialyzer-and-doc:
Fixed some broken links in ssh doc
Fixed some ssh documentation
| -rw-r--r-- | lib/ssh/doc/src/introduction.xml | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/ssh_client_key_api.xml | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/ssh_sftpd.xml | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/using_ssh.xml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssh/doc/src/introduction.xml b/lib/ssh/doc/src/introduction.xml index ae75414999..e76aa20d64 100644 --- a/lib/ssh/doc/src/introduction.xml +++ b/lib/ssh/doc/src/introduction.xml @@ -48,7 +48,7 @@ <section> <title>Prerequisites</title> - <p>It is assumed that the reader is familiar with the concepts of <seealso marker="doc/design_principals:des_princ">OTP</seealso> + <p>It is assumed that the reader is familiar with the concepts of <seealso marker="doc/design_principles:des_princ">OTP</seealso> and has a basic understanding of <url href="http://en.wikipedia.org/wiki/Public-key_cryptography">public keys</url>.</p> </section> diff --git a/lib/ssh/doc/src/ssh_client_key_api.xml b/lib/ssh/doc/src/ssh_client_key_api.xml index 929b71414f..b9b1ec4efa 100644 --- a/lib/ssh/doc/src/ssh_client_key_api.xml +++ b/lib/ssh/doc/src/ssh_client_key_api.xml @@ -63,7 +63,7 @@ <d> Normally an RSA or DSA public key but handling of other public keys can be added</d> <v>ConnectOptions = proplists:proplist() </v> - <d>Options provided to <seealso marker="ssh#connect">ssh:connect/[3,4]</seealso></d> + <d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso></d> <v>Reason = term() </v> </type> <desc> diff --git a/lib/ssh/doc/src/ssh_sftpd.xml b/lib/ssh/doc/src/ssh_sftpd.xml index 748e24d44b..a73d6e52d4 100644 --- a/lib/ssh/doc/src/ssh_sftpd.xml +++ b/lib/ssh/doc/src/ssh_sftpd.xml @@ -61,7 +61,7 @@ <item> <p>Determines which module to call for accessing the file server. The default value is <c>ssh_sftpd_file</c> that uses the - <seealso marker="kernel:file">file</seealso> and <seealso marker="kernel:filelib">filelib</seealso> API:s to access the standard OTP file + <seealso marker="kernel:file">file</seealso> and <seealso marker="stdlib:filelib">filelib</seealso> API:s to access the standard OTP file server. This option may be used to plug in other file servers.</p> </item> diff --git a/lib/ssh/doc/src/using_ssh.xml b/lib/ssh/doc/src/using_ssh.xml index c3bb7a22aa..c994c1c56c 100644 --- a/lib/ssh/doc/src/using_ssh.xml +++ b/lib/ssh/doc/src/using_ssh.xml @@ -29,7 +29,7 @@ <section> <title> General information</title> <p>The examples in the following sections use the utility function - <seealso marker="ssh:start"> ssh:start/0 </seealso> that starts + <seealso marker="ssh#start-0"> ssh:start/0 </seealso> that starts all needed applications (crypto, public_key and ssh). All examples are run in an Erlang shell, or in a bash shell using openssh to illustrate how the erlang ssh application can be used. The @@ -70,7 +70,7 @@ <p> The option system_dir must be a directory containing a host key file and it defaults to /etc/ssh. For details see section Configuration Files in <seealso - marker="ssh_app#">ssh(6)</seealso>. + marker="SSH_app">ssh(6)</seealso>. </p> <note><p>Normally the /etc/ssh directory is only readable by root. </p> |