X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=config.php.sample;h=87a1977b5f589318d5ad409a6b6f30550ee7ad80;hb=e1129f34d505a0dcfa28ce765c5005ee44d242e3;hp=5c5fb5b539341e2aa7e108feb81ddfdde1883ac1;hpb=bd8506eee883ecd424fdf3d7e545c10c754df6ff;p=quix0rs-gnu-social.git

diff --git a/config.php.sample b/config.php.sample
index 5c5fb5b539..87a1977b5f 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -41,11 +41,17 @@ $config['site']['path'] = 'statusnet';
 // Make the site invisible to  non-logged-in users
 // $config['site']['private'] = true;
 
+// Allow Cross-Origin Resource Sharing (CORS) for service discovery
+// (host-meta, XRD, etc.) Useful for AJAXy client applications. Should
+// probably NOT be on for private / intranet sites but OK for public sites.
+// Default is off.
+// $config['discovery']['cors'] = true;
+
 // If your web server supports X-Sendfile (Apache with mod_xsendfile,
 // lighttpd, nginx), you can enable X-Sendfile support for better
 // performance. Presently, only attachment serving when the site is
 // in private mode will use X-Sendfile.
-// $config['site']['X-Sendfile'] = false;
+// $config['site']['use_x_sendfile'] = false;
 // You may also need to enable X-Sendfile support for your web server and
 // allow it to access files outside of the web root. For Apache with
 // mod_xsendfile, you can add these to your .htaccess or server config:
@@ -124,6 +130,8 @@ $config['sphinx']['port'] = 3312;
 
 // Email info, used for all outbound email
 // $config['mail']['notifyfrom'] = 'microblog@example.net';
+// Domain for generating no-reply and incoming email addresses, if enabled.
+// Defaults to site server name.
 // $config['mail']['domain'] = 'microblog.example.net';
 // See http://pear.php.net/manual/en/package.mail.mail.factory.php for options
 // $config['mail']['backend'] = 'smtp';
@@ -131,8 +139,6 @@ $config['sphinx']['port'] = 3312;
 // 							'host' => 'localhost',
 // 							'port' => 25,
 // 							);
-// For incoming email, if enabled. Defaults to site server name.
-// $config['mail']['domain'] = 'incoming.example.net';
 
 // exponential decay factor for tags, default 10 days
 // raise this if traffic is slow, lower it if it's fast
@@ -182,15 +188,35 @@ $config['sphinx']['port'] = 3312;
 // $config['memcached']['server'] = 'localhost';
 // $config['memcached']['port'] = 11211;
 
+// People tags
+// Maximum number of tags a user can create:
+// $config['peopletag']['maxtags'] = 100;
+// Maximum number of people can have the same tag by the same user
+// $config['peopletag']['maxpeople'] = 500;
+// Types of users one can tag.
+// Everyone.
+// $config['peopletag']['allow_tagging']['all'] = true;
+// Local only.
+// $config['peopletag']['allow_tagging']['local'] = true;
+// Subscriptions / Subscribers only (including remote)
+// $config['peopletag']['allow_tagging']['subs'] = true;
+// Remote.
+// $config['peopletag']['allow_tagging']['remote'] = true;
+// Examples:
+// The following set of options allows tagging local users and
+// remote subscribers / subscription.
+// $config['peopletag']['allow_tagging']['all'] = false;
+// $config['peopletag']['allow_tagging']['local'] = true;
+// $config['peopletag']['allow_tagging']['subs'] = true;
+// Or:
+// $config['peopletag']['allow_tagging'] = array('local' => true, 'subs' =>true);
+
 // Disable post-by-email
 // $config['emailpost']['enabled'] = false;
 
 // Disable SMS
 // $config['sms']['enabled'] = false;
 
-// Disable Twitter integration
-// $config['twitter']['enabled'] = false;
-
 // Twitter integration source attribute. Note: default is StatusNet
 // $config['integration']['source'] = 'StatusNet';
 
@@ -198,9 +224,9 @@ $config['sphinx']['port'] = 3312;
 //
 // NOTE: if you enable this you must also set $config['avatar']['path']
 //
-// $config['twitterbridge']['enabled'] = true;
+// $config['twitterimport']['enabled'] = true;
 
-// Twitter OAuth settings
+// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ
 // $config['twitter']['consumer_key']    = 'YOURKEY';
 // $config['twitter']['consumer_secret'] = 'YOURSECRET';
 
@@ -212,10 +238,6 @@ $config['sphinx']['port'] = 3312;
 // $config['throttle']['count'] = 100;
 // $config['throttle']['timespan'] = 3600;
 
-// List of users banned from posting (nicknames and/or IDs)
-// $config['profile']['banned'][] = 'hacker';
-// $config['profile']['banned'][] = 12345;
-
 // Config section for the built-in Facebook application
 // $config['facebook']['apikey'] = 'APIKEY';
 // $config['facebook']['secret'] = 'SECRET';