Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / CONFIGURE

diff --git a/CONFIGURE b/CONFIGURE
index 8abc0513a980b8dc1abb4f70bce4f4783586aa24..217b32cc7c98d250b53f46502238016ba96e136e 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
 ---------
 
@@ -549,16 +532,14 @@ supported: an array of mime types you accept to store and distribute,
     setup your server to properly recognize the types you want to
     support.
 uploads: false to disable uploading files with notices (true by default).
-filecommand: The required MIME_Type library may need to use the 'file'
-    command. It tries the one in the Web server's path, but if
-    you're having problems with uploads, try setting this to the
-    correct value. Note: 'file' must accept '-b' and '-i' options.
 
 For quotas, be sure you've set the upload_max_filesize and post_max_size
 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.
@@ -577,9 +558,6 @@ path: URL path, relative to the server, to find files. Defaults to
     main path + '/file/'.
 ssl: whether to use HTTPS for file URLs. Defaults to null, meaning to
     guess based on other SSL settings.
-filecommand: command to use for determining the type of a file. May be
-    skipped if fileinfo extension is installed. Defaults to
-    '/usr/bin/file'.
 sslserver: if specified, this server will be used when creating HTTPS
     URLs. Otherwise, the site SSL server will be used, with /file/ path.
 sslpath: if this and the sslserver are specified, this path will be used
@@ -599,23 +577,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
 ------
 
@@ -634,7 +595,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
@@ -789,11 +750,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
 ----