diff options
| author | Björn Gustavsson <[email protected]> | 2017-02-27 12:49:29 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-02-27 12:49:29 +0100 |
| commit | 2117c9e01ed2949b245c8f41c00cac2619a5041a (patch) | |
| tree | 4a769b51325189cce56bab725b04506fb6c45e55 /lib | |
| parent | 41f08daaa9abf2db6d48a665b876ae2764184858 (diff) | |
| parent | 87d87c57841dc7a295b3e74f807198e34df4adb4 (diff) | |
| download | otp-2117c9e01ed2949b245c8f41c00cac2619a5041a.tar.gz otp-2117c9e01ed2949b245c8f41c00cac2619a5041a.tar.bz2 otp-2117c9e01ed2949b245c8f41c00cac2619a5041a.zip | |
Merge branch 'maint'
* maint:
Documentation: use behaviour(ssh_daemon_channel)
Fix minor typo in compile:forms/1 doc
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compiler/doc/src/compile.xml | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/using_ssh.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml index e6470b938f..ed04dac1c0 100644 --- a/lib/compiler/doc/src/compile.xml +++ b/lib/compiler/doc/src/compile.xml @@ -688,7 +688,7 @@ module.beam: module.erl \ <fsummary>Compiles a list of forms.</fsummary> <desc> <p>Is the same as - <c>forms(File, [verbose,report_errors,report_warnings])</c>. + <c>forms(Forms, [verbose,report_errors,report_warnings])</c>. </p> </desc> </func> diff --git a/lib/ssh/doc/src/using_ssh.xml b/lib/ssh/doc/src/using_ssh.xml index 0861c641c7..864378b640 100644 --- a/lib/ssh/doc/src/using_ssh.xml +++ b/lib/ssh/doc/src/using_ssh.xml @@ -305,7 +305,7 @@ ok = erl_tar:close(HandleRead), <code type="erl" > -module(ssh_echo_server). --behaviour(ssh_subsystem). +-behaviour(ssh_daemon_channel). -record(state, { n, id, |