diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-21 16:09:13 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-21 16:09:13 +0200 |
| commit | c020cc9494fc364e2d2dca715585b791dc3184d5 (patch) | |
| tree | 876bc6a167f3d268c5fee3a9217111e0040f0979 /lib | |
| parent | 9676a78c5cdeeea311048a7d9630f333811747d1 (diff) | |
| parent | 20363d9af0f0f9446d3a1dfb099f4aa1898dc231 (diff) | |
| download | otp-c020cc9494fc364e2d2dca715585b791dc3184d5.tar.gz otp-c020cc9494fc364e2d2dca715585b791dc3184d5.tar.bz2 otp-c020cc9494fc364e2d2dca715585b791dc3184d5.zip | |
Merge branch 'mhssler/fix-doc-typos/OTP-11414' into maint
* mhssler/fix-doc-typos/OTP-11414:
Fix ssh doc typos
Fix gen_sctp doc typo
Fix erts erlang.xml doc typo
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/doc/src/gen_sctp.xml | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml index 7ea58fffff..33f1c20608 100644 --- a/lib/kernel/doc/src/gen_sctp.xml +++ b/lib/kernel/doc/src/gen_sctp.xml @@ -322,7 +322,7 @@ <p> Branch off an existing association <anno>Assoc</anno> in a socket <anno>Socket</anno> of type <c>seqpacket</c> - (one-to-may style) into + (one-to-many style) into a new socket <anno>NewSocket</anno> of type <c>stream</c> (one-to-one style). </p> diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 141d3df38e..fb58a4b014 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -141,7 +141,7 @@ <p>Sets the preferred public key algorithm to use for user authentication. If the the preferred algorithm fails for some reason, the other algorithm is tried. The default is - to try <c><![CDATA[ssh_rsa]]></c> first.</p> + to try <c><![CDATA['ssh-rsa']]></c> first.</p> </item> <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag> <item> @@ -248,7 +248,7 @@ requested by the client. Default is to use the erlang shell: <c><![CDATA[{shell, start, []}]]></c> </item> - <tag><c><![CDATA[{ssh_cli,{channel_callback(), + <tag><c><![CDATA[{ssh_cli, {channel_callback(), channel_init_args()}}]]></c></tag> <item> Provides your own cli implementation, i.e. a channel callback |