From 5742174ba84fe86ac89ab82d4ad6fdcd80b7e72e Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Mon, 24 Nov 2014 23:12:22 +0000
Subject: [PATCH] Remove incorrect documentation for `wp.media()`.

props ericlewis.
fixes #30090.
Built from https://develop.svn.wordpress.org/trunk@30556


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

diff --git a/wp-includes/js/media-models.js b/wp-includes/js/media-models.js
index c8b9b3f0ec..84bb02fa05 100644
--- a/wp-includes/js/media-models.js
+++ b/wp-includes/js/media-models.js
@@ -7,9 +7,7 @@ window.wp = window.wp || {};
 	/**
 	 * Create and return a media frame.
 	 *
-	 * Handles the default media experience. Automatically creates
-	 * and opens a media frame, and returns the result.
-	 * Does nothing if the controllers do not exist.
+	 * Handles the default media experience.
 	 *
 	 * @param  {object} attributes The properties passed to the main media controller.
 	 * @return {wp.media.view.MediaFrame} A media workflow.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2d99ab3518..4dfae5df99 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30555';
+$wp_version = '4.1-beta2-30556';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.