X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CONFIGURE;h=c4a43a3dc8cdc904ead250776147e308fcf94445;hb=c6bdafb3d081af001148ea743730d6d927b2b9cd;hp=285ccd11b350bfb26c2f926c9473ba8912237383;hpb=31d056029461c5f61e0667ab6f80c21a505e36cc;p=quix0rs-gnu-social.git

diff --git a/CONFIGURE b/CONFIGURE
index 285ccd11b3..c4a43a3dc8 100644
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -532,32 +532,6 @@ welcome: nickname of a user account that sends welcome messages to new
 If either of these special user accounts are specified, the users should
 be created before the configuration is updated.
 
-snapshot
---------
-
-The software will, by default, send statistical snapshots about the
-local installation to a stats server on the status.net Web site. This
-data is used by the developers to prioritize development decisions. No
-identifying data about users or organizations is collected. The data
-is available to the public for review. Participating in this survey
-helps StatusNet developers take your needs into account when updating
-the software.
-
-run: string indicating when to run the statistics. Values can be 'web'
-    (run occasionally at Web time), 'cron' (run from a cron script),
-    or 'never' (don't ever run). If you set it to 'cron', remember to
-    schedule the script to run on a regular basis.
-frequency: if run value is 'web', how often to report statistics.
-    Measured in Web hits; depends on how active your site is.
-    Default is 10000 -- that is, one report every 10000 Web hits,
-    on average.
-reporturl: URL to post statistics to. Defaults to StatusNet developers'
-    report system, but if they go evil or disappear you may
-    need to update this to another value. Note: if you
-    don't want to report stats, it's much better to
-    set 'run' to 'never' than to set this value to something
-    nonsensical.
-
 attachments
 -----------
 
@@ -794,14 +768,14 @@ external: external links in notices. One of three values: 'sometimes',
 url
 ---
 
-Everybody loves URL shorteners. These are some options for fine-tuning
-how and when the server shortens URLs.
+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
-           individually. 'ur1.ca' by default.
-maxlength: If an URL is strictly longer than this limit, it will be
+           individually. 'internal' by default.
+maxurllength: If an URL is strictly longer than this limit, it will be
            shortened. Note that the URL shortener service may return an
-           URL longer than this limit. Defaults to 25. Users can
+           URL longer than this limit. Defaults to 100. Users can
            override. If set to 0, all URLs will be shortened.
 maxnoticelength: If a notice is strictly longer than this limit, all
            URLs in the notice will be shortened. Users can override.
@@ -859,3 +833,12 @@ performance
 high: if you need high performance, or if you're seeing bad
       performance, set this to true. It will turn off some high-intensity code from
       the site.
+
+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.
+
+