From 5c7aa3c5b8ee9cd1010383907a2526e437663a3b Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 1 Nov 2016 19:56:30 +0000
Subject: [PATCH] Editor: Correct the description of the parameter passed to
 the `wp_default_editor` filter.

Props goto10
Fixes #38327

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


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

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 8e58b5cf49..9be181ce93 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -3018,7 +3018,8 @@ function wp_default_editor() {
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param array $r An array of editors. Accepts 'tinymce', 'html', 'test'.
+	 * @param string $r string 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 8b78105351..e53c43722a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta1-39073';
+$wp_version = '4.7-beta1-39074';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.