diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-21 16:15:43 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-21 16:15:43 +0200 |
| commit | f6c6af3b3dfe67f4792ef173f2abee233554f964 (patch) | |
| tree | d6b5eb51bccd73e6f1176a60dcdcb04a13c30595 | |
| parent | a878a3aa43381f0281611fd3a87ce33dcadb785c (diff) | |
| parent | c020cc9494fc364e2d2dca715585b791dc3184d5 (diff) | |
| download | otp-f6c6af3b3dfe67f4792ef173f2abee233554f964.tar.gz otp-f6c6af3b3dfe67f4792ef173f2abee233554f964.tar.bz2 otp-f6c6af3b3dfe67f4792ef173f2abee233554f964.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/doc/src/erlang.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/gen_sctp.xml | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 94adc0c160..7089d2275c 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -2467,7 +2467,7 @@ os_prompt% </pre> fails, a <c>nodedown</c> message is delivered.</p> <p>Nodes connected through hidden connections can be monitored as any other node.</p> - <p>Failure: <c>badarg</c>if the local node is not alive.</p> + <p>Failure: <c>badarg</c> if the local node is not alive.</p> </desc> </func> <func> diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml index 986260638d..dc9e4766a9 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 eb997a8eb5..1e361a4d64 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 |