From 9e12c718720e42627eec1bee2c36fdf8c992281a Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 13 Jul 2015 21:30:24 +0000
Subject: [PATCH] Fix inline documentation syntax for two formatting functions
 added in 4.3.

* `wptexturize_primes()` See [32863]
* `format_for_editor()` See [32899]

See #32891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 13 +++++++------
 wp-includes/version.php    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index afb361109e..e69d2d66c5 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -322,10 +322,11 @@ function wptexturize( $text, $reset = false ) {
  *
  * @since 4.3.0
  *
- * @param string $haystack The plain text to be searched.
- * @param string $needle The character to search for such as ' or ".
- * @param string $prime The prime char to use for replacement.
- * @param string $open_quote The opening quote char. Opening quote replacement must be accomplished already.
+ * @param string $haystack    The plain text to be searched.
+ * @param string $needle      The character to search for such as ' or ".
+ * @param string $prime       The prime char to use for replacement.
+ * @param string $open_quote  The opening quote char. Opening quote replacement must be
+ *                            accomplished already.
  * @param string $close_quote The closing quote char to use for replacement.
  * @return string The $haystack value after primes and quotes replacements.
  */
@@ -3078,8 +3079,8 @@ function ent2ncr( $text ) {
  * Generally the browsers treat everything inside a textarea as text, but
  * it is still a good idea to HTML entity encode `<`, `>` and `&` in the content.
  *
- * The filter 'format_for_editor' is applied here. If $text is empty the filter will
- * be applied to an empty string.
+ * The filter {@see 'format_for_editor'} is applied here. If `$text` is empty the
+ * filter will be applied to an empty string.
  *
  * @since 4.3.0
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index fe185ed875..dd0ea883aa 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta2-33224';
+$wp_version = '4.3-beta2-33225';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.