Wordpress 3.3-scripts2

[autoinstalls/wordpress.git] / wp-config.php

diff --git a/wp-config.php b/wp-config.php
index 6b63b8c910f3a3114d902ba168444a6a653a4d6b..c0b15cc6a1f66b767b75fd831870abc311caad3a 100644 (file)
--- a/wp-config.php
+++ b/wp-config.php
@@ -1,10 +1,10 @@
 <?php\r
 <?php\r

-/** \r
+/**\r

  * The base configurations of the WordPress.\r
  *\r
  * This file has the following configurations: MySQL settings, Table Prefix,\r
  * The base configurations of the WordPress.\r
  *\r
  * This file has the following configurations: MySQL settings, Table Prefix,\r

- * Secret Keys, WordPress Language, and ABSPATH. You can find more information by\r
- * visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing\r
+ * Secret Keys, WordPress Language, and ABSPATH. You can find more information\r
+ * by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing\r

  * wp-config.php} Codex page. You can get the MySQL settings from your web host.\r
  *\r
  * This file is used by the wp-config.php creation script during the\r
  * wp-config.php} Codex page. You can get the MySQL settings from your web host.\r
  *\r
  * This file is used by the wp-config.php creation script during the\r


@@ -34,18 +34,23 @@ define('DB_CHARSET', 'utf8');
 define('DB_COLLATE', '');\r
 \r
 /**#@+\r
 define('DB_COLLATE', '');\r
 \r
 /**#@+\r

- * Authentication Unique Keys.\r
+ * Authentication Unique Keys and Salts.\r

  *\r
  * Change these to different unique phrases!\r
  *\r
  * Change these to different unique phrases!\r

- * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/ WordPress.org secret-key service}\r
+ * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}\r

  * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.\r
  *\r
  * @since 2.6.0\r
  */\r
  * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.\r
  *\r
  * @since 2.6.0\r
  */\r

-define('AUTH_KEY', WIZARD_AUTH_KEY);\r
-define('SECURE_AUTH_KEY', WIZARD_SECURE_AUTH_KEY);\r
-define('LOGGED_IN_KEY', WIZARD_LOGGED_IN_KEY);\r
-define('NONCE_KEY', WIZARD_NONCE_KEY);\r
+define('AUTH_KEY',         WIZARD_AUTH_KEY);\r
+define('SECURE_AUTH_KEY',  WIZARD_SECURE_AUTH_KEY);\r
+define('LOGGED_IN_KEY',    WIZARD_LOGGED_IN_KEY);\r
+define('NONCE_KEY',        WIZARD_NONCE_KEY);\r
+define('AUTH_SALT',        WIZARD_AUTH_SALT);\r
+define('SECURE_AUTH_SALT', WIZARD_SECURE_AUTH_SALT);\r
+define('LOGGED_IN_SALT',   WIZARD_LOGGED_IN_SALT);\r
+define('NONCE_SALT',       WIZARD_NONCE_SALT);\r
+\r

 /**#@-*/\r
 \r
 /**\r
 /**#@-*/\r
 \r
 /**\r


@@ -59,16 +64,25 @@ $table_prefix  = 'wp_';
 /**\r
  * WordPress Localized Language, defaults to English.\r
  *\r
 /**\r
  * WordPress Localized Language, defaults to English.\r
  *\r

- * Change this to localize WordPress.  A corresponding MO file for the chosen\r
+ * Change this to localize WordPress. A corresponding MO file for the chosen\r

  * language must be installed to wp-content/languages. For example, install\r
  * language must be installed to wp-content/languages. For example, install\r

- * de.mo to wp-content/languages and set WPLANG to 'de' to enable German\r
+ * de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German\r

  * language support.\r
  */\r
  * language support.\r
  */\r

-define ('WPLANG', '');\r
+define('WPLANG', '');\r
+\r
+/**\r
+ * For developers: WordPress debugging mode.\r
+ *\r
+ * Change this to true to enable the display of notices during development.\r
+ * It is strongly recommended that plugin and theme developers use WP_DEBUG\r
+ * in their development environments.\r
+ */\r
+define('WP_DEBUG', false);\r

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

-/** WordPress absolute path to the Wordpress directory. */\r
+/** Absolute path to the WordPress directory. */\r

 if ( !defined('ABSPATH') )\r
        define('ABSPATH', dirname(__FILE__) . '/');\r
 \r
 if ( !defined('ABSPATH') )\r
        define('ABSPATH', dirname(__FILE__) . '/');\r
 \r