diff options
| author | Hans Bolinder <[email protected]> | 2015-11-18 08:34:59 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2015-11-18 08:34:59 +0100 |
| commit | 2e3a11d68f2b57a5fe09eb73a20407508a9567d0 (patch) | |
| tree | 4afa097de7df4d43979cb509e7d03ed381df2c13 /lib/ssh | |
| parent | fa2438389769a65dbd12caea0d7ab6510bbe0e42 (diff) | |
| parent | ea4114d5d4156bae207788e5be7d0157e32adfe9 (diff) | |
| download | otp-2e3a11d68f2b57a5fe09eb73a20407508a9567d0.tar.gz otp-2e3a11d68f2b57a5fe09eb73a20407508a9567d0.tar.bz2 otp-2e3a11d68f2b57a5fe09eb73a20407508a9567d0.zip | |
Merge branch 'maint'
* maint:
[crypto] Correct documentation
[compiler] Correct documentation
[ssh] Correct documentation
[snmp] Correct documentation
[eunit] Correct documentation
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 10 | ||||
| -rw-r--r-- | lib/ssh/doc/src/using_ssh.xml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index bb111c8e0e..012d7051eb 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2004</year><year>2014</year> + <year>2004</year><year>2015</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -216,9 +216,9 @@ <p> Thanks to Simon Cornish</p> <p> - Own Id: OTP-12760 Aux Id: <a + Own Id: OTP-12760 Aux Id: <url href="https://github.com/erlang/otp/pull/715">pull req - 715</a> </p> + 715</url> </p> </item> <item> <p> @@ -384,13 +384,13 @@ </item> <item> <p> - Made Codenomicon Defensics test suite pass: <list> + Made Codenomicon Defensics test suite pass:</p> <list> <item>limit number of algorithms in kexinit message</item> <item>check 'e' and 'f' parameters in kexdh</item> <item>implement 'keyboard-interactive' user authentication on server side</item> <item> return plain text message to bad version exchange message</item> - </list></p> + </list> <p> Own Id: OTP-12784</p> </item> diff --git a/lib/ssh/doc/src/using_ssh.xml b/lib/ssh/doc/src/using_ssh.xml index 91185a0f6e..2d045fdb60 100644 --- a/lib/ssh/doc/src/using_ssh.xml +++ b/lib/ssh/doc/src/using_ssh.xml @@ -234,7 +234,7 @@ <title>SFTP Client with TAR Compression and Encryption</title> <p>Example of writing and then reading a tar file follows:</p> - <code type="erlang"> + <code type="erl"> {ok,HandleWrite} = ssh_sftp:open_tar(ChannelPid, ?tar_file_name, [write]), ok = erl_tar:add(HandleWrite, .... ), ok = erl_tar:add(HandleWrite, .... ), @@ -249,7 +249,7 @@ </code> <p>The previous write and read example can be extended with encryption and decryption as follows:</p> - <code type="erlang"> + <code type="erl"> %% First three parameters depending on which crypto type we select: Key = <<"This is a 256 bit key. abcdefghi">>, Ivec0 = crypto:rand_bytes(16), |