Merge commit 'origin/0.9.x' into 0.9.x

This commit is contained in:
Brenda Wallace
2009-12-08 23:45:54 +00:00
195 changed files with 23402 additions and 4604 deletions

View File

@@ -154,7 +154,7 @@ $config['sphinx']['port'] = 3312;
// $config['queue']['subsystem'] = 'stomp';
// $config['queue']['stomp_server'] = 'tcp://localhost:61613';
// use different queue_basename for each statusnet instance managed by the server
// $config['queue']['queue_basename'] = 'statusnet';
// $config['queue']['queue_basename'] = '/queue/statusnet/';
// The following customise the behaviour of the various daemons:
// $config['daemon']['piddir'] = '/var/run';
@@ -236,6 +236,11 @@ $config['sphinx']['port'] = 3312;
// Use a different hostname for SSL-encrypted pages
// $config['site']['sslserver'] = 'secure.example.org';
// Indent HTML and XML
// Enable (default) for easier to read markup for developers,
// disable to save some bandwidth.
// $config['site']['indent'] = true;
// If you have a lot of status networks on the same server, you can
// store the site data in a database and switch as follows
// Status_network::setupDB('localhost', 'statusnet', 'statuspass', 'statusnet');