From 55fd3fa7917098bdfd477b2dc6776661b14f9e17 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 19 Mar 2015 04:06:27 +0000
Subject: [PATCH] In the "Send Trackbacks" meta box, the description of how
 pingbacks work was missing a comma after the introductory clause.

Props cfinke.
Fixes #31668.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/meta-boxes.php | 2 +-
 wp-includes/version.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 99fd418499..b5e13e3e0e 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -546,7 +546,7 @@ function post_trackback_meta_box($post) {
 
 ?>
 <p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
-<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
+<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
 <?php
 if ( ! empty($pings) )
 	echo $pings;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e2e5fec167..cb814c7e67 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta1-31829';
+$wp_version = '4.2-beta1-31830';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.