X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CONFIGURE;h=25af3813323bab6710401d662922d9cc57e6a1ec;hb=11c57e7aee073f7587e0594577da385e85f168bc;hp=217b32cc7c98d250b53f46502238016ba96e136e;hpb=d4bdfc2aa27a592427632050807a0d583b595d96;p=quix0rs-gnu-social.git

diff --git a/CONFIGURE b/CONFIGURE
index 217b32cc7c..25af381332 100644
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -100,6 +100,10 @@ ssl: Whether to use SSL and https:// URLs for some or all pages.
     (don't use it for any pages), or 'sometimes' (use it for
     sensitive pages that include passwords like login and registration,
     but not for regular pages). Default to 'never'.
+sslproxy: Whether to force GNUsocial to think it is HTTPS when the
+    server gives no such information. I.e. when you're using a reverse
+    proxy that adds the encryption layer but the webserver that runs PHP
+    isn't configured with a key and certificate.
 sslserver: use an alternate server name for SSL URLs, like
     'secure.example.org'. You should be careful to set cookie
     parameters correctly so that both the SSL server and the
@@ -389,8 +393,7 @@ resource: a unique identifier for the connection to the server. This
     is actually used as a prefix for each XMPP component in the system.
 password: password for the user account.
 host: some XMPP domains are served by machines with a different
-    hostname. (For example, @gmail.com GTalk users connect to
-    talk.google.com). Set this to the correct hostname if that's the
+    hostname. Set this to the correct hostname if that's the
     case with your server.
 encryption: Whether to encrypt the connection between StatusNet and the
     XMPP server. Defaults to true, but you can get
@@ -498,7 +501,7 @@ restore: whether users can restore their profiles from backup files. Defaults
 	 to true.
 delete: whether users can delete their own accounts. Defaults to false.
 move: whether users can move their accounts to another server. Defaults
-      to true.	 
+      to true.
 
 newuser
 -------
@@ -563,6 +566,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
 -----
@@ -574,7 +582,7 @@ maxaliases: maximum number of aliases a group can have. Default 3. Set
 desclimit: maximum number of characters to allow in group descriptions.
     null (default) means to use the site-wide text limits. 0
     means no limit.
-addtag: Whether to add a tag for the group nickname for every group post 
+addtag: Whether to add a tag for the group nickname for every group post
 	(pre-1.0.x behaviour). Defaults to false.
 
 search
@@ -601,23 +609,6 @@ handle: boolean. Whether we should register our own PHP session-handling
 debug: whether to output debugging info for session storage. Can help
     with weird session bugs, sometimes. Default false.
 
-background
-----------
-
-Users can upload backgrounds for their pages; this section defines
-their use.
-
-server: the server to use for background. Using a separate (even
-    virtual) server for this can speed up load times. Default is
-    null; same as site server.
-dir: directory to write backgrounds too. Default is '/background/'
-    subdir of install dir.
-path: path to backgrounds. Default is sub-path of install path; note
-    that you may need to change this if you change site-path too.
-sslserver: SSL server to use when page is HTTPS-encrypted. If
-    unspecified, site ssl server and so on will be used.
-sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
-
 ping
 ----
 
@@ -627,20 +618,6 @@ notify third-party servers of updates.
 notify: an array of URLs for ping endpoints. Default is the empty
     array (no notification).
 
-design
-------
-
-Default design (colors and background) for the site. Actual appearance
-depends on the theme.  Null values mean to use the theme defaults.
-
-backgroundcolor: Hex color of the site background.
-contentcolor: Hex color of the content area background.
-sidebarcolor: Hex color of the sidebar background.
-textcolor: Hex color of all non-link text.
-linkcolor: Hex color of all links.
-backgroundimage: Image to use for the background.
-disposition: Flags for whether or not to tile the background image.
-
 notice
 ------
 
@@ -731,7 +708,7 @@ external: external links in notices. One of three values: 'sometimes',
 url
 ---
 
-These are some options for fine-tuning how and when the server will 
+These are some options for fine-tuning how and when the server will
 shorten URLs.
 
 shortener: URL shortening service to use by default. Users can override
@@ -802,5 +779,3 @@ oldschool
 enabled: enable certain old-style user settings options, like stream-only mode,
 	 conversation trees, and nicknames in streams. Off by default, and
 	 may not be well supported in future versions.
-
-