From c3ec04c53260b15ced1341137d71384df52be7d3 Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Fri, 7 Nov 2014 17:31:22 +0000
Subject: [PATCH] Twenty Fifteen: adding help text to explain how color changes
 to header and sidebar are affected by responsive design.

Props iamtakashi, iandstewart, fixes #30165.


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


git-svn-id: http://core.svn.wordpress.org/trunk@30272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/inc/customizer.php | 13 +++++++++----
 wp-includes/version.php                            |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/inc/customizer.php b/wp-content/themes/twentyfifteen/inc/customizer.php
index e8821440db..4b9c2c7f2c 100644
--- a/wp-content/themes/twentyfifteen/inc/customizer.php
+++ b/wp-content/themes/twentyfifteen/inc/customizer.php
@@ -42,8 +42,9 @@ function twentyfifteen_customize_register( $wp_customize ) {
 	) );
 
 	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'sidebar_textcolor', array(
-		'label'   => esc_html__( 'Header &amp; Sidebar Text Color', 'twentyfifteen' ),
-		'section' => 'colors',
+		'label'       => esc_html__( 'Header and Sidebar Text Color', 'twentyfifteen' ),
+		'description' => esc_html__( 'Only applied to the sidebar on wider screens. On small screens the sidebar will become the header.', 'twentyfifteen' ),
+		'section'     => 'colors',
 	) ) );
 
 	// Remove the core header textcolor control, as it shares the sidebar text color.
@@ -56,9 +57,13 @@ function twentyfifteen_customize_register( $wp_customize ) {
 	) );
 
 	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_background_color', array(
-		'label'   => esc_html__( 'Header &amp; Sidebar Background Color', 'twentyfifteen' ),
-		'section' => 'colors',
+		'label'       => esc_html__( 'Header and Sidebar Background Color', 'twentyfifteen' ),
+		'description' => esc_html__( 'Only applied to the sidebar on wider screens. On small screens the sidebar will become the header.', 'twentyfifteen' ),
+		'section'     => 'colors',
 	) ) );
+
+	// Add an additional description to the header image section.
+	$wp_customize->get_section( 'header_image' )->description = esc_html__( 'Only applied to the sidebar on wide screens. On small screens it will be applied to the header.', 'twentyfifteen' );
 }
 add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a51e1c36f0..522a026557 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30271';
+$wp_version = '4.1-alpha-30272';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.