From bcb92855890fbfad6c26c52ea5b06f2fd5eac9b3 Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Tue, 14 Dec 2021 08:44:02 +0000
Subject: [PATCH] Docs: Use generic references to "Database" in
 `wp-config-sample.php`.

This replaces the references to "MySQL" info in the WordPress configuration sample file. Using the generic term "Database" now refers to either MySQL or MariaDB.

Props Ov3rfly, audrasjb, hellofromTonya.
Fixes #54610.

Built from https://develop.svn.wordpress.org/trunk@52367


git-svn-id: http://core.svn.wordpress.org/trunk@51959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-config-sample.php    | 10 +++++-----
 wp-includes/version.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-config-sample.php b/wp-config-sample.php
index d8469e730f..c095f50f6c 100644
--- a/wp-config-sample.php
+++ b/wp-config-sample.php
@@ -8,7 +8,7 @@
  *
  * This file contains the following configurations:
  *
- * * MySQL settings
+ * * Database settings
  * * Secret keys
  * * Database table prefix
  * * ABSPATH
@@ -18,17 +18,17 @@
  * @package WordPress
  */
 
-// ** MySQL settings - You can get this info from your web host ** //
+// ** Database settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
 define( 'DB_NAME', 'database_name_here' );
 
-/** MySQL database username */
+/** Database username */
 define( 'DB_USER', 'username_here' );
 
-/** MySQL database password */
+/** Database password */
 define( 'DB_PASSWORD', 'password_here' );
 
-/** MySQL hostname */
+/** Database hostname */
 define( 'DB_HOST', 'localhost' );
 
 /** Database charset to use in creating database tables. */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6f37ffde9c..aea536bd06 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-beta2-52366';
+$wp_version = '5.9-beta2-52367';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.