From 4487551344060d6a99a199dc8e080a070195b7fa Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 8 Apr 2019 22:59:56 +0000 Subject: [PATCH] Help: Update support forum links. There are a lot of places in Core that link to https://wordpress.org/support/ for the support forums, but that's now the URL for HelpHub. The new forums link is https://wordpress.org/support/forums/. Props jitendrabanjara1991, dilipbheda, mukesh27, ianbelanger. Fixes #46790. Built from https://develop.svn.wordpress.org/trunk@45140 git-svn-id: http://core.svn.wordpress.org/trunk@44949 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- readme.html | 6 +++--- wp-admin/comment.php | 2 +- wp-admin/custom-background.php | 2 +- wp-admin/custom-header.php | 2 +- wp-admin/edit-comments.php | 2 +- wp-admin/edit-form-advanced.php | 6 +++--- wp-admin/edit-link-form.php | 2 +- wp-admin/edit-tags.php | 2 +- wp-admin/edit.php | 4 ++-- wp-admin/export.php | 2 +- wp-admin/import.php | 2 +- wp-admin/index.php | 2 +- wp-admin/link-manager.php | 2 +- wp-admin/media-new.php | 2 +- wp-admin/media.php | 2 +- wp-admin/my-sites.php | 2 +- wp-admin/nav-menus.php | 2 +- wp-admin/network.php | 2 +- wp-admin/network/settings.php | 2 +- wp-admin/network/themes.php | 2 +- wp-admin/network/upgrade.php | 2 +- wp-admin/options-discussion.php | 2 +- wp-admin/options-general.php | 2 +- wp-admin/options-media.php | 2 +- wp-admin/options-permalink.php | 2 +- wp-admin/options-reading.php | 2 +- wp-admin/options-writing.php | 2 +- wp-admin/plugin-editor.php | 2 +- wp-admin/plugin-install.php | 2 +- wp-admin/plugins.php | 2 +- wp-admin/revision.php | 2 +- wp-admin/theme-editor.php | 2 +- wp-admin/theme-install.php | 2 +- wp-admin/themes.php | 2 +- wp-admin/tools.php | 2 +- wp-admin/update-core.php | 2 +- wp-admin/upload.php | 4 ++-- wp-admin/user-edit.php | 2 +- wp-admin/user-new.php | 2 +- wp-admin/users.php | 2 +- wp-admin/widgets.php | 2 +- wp-content/themes/twentyeleven/inc/theme-options.php | 2 +- wp-content/themes/twentyeleven/languages/twentyeleven.pot | 2 +- wp-includes/admin-bar.php | 2 +- wp-includes/version.php | 2 +- wp-includes/wp-db.php | 6 +++--- 46 files changed, 54 insertions(+), 54 deletions(-) diff --git a/readme.html b/readme.html index 37e1a8aee1..5caccc497d 100644 --- a/readme.html +++ b/readme.html @@ -26,7 +26,7 @@
  • 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 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.
    • +
  • 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.
    • @@ -74,7 +74,7 @@
    This is where you’ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.
    WordPress Planet
    The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.
    -
    WordPress Support Forums
    +
    WordPress Support Forums
    If you’ve looked everywhere and still can’t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.
    WordPress IRC Channel
    There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpress)
    @@ -82,7 +82,7 @@

    Final Notes

    diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 1d76632a76..0b405c575b 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -54,7 +54,7 @@ switch ( $action ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Comments' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); wp_enqueue_script( 'comment' ); diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index 2a26f7f221..ce37b5301e 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -97,7 +97,7 @@ class Custom_Background { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Custom Background' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); wp_enqueue_media(); diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 6164330df6..3ad1d271ab 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -127,7 +127,7 @@ class Custom_Image_Header { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Custom Header' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); } diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 6b82c15fe5..d2ef006a82 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -201,7 +201,7 @@ get_current_screen()->set_help_sidebar( '

    ' . __( 'Documentation on Comments' ) . '

    ' . '

    ' . __( 'Documentation on Comment Spam' ) . '

    ' . '

    ' . __( 'Documentation on Keyboard Shortcuts' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); get_current_screen()->set_screen_reader_content( diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index e754a758f4..4ac0548996 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -284,7 +284,7 @@ if ( 'post' == $post_type ) { '

    ' . sprintf( __( 'You can also create posts with the Press This bookmarklet.' ), 'tools.php' ) . '

    ' . '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Writing and Editing Posts' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); } elseif ( 'page' == $post_type ) { $about_pages = '

    ' . __( 'Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages.' ) . '

    ' . @@ -302,7 +302,7 @@ if ( 'post' == $post_type ) { '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Adding New Pages' ) . '

    ' . '

    ' . __( 'Documentation on Editing Pages' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); } elseif ( 'attachment' == $post_type ) { get_current_screen()->add_help_tab( @@ -320,7 +320,7 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Edit Media' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); } diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index c717a8f5d4..f63d71b48e 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -72,7 +72,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Creating Links' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 80af12c435..1be66c9dfa 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -304,7 +304,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help .= '

    ' . __( 'Documentation on Tags' ) . '

    '; } - $help .= '

    ' . __( 'Support Forums' ) . '

    '; + $help .= '

    ' . __( 'Support' ) . '

    '; get_current_screen()->set_help_sidebar( $help ); diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 20fb7e466f..d9333b9778 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -257,7 +257,7 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Managing Posts' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); } elseif ( 'page' == $post_type ) { @@ -282,7 +282,7 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Managing Pages' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); } diff --git a/wp-admin/export.php b/wp-admin/export.php index cb088bafc2..39c60737e8 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -55,7 +55,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Export' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); // If the 'download' URL parameter is set, a WXR export file is baked and returned. diff --git a/wp-admin/import.php b/wp-admin/import.php index 5359ec80d9..14555ec597 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -29,7 +29,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Import' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); if ( current_user_can( 'install_plugins' ) ) { diff --git a/wp-admin/index.php b/wp-admin/index.php index 2465aebf66..61eb696874 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -105,7 +105,7 @@ unset( $help ); $screen->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Dashboard' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 0a0a6767a6..656c2865b6 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -69,7 +69,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Managing Links' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); get_current_screen()->set_screen_reader_content( diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php index 060e43dbb2..c60601ccd0 100644 --- a/wp-admin/media-new.php +++ b/wp-admin/media-new.php @@ -58,7 +58,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Uploading Media Files' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/media.php b/wp-admin/media.php index 40619ea62e..480eac7cfb 100644 --- a/wp-admin/media.php +++ b/wp-admin/media.php @@ -93,7 +93,7 @@ switch ( $action ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Edit Media' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); require( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php index 174fb2dc84..0d925b4184 100644 --- a/wp-admin/my-sites.php +++ b/wp-admin/my-sites.php @@ -49,7 +49,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on My Sites' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 5d336398ff..2409ff39bc 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -593,7 +593,7 @@ endif; get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Menus' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); // Get the admin header. diff --git a/wp-admin/network.php b/wp-admin/network.php index f238c2eab1..928be2d8df 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -78,7 +78,7 @@ get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Creating a Network' ) . '

    ' . '

    ' . __( 'Documentation on the Network Screen' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php index 1469c70528..eeffa514c3 100644 --- a/wp-admin/network/settings.php +++ b/wp-admin/network/settings.php @@ -61,7 +61,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Network Settings' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); if ( $_POST ) { diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php index c36971c920..f12a5a7b70 100644 --- a/wp-admin/network/themes.php +++ b/wp-admin/network/themes.php @@ -244,7 +244,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Network Themes' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); get_current_screen()->set_screen_reader_content( diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php index 25a651fa69..e391b2ff1d 100644 --- a/wp-admin/network/upgrade.php +++ b/wp-admin/network/upgrade.php @@ -29,7 +29,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Upgrade Network' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 3f7683e6ba..d79007ed8a 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -29,7 +29,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Discussion Settings' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 9f248365f6..f47011aa0b 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -46,7 +46,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on General Settings' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php index a56c879a9d..5d7483c5d8 100644 --- a/wp-admin/options-media.php +++ b/wp-admin/options-media.php @@ -35,7 +35,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Media Settings' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 9667723d1d..b17e56692f 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -50,7 +50,7 @@ get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Permalinks Settings' ) . '

    ' . '

    ' . __( 'Documentation on Using Permalinks' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); $home_path = get_home_path(); diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 7131e29b15..636b6d124c 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -41,7 +41,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Reading Settings' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index 4f77a20fa3..ac5bba5ffc 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -50,7 +50,7 @@ if ( apply_filters( 'enable_update_services_configuration', true ) ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Writing Settings' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index 6d93ea8ad1..a38dd39f01 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -140,7 +140,7 @@ if ( ! is_file( $real_file ) ) { '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Editing Plugins' ) . '

    ' . '

    ' . __( 'Documentation on Writing Plugins' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); $settings = array( diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index fe5f414cd1..d4f678c9f7 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -103,7 +103,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Installing Plugins' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); get_current_screen()->set_screen_reader_content( diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index ececdfc4d0..8c8249ac7c 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -462,7 +462,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Managing Plugins' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); get_current_screen()->set_screen_reader_content( diff --git a/wp-admin/revision.php b/wp-admin/revision.php index 3e72c86dcd..79338d6359 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -137,7 +137,7 @@ get_current_screen()->add_help_tab( $revisions_sidebar = '

    ' . __( 'For more information:' ) . '

    '; $revisions_sidebar .= '

    ' . __( 'Revisions Management' ) . '

    '; -$revisions_sidebar .= '

    ' . __( 'Support Forums' ) . '

    '; +$revisions_sidebar .= '

    ' . __( 'Support' ) . '

    '; get_current_screen()->set_help_sidebar( $revisions_sidebar ); diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index 844b27588d..25769b2ec9 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -52,7 +52,7 @@ get_current_screen()->set_help_sidebar( '

    ' . __( 'Documentation on Using Themes' ) . '

    ' . '

    ' . __( 'Documentation on Editing Files' ) . '

    ' . '

    ' . __( 'Documentation on Template Tags' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) ); diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php index e0fa5cf230..8184297991 100644 --- a/wp-admin/theme-install.php +++ b/wp-admin/theme-install.php @@ -127,7 +127,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Adding New Themes' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 7b0d3b2022..9561cfe602 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -142,7 +142,7 @@ if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Using Themes' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); if ( current_user_can( 'switch_themes' ) ) { diff --git a/wp-admin/tools.php b/wp-admin/tools.php index f674ddc8c6..c188e3f58b 100644 --- a/wp-admin/tools.php +++ b/wp-admin/tools.php @@ -33,7 +33,7 @@ if ( $is_privacy_guide ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Tools' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); } diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index f5d9825299..8fd29fb836 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -641,7 +641,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Updating WordPress' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); if ( 'upgrade-core' == $action ) { diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 3afd24f272..c2c59c7f13 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -73,7 +73,7 @@ if ( 'grid' === $mode ) { get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Media Library' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); $title = __( 'Media Library' ); @@ -247,7 +247,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Media Library' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); get_current_screen()->set_screen_reader_content( diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index ccc0a40010..f478c3be57 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -65,7 +65,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on User Profiles' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); $wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer ); diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index a2403417ac..a63a329d6d 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -251,7 +251,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Adding New Users' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); wp_enqueue_script( 'wp-ajax-response' ); diff --git a/wp-admin/users.php b/wp-admin/users.php index 7ba4aed006..8827b73b35 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -73,7 +73,7 @@ get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Managing Users' ) . '

    ' . '

    ' . __( 'Descriptions of Roles and Capabilities' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); get_current_screen()->set_screen_reader_content( diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 867badda2e..eacdbb0815 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -81,7 +81,7 @@ get_current_screen()->add_help_tab( get_current_screen()->set_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Widgets' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support' ) . '

    ' ); if ( ! current_theme_supports( 'widgets' ) ) { diff --git a/wp-content/themes/twentyeleven/inc/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php index f296c982e5..fb2ff32ad0 100644 --- a/wp-content/themes/twentyeleven/inc/theme-options.php +++ b/wp-content/themes/twentyeleven/inc/theme-options.php @@ -119,7 +119,7 @@ function twentyeleven_theme_options_help() { $sidebar = '

    ' . __( 'For more information:', 'twentyeleven' ) . '

    ' . '

    ' . __( 'Documentation on Theme Options', 'twentyeleven' ) . '

    ' . - '

    ' . __( 'Support Forums', 'twentyeleven' ) . '

    '; + '

    ' . __( 'Support', 'twentyeleven' ) . '

    '; $screen = get_current_screen(); diff --git a/wp-content/themes/twentyeleven/languages/twentyeleven.pot b/wp-content/themes/twentyeleven/languages/twentyeleven.pot index cb190238fa..72b15e1aa2 100644 --- a/wp-content/themes/twentyeleven/languages/twentyeleven.pot +++ b/wp-content/themes/twentyeleven/languages/twentyeleven.pot @@ -489,7 +489,7 @@ msgid "Support Forums" +msgid "Support" msgstr "" #: inc/theme-options.php:130 diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 6600c651df..06d9822aca 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -170,7 +170,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { array( 'parent' => 'wp-logo-external', 'id' => 'support-forums', - 'title' => __( 'Support Forums' ), + 'title' => __( 'Support' ), 'href' => __( 'https://wordpress.org/support/' ), ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index f8a256b68f..956342dd54 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-beta1-45139'; +$wp_version = '5.2-beta1-45140'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 1bd8aa2611..4e80a1981d 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -1128,7 +1128,7 @@ class wpdb { $message .= '

    ' . sprintf( /* translators: %s: support forums URL */ __( 'If you don’t know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.' ), - __( 'https://wordpress.org/support/' ) + __( 'https://wordpress.org/support/forums/' ) ) . "

    \n"; $this->bail( $message, 'db_select_fail' ); @@ -1673,7 +1673,7 @@ class wpdb { $message .= '

    ' . sprintf( /* translators: %s: support forums URL */ __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), - __( 'https://wordpress.org/support/' ) + __( 'https://wordpress.org/support/forums/' ) ) . "

    \n"; $this->bail( $message, 'db_connect_fail' ); @@ -1831,7 +1831,7 @@ class wpdb { $message .= '

    ' . sprintf( /* translators: %s: support forums URL */ __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), - __( 'https://wordpress.org/support/' ) + __( 'https://wordpress.org/support/forums/' ) ) . "

    \n"; // We weren't able to reconnect, so we better bail.