WP Merge to rev 5499, this is a big one! Test it before you put it live!

Test only, not for production use yet


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 30 insertions, 30 deletions

diff --git a/wp-config-sample.php b/wp-config-sample.php
index b968f59..4ce2736 100644
--- a/wp-config-sample.php
+++ b/wp-config-sample.php
@@ -1,30 +1,30 @@
-<?php
-// ** MySQL settings ** //
-define('DB_NAME', 'wordpress');    // The name of the database
-define('DB_USER', 'username');     // Your MySQL username
-define('DB_PASSWORD', 'password'); // ...and password
-define('DB_HOST', 'localhost');    // 99% chance you won't need to change this value
-define('DB_CHARSET', 'utf8');
-define('DB_COLLATE', '');
-define('VHOST', 'VHOSTSETTING'); 
-$base = 'BASE';
-
-// double check $base
-if( $base == 'BASE' )
-	die( 'Problem in wp-config.php - $base is set to BASE when it should be the path like "/" or "/blogs/"! Please fix it!' );
-// You can have multiple installations in one database if you give each a unique prefix
-$table_prefix  = 'wp_';   // Only numbers, letters, and underscores please!
-
-// Change this to localize WordPress.  A corresponding MO file for the
-// chosen language must be installed to wp-includes/languages.
-// For example, install de.mo to wp-includes/languages and set WPLANG to 'de'
-// to enable German language support.
-define ('WPLANG', '');
-
-define( "WP_USE_MULTIPLE_DB", false );
-
-/* That's all, stop editing! Happy blogging. */
-
-define('ABSPATH', dirname(__FILE__).'/');
-require_once(ABSPATH.'wp-settings.php');
-?>
+<?php

+// ** MySQL settings ** //

+define('DB_NAME', 'wordpress');    // The name of the database

+define('DB_USER', 'username');     // Your MySQL username

+define('DB_PASSWORD', 'password'); // ...and password

+define('DB_HOST', 'localhost');    // 99% chance you won't need to change this value

+define('DB_CHARSET', 'utf8');

+define('DB_COLLATE', '');

+define('VHOST', 'VHOSTSETTING'); 

+$base = 'BASE';

+

+// double check $base

+if( $base == 'BASE' )

+	die( 'Problem in wp-config.php - $base is set to BASE when it should be the path like "/" or "/blogs/"! Please fix it!' );

+// You can have multiple installations in one database if you give each a unique prefix

+$table_prefix  = 'wp_';   // Only numbers, letters, and underscores please!

+

+// Change this to localize WordPress.  A corresponding MO file for the

+// chosen language must be installed to wp-content/languages.

+// For example, install de.mo to wp-content/languages and set WPLANG to 'de'

+// to enable German language support.

+define ('WPLANG', '');

+

+define( "WP_USE_MULTIPLE_DB", false );

+

+/* That's all, stop editing! Happy blogging. */

+

+define('ABSPATH', dirname(__FILE__).'/');

+require_once(ABSPATH.'wp-settings.php');

+?>