From a5593a64d31dfbe02991cfe9fb584dbfc03ed088 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 1 Jan 2015 19:21:27 +0000
Subject: [PATCH] More-specific docs for `wp_embed_handler_youtube()`.

Fixes #30711.

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


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

diff --git a/wp-includes/media.php b/wp-includes/media.php
index 57fae428fa..14428bacb3 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -2293,9 +2293,9 @@ function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
 }
 
 /**
- * YouTube embed handler callback.
+ * YouTube iframe embed handler callback.
  *
- * Catches URLs that can be parsed but aren't supported by oEmbed.
+ * Catches YouTube iframe embed URLs that are not parsable by oEmbed but can be translated into a URL that is.
  *
  * @since 4.0.0
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8eac113ab1..b5bb7b734a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31017';
+$wp_version = '4.2-alpha-31018';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.