diff options
| author | Hans Nilsson <[email protected]> | 2019-06-26 11:52:00 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-06-26 11:52:00 +0200 |
| commit | 67c4a6f04fd311971e16c4be0511b97cea08d8a6 (patch) | |
| tree | 2f3d6c23525c5766e5804590e4d548748a2d6510 | |
| parent | bf9e4be9ef971da7d7325424dde50d9bc6b186aa (diff) | |
| parent | 1f5bb8b45607b155cf4e4d7ebb84646491982346 (diff) | |
| download | otp-67c4a6f04fd311971e16c4be0511b97cea08d8a6.tar.gz otp-67c4a6f04fd311971e16c4be0511b97cea08d8a6.tar.bz2 otp-67c4a6f04fd311971e16c4be0511b97cea08d8a6.zip | |
Merge branch 'hans/ssh/spec_doc_error/OTP-15820' into maint
* hans/ssh/spec_doc_error/OTP-15820:
ssh: Fix spec/doc error for subsystem_specs
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 1 | ||||
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 3fd6eae423..8b7cb4dcd4 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -347,6 +347,7 @@ <datatype> <name name="subsystem_daemon_option"/> + <name name="subsystem_specs"/> <name name="subsystem_spec"/> <desc> <p>Defines a subsystem in the daemon.</p> diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 54e98ee10e..0014002192 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -312,7 +312,8 @@ | gen_tcp:listen_option() | ?COMMON_OPTION . --type subsystem_daemon_option() :: {subsystems, subsystem_spec()}. +-type subsystem_daemon_option() :: {subsystems, subsystem_specs()}. +-type subsystem_specs() :: [ subsystem_spec() ]. -type shell_daemon_option() :: {shell, mod_fun_args() | 'shell_fun/1'() | 'shell_fun/2'() }. -type 'shell_fun/1'() :: fun((User::string()) -> pid()) . |