From 8dfb59d4de1f2b213f99f52fb9ca22d509b10f50 Mon Sep 17 00:00:00 2001
From: johnjamesjacoby <johnjamesjacoby@git.wordpress.org>
Date: Mon, 8 Nov 2021 21:43:01 +0000
Subject: [PATCH] Admin/Help: add docs links to several screens.

This change intends to better guide users towards many of the useful resources available on WordPress.org.

* Appearance/Customizer - Add link to Customizer docs.
* Appearance/Editor - Improve link text & destination.
* Privacy Settings - Link to Privacy Settings docs.
* Site Health - Link to Site Health docs.

Props audrasjb, jdy68, webcommsat.

Fixes #54357.
Built from https://develop.svn.wordpress.org/trunk@52053


git-svn-id: http://core.svn.wordpress.org/trunk@51645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/customize.php       | 13 ++++++++++---
 wp-admin/options-privacy.php | 15 +++++++++++++++
 wp-admin/site-health.php     | 16 ++++++++++++++++
 wp-admin/theme-editor.php    |  2 +-
 wp-includes/version.php      |  2 +-
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/wp-admin/customize.php b/wp-admin/customize.php
index 7d4fb9fd99..aed0646336 100644
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -233,9 +233,16 @@ do_action( 'customize_controls_head' );
 						<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
 					</div>
 					<div class="customize-panel-description">
-					<?php
-						_e( 'The Customizer allows you to preview changes to your site before publishing them. You can navigate to different pages on your site within the preview. Edit shortcuts are shown for some editable elements.' );
-					?>
+						<p>
+							<?php
+							_e( 'The Customizer allows you to preview changes to your site before publishing them. You can navigate to different pages on your site within the preview. Edit shortcuts are shown for some editable elements.' );
+							?>
+						</p>
+						<p>
+							<?php
+							_e( '<a href="https://wordpress.org/support/article/appearance-customize-screen/">Documentation on Customizer</a>' );
+							?>
+						</p>
 					</div>
 				</div>
 
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index 0b0ca77ee9..0e135caa48 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -29,6 +29,21 @@ add_filter(
 
 $action = isset( $_POST['action'] ) ? $_POST['action'] : '';
 
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				'<p>' . __( 'The Privacy screen lets you either build a new privacy-policy page or choose one you already have to show.' ) . '</p>' .
+				'<p>' . __( 'This screen includes suggestions to help you write your own privacy policy. However, it is your responsibility to use these resources correctly, to provide the information required by your privacy policy, and to keep this information current and accurate.' ) . '</p>'
+	)
+);
+
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-privacy-screen/">Documentation on Privacy Settings</a>' ) . '</p>'
+);
+
 if ( ! empty( $action ) ) {
 	check_admin_referer( $action );
 
diff --git a/wp-admin/site-health.php b/wp-admin/site-health.php
index c31e4018eb..4a930d07a5 100644
--- a/wp-admin/site-health.php
+++ b/wp-admin/site-health.php
@@ -74,6 +74,22 @@ if ( 'update_https' === $action ) {
 
 $health_check_site_status = WP_Site_Health::get_instance();
 
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				'<p>' . __( 'This screen allows you to obtain a health diagnosis of your site, and displays an overall rating of the status of your installation.' ) . '</p>' .
+				'<p>' . __( 'In the Status tab, you can see critical information about your WordPress configuration, along with anything else that requires your attention.' ) . '</p>' .
+				'<p>' . __( 'In the Info tab, you will find all the details about the configuration of your WordPress site, server, and database. There is also an export feature that allows you to copy all of the information about your site to the clipboard, help solve problems on your site when obtaining support.' ) . '</p>'
+	)
+);
+
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/article/site-health-screen/">Documentation on Site Health tool</a>' ) . '</p>'
+);
+
 // Start by checking if this is a special request checking for the existence of certain filters.
 $health_check_site_status->check_wp_version_check_exists();
 
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 68228edc40..644084318b 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -50,7 +50,7 @@ get_current_screen()->add_help_tab(
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://developer.wordpress.org/themes/">Documentation on Theme Development</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/using-themes/">Documentation on Using Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-editor-screen/">Documentation on Editing Themes</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/article/editing-files/">Documentation on Editing Files</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://developer.wordpress.org/themes/basics/template-tags/">Documentation on Template Tags</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f692988889..19e0044505 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52052';
+$wp_version = '5.9-alpha-52053';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.