From fa5b5199e8cdec419139d2d92f6fb3e8a0761eab Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 4 Nov 2016 17:17:56 +0000
Subject: [PATCH] Editor: Correct the docblock for the `wp_default_editor`
 filter.

Props dimadin
See #38327

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


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

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 9be181ce93..f2a8774794 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -3018,8 +3018,7 @@ function wp_default_editor() {
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param string $r string Which editor should be displayed by default. Either 'tinymce',
-	 *                         'html', or 'test'
+	 * @param string $r Which editor should be displayed by default. Either 'tinymce', 'html', or 'test'.
 	 */
 	return apply_filters( 'wp_default_editor', $r );
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9bed2824fc..cd514aad21 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta1-39138';
+$wp_version = '4.7-beta1-39139';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.