Merge pull request #795 from Arantor/release-2.1

! There's no point in having those settings there because if you change ...

Sources/ManageServer.php

@@ -210,11 +210,6 @@ function ModifyDatabaseSettings($return_config = false)
 		OR an empty string for a horizontal rule.
 		OR a string for a titled section. */
 	$config_vars = array(
-		array('db_server', $txt['database_server'], 'file', 'text'),
-		array('db_user', $txt['database_user'], 'file', 'text'),
-		array('db_passwd', $txt['database_password'], 'file', 'password'),
-		array('db_name', $txt['database_name'], 'file', 'text'),
-		array('db_prefix', $txt['database_prefix'], 'file', 'text'),
 		array('db_persist', $txt['db_persist'], 'file', 'check', null, 'db_persist'),
 		array('db_error_send', $txt['db_error_send'], 'file', 'check'),
 		array('ssi_db_user', $txt['ssi_db_user'], 'file', 'text', null, 'ssi_db_user'),

Themes/default/languages/Admin.english.php

@@ -66,13 +66,8 @@ $txt['zero_for_no_limit'] = '(0 for no limit)';
 $txt['zero_to_disable'] = '(0 to disable)';
 
 $txt['admin_backup_fail'] = 'Failed to make backup of Settings.php - make sure Settings_bak.php exists and is writable.';
-$txt['database_server'] = 'Database Server';
-$txt['database_user'] = 'Database Username';
-$txt['database_password'] = 'Database Password';
-$txt['database_name'] = 'Database Name';
 $txt['registration_agreement'] = 'Registration Agreement';
 $txt['registration_agreement_desc'] = 'This agreement is shown when a user registers an account on this forum and has to be accepted before users can continue registration.';
-$txt['database_prefix'] = 'Database Tables Prefix';
 $txt['errors_list'] = 'Listing of forum errors';
 $txt['errors_found'] = 'The following errors are fouling up your forum';
 $txt['errors_fix'] = 'Would you like to attempt to fix these errors?';