diff options
author | Hans Nilsson <[email protected]> | 2018-10-24 10:13:55 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-10-24 10:13:55 +0200 |
commit | 652f844eeb0b1b1fb2d845bf185529b56ba19822 (patch) | |
tree | ff84356b6e7fbe2358b42ed26ce1cb54d3070cec /lib/ssh/doc/src/usersguide.xml | |
parent | 0dc6118fcc1dbb08a35f0064534be98f796f9c8f (diff) | |
parent | cffe913039c4ce0c9702be1f410c2f2967008f68 (diff) | |
download | otp-652f844eeb0b1b1fb2d845bf185529b56ba19822.tar.gz otp-652f844eeb0b1b1fb2d845bf185529b56ba19822.tar.bz2 otp-652f844eeb0b1b1fb2d845bf185529b56ba19822.zip |
Merge branch 'maint'
* maint:
ssh: Re-phrase and adjust the documentation (ssh_file.xml)
ssh: Move some option's documentation to ssh_file user_dir user_dir_fun (missing previously) *_passphrase system_dir
ssh: Clearify a couple of options user_dir, system_dir and *_passphrase are only used in the default callback module ssh_file
ssh: Links updated in ssh.xml
ssh: Add reference manual page for the ssh_file module
ssh: Add new User's Guide chapter about SSH terminology The term "user" means different things in OpenSSH and in Erlang/SSH. This new chapter explains why.
Diffstat (limited to 'lib/ssh/doc/src/usersguide.xml')
-rw-r--r-- | lib/ssh/doc/src/usersguide.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/usersguide.xml b/lib/ssh/doc/src/usersguide.xml index 38ffa48cde..8a4df208d8 100644 --- a/lib/ssh/doc/src/usersguide.xml +++ b/lib/ssh/doc/src/usersguide.xml @@ -36,5 +36,6 @@ </description> <xi:include href="introduction.xml"/> <xi:include href="using_ssh.xml"/> + <xi:include href="terminology.xml"/> <xi:include href="configure_algos.xml"/> </part> |