From 363cfc4301c84d1fb388b6defded9db415ffe1ab Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Tue, 8 Jan 2019 04:30:50 +0000 Subject: [PATCH] General: Replace "Happy blogging" with "Happy publishing". As of this commit, WordPress is no longer a simple blogging platform. It's now a comprehensive publishing solution. This also replaces a couple of other "blog" references that were missed previously. Props igmoweb, Valer1e, audrasjb, pento. Fixes #41000. Built from https://develop.svn.wordpress.org/trunk@44455 git-svn-id: http://core.svn.wordpress.org/trunk@44286 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- readme.html | 2 +- wp-admin/includes/network.php | 4 ++-- wp-admin/includes/schema.php | 2 +- wp-admin/includes/upgrade.php | 2 +- wp-config-sample.php | 2 +- wp-includes/version.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/readme.html b/readme.html index 031c0761a551..0cd64eb1df44 100644 --- a/readme.html +++ b/readme.html @@ -26,7 +26,7 @@

Installation: Famous 5-minute install

  • Open wp-admin/install.php in your browser.
    • -
  • Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.
    • +
  • Once the configuration file is set up, the installer will set up the tables needed for your site. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.
  • If you did not enter a password, note the password given to you. If you did not provide a username, it will be admin.
  • The installer should then send you to the login page. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on “Profile” to change the password.
    • diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php index 9c05ec8d6a4e..845d2c0d5008 100644 --- a/wp-admin/includes/network.php +++ b/wp-admin/includes/network.php @@ -466,7 +466,7 @@ function network_step2( $errors = false ) {

  • above the line reading %3$s:' ), 'wp-config.php', '' . $location_of_wp_config . '', @@ -475,7 +475,7 @@ function network_step2( $errors = false ) { * You can check the localized release package or * https://i18n.svn.wordpress.org//branches//dist/wp-config-sample.php */ - '/* ' . __( 'That’s all, stop editing! Happy blogging.' ) . ' */' + '/* ' . __( 'That’s all, stop editing! Happy publishing.' ) . ' */' ); ?>

    diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 28a429ce5b77..d148a9603d92 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -1252,7 +1252,7 @@ function populate_network_meta( $network_id, array $meta = array() ) { 'wpmu_upgrade_site' => $wp_db_version, 'welcome_email' => $welcome_email, /* translators: %s: site link */ - 'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ), + 'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ), // @todo - network admins should have a method of editing the network siteurl (used for cookie hash) 'siteurl' => get_option( 'siteurl' ) . '/', 'add_new_users' => '0', diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index fe438a1f3b70..696770c8ff40 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -63,7 +63,7 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated update_option( 'siteurl', $guessurl ); - // If not a public blog, don't ping. + // If not a public site, don't ping. if ( ! $public ) { update_option( 'default_pingback_flag', 0 ); } diff --git a/wp-config-sample.php b/wp-config-sample.php index 7312c6ede15c..ed8f9fc0e574 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -79,7 +79,7 @@ */ define( 'WP_DEBUG', false ); -/* That's all, stop editing! Happy blogging. */ +/* 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 755fba3ea21f..70d931cfa31f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44454'; +$wp_version = '5.1-alpha-44455'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.