Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / CONFIGURE

diff --git a/CONFIGURE b/CONFIGURE
index 7e76ccf91b9ef512cdc4f1e5d684ee3d0a879882..3fbc83e0bc84c82b5c051804fe60e5e5f64cfd51 100644 (file)
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -120,8 +120,9 @@ db
 --
 
 This section is a reference to the configuration options for
-DB_DataObject (see <http://ur1.ca/7xp>). The ones that you may want to
-set are listed below for clarity.
+DB_DataObject (see
+<http://pear.php.net/manual/en/package.database.db-dataobject.intro-configuration.php>).
+The ones that you may want to set are listed below for clarity.
 
 database: a DSN (Data Source Name) for your StatusNet database. This is
     in the format 'protocol://username:password@hostname/databasename',
@@ -322,8 +323,8 @@ server: If set, defines another server where avatars are stored in the
     the client to speed up page loading, either with another
     virtual server or with an NFS or SAMBA share. Clients
     typically only make 2 connections to a single server at a
-    time <http://ur1.ca/6ih>, so this can parallelize the job.
-    Defaults to null.
+    time <https://www.w3.org/Protocols/rfc2616/rfc2616-sec8.html#sec8.1.4>,
+    so this can parallelize the job. Defaults to null.
 ssl: Whether to access avatars using HTTPS. Defaults to null, meaning
     to guess based on site-wide SSL settings.
 
@@ -393,8 +394,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
@@ -497,12 +497,12 @@ Profile management.
 
 biolimit: max character length of bio; 0 means no limit; null means to use
     the site text limit default.
-backup: whether users can backup their own profiles. Defaults to true.
+backup: whether users can backup their own profiles. Defaults to false.
 restore: whether users can restore their profiles from backup files. Defaults
-        to true.
+        to false.
 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
 -------
@@ -583,7 +583,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
@@ -673,7 +673,7 @@ Web crawlers. See http://www.robotstxt.org/ for more information
 on the format of this file.
 
 crawldelay: if non-empty, this value is provided as the Crawl-Delay:
-    for the robots.txt file. see http://ur1.ca/l5a0
+    for the robots.txt file. see <https://en.wikipedia.org/wiki/Robots_exclusion_standard#Crawl-delay_directive>
     for more information. Default is zero, no explicit delay.
 disallow: Array of (virtual) directories to disallow. Default is 'main',
     'search', 'message', 'settings', 'admin'. Ignored when site
@@ -709,7 +709,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
@@ -780,5 +780,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.
-
-