Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / CONFIGURE

diff --git a/CONFIGURE b/CONFIGURE
index 217b32cc7c98d250b53f46502238016ba96e136e..120db976df82862ae1ee327ca0fa8e638f2f4d4e 100644 (file)
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -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
 -----