diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-01 09:24:56 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-01 09:24:56 +0100 |
| commit | 492b8682fdb46f93c0da16e44051787fc064f530 (patch) | |
| tree | 5e40e0f005f98ff61a85122d2ab9111e87f3690c /lib/ssh/doc | |
| parent | 77bf7dfa0cc6d99c426d4057da8446dc51cea7aa (diff) | |
| parent | d27003ba5c5ce962df439a99076a85607b82d746 (diff) | |
| download | otp-492b8682fdb46f93c0da16e44051787fc064f530.tar.gz otp-492b8682fdb46f93c0da16e44051787fc064f530.tar.bz2 otp-492b8682fdb46f93c0da16e44051787fc064f530.zip | |
Merge branch 'tsloughter/ssh_doc_fix/OTP-11449' into maint
* tsloughter/ssh_doc_fix/OTP-11449:
fix private_key type documentation in ssh_server_key_api
Diffstat (limited to 'lib/ssh/doc')
| -rw-r--r-- | lib/ssh/doc/src/ssh_server_key_api.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml index c4562e1211..51e1fc1f2e 100644 --- a/lib/ssh/doc/src/ssh_server_key_api.xml +++ b/lib/ssh/doc/src/ssh_server_key_api.xml @@ -29,7 +29,7 @@ -behaviour(ssh_server_key_api). </modulesummary> <description> - <p> Behaviour describing the API for an SSH server's public key handling.By implementing the callbacks defined + <p> Behaviour describing the API for an SSH server's public key handling. By implementing the callbacks defined in this behavior it is possible to customize the SSH server's public key handling. By default the SSH application implements this behavior with help of the standard openssh files, see <seealso marker="SSH_app"> ssh(6)</seealso>.</p> @@ -44,9 +44,9 @@ <p> boolean() = true | false</p> <p> string() = [byte()]</p> - <p> public_key() = #'RSAPublicKey'{}| {integer(), #'Dss-Parms'{}}| term()</p> - <p> private_key() = #'RSAPublicKey'{}| {integer(), #'Dss-Parms'{}}| term()</p> - <p> public_key_algorithm() = 'ssh-rsa'| 'ssh-dss' | atom()</p> + <p> public_key() = #'RSAPublicKey'{} | {integer(), #'Dss-Parms'{}} | term()</p> + <p> private_key() = #'RSAPrivateKey'{} | #'DSAPrivateKey'{} | term()</p> + <p> public_key_algorithm() = 'ssh-rsa' | 'ssh-dss' | atom()</p> </section> <funcs> @@ -56,7 +56,7 @@ <fsummary>Fetches the hosts private key </fsummary> <type> <v>Algorithm = public_key_algorithm()</v> - <d> Host key algorithm. Should support 'ssh-rsa'| 'ssh-dss' but additional algorithms + <d> Host key algorithm. Should support 'ssh-rsa' | 'ssh-dss' but additional 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> |