Merge branch 'configure-docs' into 'nightly'

Add a few missing 'attachments' config options

show_thumbs
show_html
filename_base

See merge request !27
This commit is contained in:
mmn 2015-09-03 16:11:28 +00:00
commit 57c87088d4
1 changed files with 5 additions and 0 deletions

View File

@ -563,6 +563,11 @@ sslserver: if specified, this server will be used when creating HTTPS
sslpath: if this and the sslserver are specified, this path will be used
when creating HTTPS URLs. Otherwise, the attachments|path value
will be used.
show_thumbs: show thumbnails in notice lists for uploaded images, and photos
and videos linked remotely that provide oEmbed info. Defaults to true.
show_html: show (filtered) text/html attachments (and oEmbed HTML etc.).
Doesn't affect AJAX calls. Defaults to false.
filename_base: for new files, choose one: 'upload', 'hash'. Defaults to hash.
group
-----