From b66c58f76a810324ac00635dda5243f6edae84d1 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 21 Nov 2014 17:08:23 +0000
Subject: [PATCH] Update the inline docs for `wp_die()` to reflect parameter
 changes made in r30355

See #10551

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


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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index f69db20f54..7b41842027 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2338,12 +2338,15 @@ function wp_nonce_ays( $action ) {
  * the `$title` parameter (the default title would apply) or the `$args` parameter.
  *
  * @since 2.0.4
+ * @since 4.1.0 The `$title` and `$args` parameters were changed to optionally accept
+ *              an integer to be used as the response code.
  *
  * @param string|WP_Error  $message Optional. Error message. If this is a {@see WP_Error} object,
  *                                  the error's messages are used. Default empty.
  * @param string|int       $title   Optional. Error title. If `$message` is a `WP_Error` object,
  *                                  error data with the key 'title' may be used to specify the title.
- *                                  Default empty.
+ *                                  If `$title` is an integer, then it is treated as the response
+ *                                  code. Default empty.
  * @param string|array|int $args {
  *     Optional. Arguments to control behavior. If `$args` is an integer, then it is treated
  *     as the response code. Default empty array.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 61ddcf602d..3bc91bfdd8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30506';
+$wp_version = '4.1-beta2-30507';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.