diff options
| author | Hans Nilsson <[email protected]> | 2018-10-24 10:13:30 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-10-24 10:13:30 +0200 |
| commit | cffe913039c4ce0c9702be1f410c2f2967008f68 (patch) | |
| tree | e397c652167532569c0b45c839ce3389ce47a0ff /lib/ssh/doc/src/Makefile | |
| parent | 01afc36575fcfd25235245475bc44e9c242127bd (diff) | |
| parent | 4f80074408ca5d21a56b0b234ff7434c8d155836 (diff) | |
| download | otp-cffe913039c4ce0c9702be1f410c2f2967008f68.tar.gz otp-cffe913039c4ce0c9702be1f410c2f2967008f68.tar.bz2 otp-cffe913039c4ce0c9702be1f410c2f2967008f68.zip | |
Merge branch 'hans/ssh/document_user/OTP-15314' into maint
* hans/ssh/document_user/OTP-15314:
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/Makefile')
| -rw-r--r-- | lib/ssh/doc/src/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile index 77fa356092..4e32dd9976 100644 --- a/lib/ssh/doc/src/Makefile +++ b/lib/ssh/doc/src/Makefile @@ -45,6 +45,7 @@ XML_REF3_FILES = \ ssh_connection.xml \ ssh_server_channel.xml \ ssh_server_key_api.xml \ + ssh_file.xml \ ssh_sftp.xml \ ssh_sftpd.xml \ @@ -56,8 +57,8 @@ XML_CHAPTER_FILES = \ notes.xml \ introduction.xml \ using_ssh.xml \ + terminology.xml \ configure_algos.xml -# ssh_protocol.xml \ BOOK_FILES = book.xml |