Merge remote-tracking branch 'upstream/master'

green-coding-solutions · Oct 15, 2024 · 6c5c1ec · 6c5c1ec
2 parents 41677c1 + c85650e
commit 6c5c1ec
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 40 deletions.
diff --git a/beta/php8.1/apache/Dockerfile b/beta/php8.1/apache/Dockerfile
diff --git a/beta/php8.1/apache/wp-config-docker.php b/beta/php8.1/apache/wp-config-docker.php
diff --git a/beta/php8.1/fpm-alpine/Dockerfile b/beta/php8.1/fpm-alpine/Dockerfile
diff --git a/beta/php8.1/fpm-alpine/wp-config-docker.php b/beta/php8.1/fpm-alpine/wp-config-docker.php
diff --git a/beta/php8.1/fpm/Dockerfile b/beta/php8.1/fpm/Dockerfile
diff --git a/beta/php8.1/fpm/wp-config-docker.php b/beta/php8.1/fpm/wp-config-docker.php
diff --git a/beta/php8.2/apache/Dockerfile b/beta/php8.2/apache/Dockerfile
diff --git a/beta/php8.2/apache/wp-config-docker.php b/beta/php8.2/apache/wp-config-docker.php
diff --git a/beta/php8.2/fpm-alpine/Dockerfile b/beta/php8.2/fpm-alpine/Dockerfile
diff --git a/beta/php8.2/fpm-alpine/wp-config-docker.php b/beta/php8.2/fpm-alpine/wp-config-docker.php
diff --git a/beta/php8.2/fpm/Dockerfile b/beta/php8.2/fpm/Dockerfile
diff --git a/beta/php8.2/fpm/wp-config-docker.php b/beta/php8.2/fpm/wp-config-docker.php
diff --git a/beta/php8.3/apache/Dockerfile b/beta/php8.3/apache/Dockerfile
diff --git a/beta/php8.3/apache/wp-config-docker.php b/beta/php8.3/apache/wp-config-docker.php
diff --git a/beta/php8.3/fpm-alpine/Dockerfile b/beta/php8.3/fpm-alpine/Dockerfile
diff --git a/beta/php8.3/fpm-alpine/wp-config-docker.php b/beta/php8.3/fpm-alpine/wp-config-docker.php
diff --git a/beta/php8.3/fpm/Dockerfile b/beta/php8.3/fpm/Dockerfile
diff --git a/beta/php8.3/fpm/wp-config-docker.php b/beta/php8.3/fpm/wp-config-docker.php
diff --git a/latest/php8.1/apache/wp-config-docker.php b/latest/php8.1/apache/wp-config-docker.php
diff --git a/latest/php8.1/fpm-alpine/wp-config-docker.php b/latest/php8.1/fpm-alpine/wp-config-docker.php
diff --git a/latest/php8.1/fpm/wp-config-docker.php b/latest/php8.1/fpm/wp-config-docker.php
diff --git a/latest/php8.2/apache/wp-config-docker.php b/latest/php8.2/apache/wp-config-docker.php
diff --git a/latest/php8.2/fpm-alpine/wp-config-docker.php b/latest/php8.2/fpm-alpine/wp-config-docker.php
diff --git a/latest/php8.2/fpm/wp-config-docker.php b/latest/php8.2/fpm/wp-config-docker.php
diff --git a/latest/php8.3/apache/wp-config-docker.php b/latest/php8.3/apache/wp-config-docker.php
diff --git a/latest/php8.3/fpm-alpine/wp-config-docker.php b/latest/php8.3/fpm-alpine/wp-config-docker.php
diff --git a/latest/php8.3/fpm/wp-config-docker.php b/latest/php8.3/fpm/wp-config-docker.php
diff --git a/versions.json b/versions.json
@@ -5,14 +5,14 @@
       "8.2",
       "8.3"
     ],
-    "sha1": "fcc292dbe5d5517c5b28bf91ae718527028eed08",
-    "upstream": "6.7-beta2",
+    "sha1": "c059b63a9d01e07062f598a22987f1a15d54bfe1",
+    "upstream": "6.7-beta3",
     "variants": [
       "apache",
       "fpm",
       "fpm-alpine"
     ],
-    "version": "6.7-beta2"
+    "version": "6.7-beta3"
   },
   "cli": {
     "phpVersions": [

diff --git a/wp-config-docker.php b/wp-config-docker.php
@@ -93,7 +93,7 @@ function getenv_docker($env, $default) {
  * You can have multiple installations in one database if you give each
  * a unique prefix. Only numbers, letters, and underscores please!
  *
- * At the installation time, DB tables names with $table_prefix are created.
+ * At the installation time, database tables are created with the specified prefix.
  * Changing this value after WordPress is installed will make your site think
  * it has not been installed.
  *