Merge branch '0.8.x' into 0.9.x

[quix0rs-gnu-social.git] / config.php.sample

diff --git a/config.php.sample b/config.php.sample
index bd3776a47f4a0620c4a3a3c02e588f58af3d911a..997c9d6b0bccb971157c6cc50f5689fc17419f87 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -38,8 +38,6 @@ $config['site']['path'] = 'statusnet';
 // $config['site']['closed'] = true;
 // Only allow registration for people invited by another user
 // $config['site']['inviteonly'] = true;
-// Only allow registrations and logins through OpenID
-// $config['site']['openidonly'] = true;
 // Make the site invisible to  non-logged-in users
 // $config['site']['private'] = true;
 
@@ -99,9 +97,6 @@ $config['sphinx']['port'] = 3312;
 // $config['xmpp']['public'][] = 'someindexer@example.net';
 // $config['xmpp']['debug'] = false;
 
-// Disable OpenID
-// $config['openid']['enabled'] = false;
-
 // Turn off invites
 // $config['invite']['enabled'] = false;