From 7dc9b02577195d2030b41d9bad63e8dd05d97839 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Tue, 25 Mar 2014 08:05:15 +0000
Subject: [PATCH] Correct misleading verbiage in 'print' hook docs.

Standardizes 'print' hook docs on the concept that hooks are fired when scripts and styles are printed.

Props ericlewis for the initial patch.
Fixes #26924.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php      |  8 ++++----
 wp-admin/customize.php         |  4 ++--
 wp-admin/includes/media.php    |  8 ++++----
 wp-admin/includes/template.php |  4 +---
 wp-admin/press-this.php        | 10 ++++++++--
 wp-includes/media-template.php |  2 +-
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 6b6dd79f20..10349750eb 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -80,28 +80,28 @@ var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
 do_action( 'admin_enqueue_scripts', $hook_suffix );
 
 /**
- * Print styles for a specific admin page based on $hook_suffix.
+ * Fires when styles are printed for a specific admin page based on $hook_suffix.
  *
  * @since 2.6.0
  */
 do_action( "admin_print_styles-$hook_suffix" );
 
 /**
- * Print styles for all admin pages.
+ * Fires when styles are printed for all admin pages.
  *
  * @since 2.6.0
  */
 do_action( 'admin_print_styles' );
 
 /**
- * Print scripts for a specific admin page based on $hook_suffix.
+ * Fires when scripts are printed for a specific admin page based on $hook_suffix.
  *
  * @since 2.1.0
  */
 do_action( "admin_print_scripts-$hook_suffix" );
 
 /**
- * Print scripts for all admin pages.
+ * Fires when scripts are printed for all admin pages.
  *
  * @since 2.1.0
  */
diff --git a/wp-admin/customize.php b/wp-admin/customize.php
index 20191efd0b..d3b09f2887 100644
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -84,14 +84,14 @@ var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>';
 
 <?php
 /**
- * Print Customizer control styles.
+ * Fires when Customizer control styles are printed.
  *
  * @since 3.4.0
  */
 do_action( 'customize_controls_print_styles' );
 
 /**
- * Print Customizer control scripts.
+ * Fires when Customizer control scripts are printed.
  *
  * @since 3.4.0
  */
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 823ecb9d78..ccc4ab4b39 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -442,7 +442,7 @@ isRtl = <?php echo (int) is_rtl(); ?>;
 	do_action( 'admin_enqueue_scripts', 'media-upload-popup' );
 
 	/**
-	 * Print admin styles enqueued for the legacy (pre-3.5.0) media upload popup.
+	 * Fires when admin styles enqueued for the legacy (pre-3.5.0) media upload popup are printed.
 	 *
 	 * @since 2.9.0
 	 */
@@ -452,7 +452,7 @@ isRtl = <?php echo (int) is_rtl(); ?>;
 	do_action( 'admin_print_styles' );
 
 	/**
-	 * Print admin scripts enqueued for the legacy (pre-3.5.0) media upload popup.
+	 * Fires when admin scripts enqueued for the legacy (pre-3.5.0) media upload popup are printed.
 	 *
 	 * @since 2.9.0
 	 */
@@ -462,8 +462,8 @@ isRtl = <?php echo (int) is_rtl(); ?>;
 	do_action( 'admin_print_scripts' );
 
 	/**
-	 * Print scripts enqueued for the admin header for the legacy (pre-3.5.0)
-	 * media upload popup.
+	 * Fires when scripts enqueued for the admin header for the legacy (pre-3.5.0)
+	 * media upload popup are printed.
 	 *
 	 * @since 2.9.0
 	 */
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 80d6c9fb49..d5cf3adacb 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1514,9 +1514,7 @@ if ( is_rtl() )
 
 ?>
 </head>
-<?php
-/** This filter is documented in wp-admin/admin-header.php */
-?>
+<?php /** This filter is documented in wp-admin/admin-header.php */ ?>
 <body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class; ?>">
 <script type="text/javascript">
 //<![CDATA[
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index ba116bba2e..5c70a96d17 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -308,28 +308,34 @@ var photostorage = false;
 <?php
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_enqueue_scripts', 'press-this.php' );
+
 	/**
-	 * Print styles for the Press This admin page.
+	 * Firest when styles are printed for the Press This admin page.
 	 *
 	 * @since 3.7.0
 	 */
 	do_action( 'admin_print_styles-press-this.php' );
+
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_print_styles' );
+
 	/**
-	 * Print scripts for the Press This admin page.
+	 * Fires when scripts are printed for the Press This admin page.
 	 *
 	 * @since 3.7.0
 	 */
 	do_action( 'admin_print_scripts-press-this.php' );
+
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_print_scripts' );
+
 	/**
 	 * Fires in the head tag on the Press This admin page.
 	 *
 	 * @since 3.7.0
 	 */
 	do_action( 'admin_head-press-this.php' );
+
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_head' );
 ?>
diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index 01d44ba2f2..4a8851918b 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -1029,7 +1029,7 @@ function wp_print_media_templates() {
 	<?php
 
 	/**
-	 * Prints the media manager custom media templates.
+	 * Fires when the custom Backbone media templates are printed.
 	 *
 	 * @since 3.5.0
 	 */