From 51fe01e66de08e16e734b88af163ef80f4c4482e Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 16 May 2021 08:45:03 +0000 Subject: [PATCH] Docs: Update documentation in `wp-config-sample.php` per the documentation standards. See #52628. Built from https://develop.svn.wordpress.org/trunk@50918 git-svn-id: http://core.svn.wordpress.org/trunk@50527 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-config-sample.php | 24 +++++++++++++----------- wp-includes/version.php | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/wp-config-sample.php b/wp-config-sample.php index a93e572fcb..85691d2bfc 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -2,9 +2,9 @@ /** * The base configuration for WordPress * - * The wp-config.php creation script uses this file during the - * installation. You don't have to use the web site, you can - * copy this file to "wp-config.php" and fill in the values. + * The wp-config.php creation script uses this file during the installation. + * You don't have to use the web site, you can copy this file to "wp-config.php" + * and fill in the values. * * This file contains the following configurations: * @@ -31,18 +31,20 @@ define( 'DB_PASSWORD', 'password_here' ); /** MySQL hostname */ define( 'DB_HOST', 'localhost' ); -/** Database Charset to use in creating database tables. */ +/** Database charset to use in creating database tables. */ define( 'DB_CHARSET', 'utf8' ); -/** The Database Collate type. Don't change this if in doubt. */ +/** The database collate type. Don't change this if in doubt. */ define( 'DB_COLLATE', '' ); /**#@+ - * Authentication Unique Keys and Salts. + * Authentication unique keys and salts. * - * Change these to different unique phrases! - * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service} - * 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. + * Change these to different unique phrases! You can generate these using + * the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}. + * + * 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. * * @since 2.6.0 */ @@ -58,7 +60,7 @@ define( 'NONCE_SALT', 'put your unique phrase here' ); /**#@-*/ /** - * WordPress Database Table prefix. + * WordPress database table prefix. * * You can have multiple installations in one database if you give each * a unique prefix. Only numbers, letters, and underscores please! @@ -83,7 +85,7 @@ define( 'WP_DEBUG', false ); -/** Custom Values must appear above this line. That's all, stop editing! Happy publishing. */ +/** Custom values must be above this line. That's all, stop editing! Happy publishing. */ /** Absolute path to the WordPress directory. */ if ( ! defined( 'ABSPATH' ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 0f35800a6a..64f039081e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.8-alpha-50917'; +$wp_version = '5.8-alpha-50918'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.