Merge branch '0.8.x' into 0.9.x

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index c13e28791d98f904e3db4459be6b2ef1d284af3e..ccdd9e674e7ddfd7966fe4f0c404b17aeedd38c0 100644 (file)
--- a/README
+++ b/README
@@ -997,6 +997,9 @@ shorturllength: Length of URL at which URLs in a message exceeding 140
 dupelimit: minimum time allowed for one person to say the same thing
            twice. Default 60s. Anything lower is considered a user
            or UI error.
 dupelimit: minimum time allowed for one person to say the same thing
            twice. Default 60s. Anything lower is considered a user
            or UI error.

+textlimit: default max size for texts in the site. Defaults to 140.
+           0 means no limit. Can be fine-tuned for notices, messages,
+           profile bios and group descriptions.

 
 db
 --
 
 db
 --


@@ -1331,6 +1334,8 @@ banned: an array of usernames and/or profile IDs of 'banned' profiles.
         The site will reject any notices by these users -- they will
         not be accepted at all. (Compare with blacklisted users above,
         whose posts just won't show up in the public stream.)
         The site will reject any notices by these users -- they will
         not be accepted at all. (Compare with blacklisted users above,
         whose posts just won't show up in the public stream.)

+biolimit: max character length of bio; 0 means no limit; null means to use
+          the site text limit default.

 
 newuser
 -------
 
 newuser
 -------


@@ -1427,6 +1432,9 @@ Options for group functionality.
 
 maxaliases: maximum number of aliases a group can have. Default 3. Set
             to 0 or less to prevent aliases in a group.
 
 maxaliases: maximum number of aliases a group can have. Default 3. Set
             to 0 or less to prevent aliases in a group.

+desclimit: maximum number of characters to allow in group descriptions.
+           null (default) means to use the site-wide text limits. 0
+           means no limit.

 
 oohembed
 --------
 
 oohembed
 --------


@@ -1505,6 +1513,24 @@ linkcolor: Hex color of all links.
 backgroundimage: Image to use for the background.
 disposition: Flags for whether or not to tile the background image.
 
 backgroundimage: Image to use for the background.
 disposition: Flags for whether or not to tile the background image.
 

+notice
+------
+
+Configuration options specific to notices.
+
+contentlimit: max length of the plain-text content of a notice.
+              Default is null, meaning to use the site-wide text limit.
+              0 means no limit.
+
+message
+-------
+
+Configuration options specific to messages.
+
+contentlimit: max length of the plain-text content of a message.
+              Default is null, meaning to use the site-wide text limit.
+              0 means no limit.
+

 Plugins
 =======
 
 Plugins
 =======