The $options array isn't used here

[quix0rs-gnu-social.git] / CONFIGURE

diff --git a/CONFIGURE b/CONFIGURE
index 141c475563386a255be6e321da67ecd1ffbddea0..d0b6a2448439208c84b18f18b6264272d93eeb3a 100644 (file)
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -444,23 +444,6 @@ user: If set, the daemons will try to change their effective user ID
 group: If set, the daemons will try to change their effective group ID
     to this named group. Again, a name, not a numerical ID.
 
-memcached
----------
-
-You can get a significant boost in performance by caching some
-database data in memcached <http://www.danga.com/memcached/>.
-
-enabled: Set to true to enable. Default false.
-server: a string with the hostname of the memcached server. Can also
-    be an array of hostnames, if you've got more than one server.
-base: memcached uses key-value pairs to store data. We build long,
-    funny-looking keys to make sure we don't have any conflicts. The
-    base of the key is usually a simplified version of the site name
-    (like "Identi.ca" => "identica"), but you can overwrite this if
-    you need to. You can safely ignore it if you only have one
-    StatusNet site using your memcached server.
-port: Port to connect to; defaults to 11211.
-
 emailpost
 ---------
 
@@ -555,6 +538,8 @@ in php.ini to be large enough to handle your upload. In httpd.conf
 (if you're using apache), check that the LimitRequestBody directive isn't
 set too low (it's optional, so it may not be there at all).
 
+process_links: follow redirects and save all available file information
+    (mimetype, date, size, oembed, etc.). Defaults to true.
 file_quota: maximum size for a single file upload in bytes. A user can send
     any amount of notices with attachments as long as each attachment
     is smaller than file_quota.
@@ -578,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
 -----
@@ -592,23 +582,6 @@ desclimit: maximum number of characters to allow in group descriptions.
 addtag: Whether to add a tag for the group nickname for every group post 
        (pre-1.0.x behaviour). Defaults to false.
 
-oembed
---------
-
-oEmbed endpoint for multimedia attachments (links in posts). Will also
-work as 'oohembed' for backwards compatibility.
-
-endpoint: oohembed endpoint using http://oohembed.com/ software. Defaults to
-         'http://oohembed.com/oohembed/'.
-order: Array of methods to check for OEmbed data. Methods include 'built-in'
-       (use a built-in function to simulate oEmbed for some sites),
-       'well-known' (use well-known public oEmbed endpoints),
-       'discovery' (discover using <link> headers in HTML), 'service' (use
-       a third-party service, like oohembed or embed.ly. Default is
-       array('built-in', 'well-known', 'service', 'discovery'). Note that very
-       few sites implement oEmbed; 'discovery' is going to fail 99% of the
-       time.
-
 search
 ------
 
@@ -627,7 +600,7 @@ sessions
 Session handling.
 
 handle: boolean. Whether we should register our own PHP session-handling
-    code (using the database and memcache if enabled). Defaults to false.
+    code (using the database and cache layers if enabled). Defaults to false.
     Setting this to true makes some sense on large or multi-server
     sites, but it probably won't hurt for smaller ones, either.
 debug: whether to output debugging info for session storage. Can help
@@ -659,20 +632,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
 ------
 
@@ -782,11 +741,10 @@ router
 We use a router class for mapping URLs to code. This section controls
 how that router works.
 
-cache: whether to cache the router in memcache (or another caching
-    mechanism). Defaults to true, but may be set to false for
-    developers (who might be actively adding pages, so won't want the
-    router cached) or others who see strange behavior. You're unlikely
-    to need this unless you're a developer.
+cache: whether to cache the router in cache layers. Defaults to true,
+    but may be set to false for developers (who might be actively
+    adding pages, so won't want the router cached) or others who see
+    strange behavior. You're unlikely to need this unless developing..
 
 http
 ----