From 875585d1478b2a684e378c57949d4cda0588e717 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 15 Apr 2015 00:38:27 +0000
Subject: [PATCH] About page updates. * Change the subhead strings on
 credits.php and freedoms.php to match about.php. * Link the Emoji Codex
 article in the emoji blurb. * Add a second sentence to the JavaScript
 Accessibility blurb. * Switch positions for the JavaScript Accessibility and
 Complex Query Ordering sections for balance.

props DrewAPicture, ocean90, pavelevap.
see #31929.
Built from https://develop.svn.wordpress.org/trunk@32131


git-svn-id: http://core.svn.wordpress.org/trunk@32110 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      | 12 ++++++------
 wp-admin/credits.php    |  2 +-
 wp-admin/freedoms.php   |  2 +-
 wp-includes/version.php |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index c36fb29518..d76b5fdb06 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -63,8 +63,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<h3><?php echo ( 'Extended Character Support' ); ?></h3>
 			<p><?php echo ( 'Writing in WordPress, whatever your language, just got better. WordPress 4.2 supports a host of new characters out-of-the-box, including native Chinese, Japanese, and Korean characters, musical and mathematical symbols, and hieroglyphs.' ); ?></p>
 			<p><?php
-				/* translators: 1: heart emoji, 2: kitten emoji, 3, monkey emoji, 4: ice-cream emoji */
-				printf( 'Don’t use special characters? You can still have fun &mdash; emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other emojis.', '&#x1F499', '&#x1F408', '&#x1F412', '&#x1F366' );
+				/* translators: 1: heart emoji, 2: kitten emoji, 3, monkey emoji, 4: ice-cream emoji, 5: Emoji Codex link */
+				printf( 'Don’t use special characters? You can still have fun &mdash; emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other <a href="%5$s">emojis</a>.', '&#x1F499', '&#x1F408', '&#x1F412', '&#x1F366', __( 'https://codex.wordpress.org/Emoji' ) );
 			?></p>
 		</div>
 		<div class="col">
@@ -134,15 +134,15 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<h4><?php echo ( 'utf8mb4 Support' ); ?></h4>
 			<p><?php echo ( 'Database character encoding has changed from utf8 to utf8mb4, which adds support for a whole range of new 4-byte characters.' ); ?></p>
 
-			<h4><?php echo ( 'Complex Query Ordering' ); ?></h4>
-			<p><?php echo ( '<code>WP_Query</code>, <code>WP_Comment_Query</code>, and <code>WP_User_Query</code> now support complex ordering with named meta query clauses.' ); ?></p>
+			<h4><?php echo ( 'JavaScript Accessibility' ); ?></h4>
+			<p><?php echo ( 'Your JavaScript can now talk to screen readers with <code>wp.a11y.speak()</code>. Simply pass what you want to say, and a polite update will be sent to the ARIA live notifications area.' ); ?></p>
 		</div>
 		<div class="last-feature">
 			<h4><?php echo ( 'Taxonomy Roadmap' ); ?></h4>
 			<p><?php echo ( 'Terms previously shared across multiple taxonomies will be split when one of them is updated. A new row is created in the database for each.' ); ?></p>
 
-			<h4><?php echo ( 'JavaScript Accessibility' ); ?></h4>
-			<p><?php echo ( 'Your JavaScript can now talk to screen readers with <code>wp.a11y.speak()</code>.' ); ?></p>
+			<h4><?php echo ( 'Complex Query Ordering' ); ?></h4>
+			<p><?php echo ( '<code>WP_Query</code>, <code>WP_Comment_Query</code>, and <code>WP_User_Query</code> now support complex ordering with named meta query clauses.' ); ?></p>
 		</div>
 
 	<hr />
diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index a2be25fd64..200c5a5062 100644
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -82,7 +82,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you communicate and share, globally.' ), $display_version ); ?></div>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php
index 7d8dadb132..209fb5adc9 100644
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -19,7 +19,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you communicate and share, globally.' ), $display_version ); ?></div>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 875d8dad0f..b0ec84e0b0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32130';
+$wp_version = '4.2-beta4-32131';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.