Merge branch 'rm-short-urls-docs' into 'nightly'

CONFIGURE: Replace short urls with their target

Transparency and resilience against shorteners going away.

See merge request !101
This commit is contained in:
mmn 2016-02-26 12:38:26 +00:00
commit 5227483855

View File

@ -120,8 +120,9 @@ db
-- --
This section is a reference to the configuration options for This section is a reference to the configuration options for
DB_DataObject (see <http://ur1.ca/7xp>). The ones that you may want to DB_DataObject (see
set are listed below for clarity. <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 database: a DSN (Data Source Name) for your StatusNet database. This is
in the format 'protocol://username:password@hostname/databasename', 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 the client to speed up page loading, either with another
virtual server or with an NFS or SAMBA share. Clients virtual server or with an NFS or SAMBA share. Clients
typically only make 2 connections to a single server at a typically only make 2 connections to a single server at a
time <http://ur1.ca/6ih>, so this can parallelize the job. time <https://www.w3.org/Protocols/rfc2616/rfc2616-sec8.html#sec8.1.4>,
Defaults to null. so this can parallelize the job. Defaults to null.
ssl: Whether to access avatars using HTTPS. Defaults to null, meaning ssl: Whether to access avatars using HTTPS. Defaults to null, meaning
to guess based on site-wide SSL settings. to guess based on site-wide SSL settings.
@ -673,7 +674,7 @@ Web crawlers. See http://www.robotstxt.org/ for more information
on the format of this file. on the format of this file.
crawldelay: if non-empty, this value is provided as the Crawl-Delay: 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://help.yahoo.com/kb/search
for more information. Default is zero, no explicit delay. for more information. Default is zero, no explicit delay.
disallow: Array of (virtual) directories to disallow. Default is 'main', disallow: Array of (virtual) directories to disallow. Default is 'main',
'search', 'message', 'settings', 'admin'. Ignored when site 'search', 'message', 'settings', 'admin'. Ignored when site