From ac74c103a8770bb88d09d207a126d8a8cd360a71 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 22 May 2016 17:18:27 +0000
Subject: [PATCH] Docs: Fix some parameter alignment and backtick-escaping in
 two DocBlocks in wp-admin/includes/media.php.

See #32246.

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


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

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 75ec0d144b..5ee92e7ba9 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -263,7 +263,7 @@ win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
  *
  * @since 2.5.0
  *
- * @param string $file_id   Index of the $_FILES array that the file was sent. Required.
+ * @param string $file_id   Index of the `$_FILES` array that the file was sent. Required.
  * @param int    $post_id   The post ID of a post to attach the media item to. Required, but can
  *                          be set to 0, creating a media item that has no relationship to a post.
  * @param array  $post_data Overwrite some of the attachment. Optional.
@@ -384,11 +384,11 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
  *
  * @since 2.6.0
  *
- * @param array $file_array Array similar to a $_FILES upload array
- * @param int $post_id The post ID the media is associated with
- * @param string $desc Description of the sideloaded file
- * @param array $post_data allows you to overwrite some of the attachment
- * @return int|object The ID of the attachment or a WP_Error on failure
+ * @param array  $file_array Array similar to a `$_FILES` upload array.
+ * @param int    $post_id    The post ID the media is associated with.
+ * @param string $desc       Optional. Description of the side-loaded file. Default null.
+ * @param array  $post_data  Optional. Post data to override. Default empty array.
+ * @return int|object The ID of the attachment or a WP_Error on failure.
  */
 function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data = array() ) {
 	$overrides = array('test_form'=>false);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index eac9f57373..8740f8c044 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37483';
+$wp_version = '4.6-alpha-37484';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.