From 2dfc3a7572744b56be63394cf0cb2c8dbfe2730c Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 24 Oct 2016 13:13:58 +0000
Subject: [PATCH] General: Correct the docs for the default HTTP status code
 used by `wp_die()`.

See #37770

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


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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index fb732e6590..ea0b343752 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2574,7 +2574,7 @@ function wp_nonce_ays( $action ) {
  *     Optional. Arguments to control behavior. If `$args` is an integer, then it is treated
  *     as the response code. Default empty array.
  *
- *     @type int    $response       The HTTP response code. Default 500.
+ *     @type int    $response       The HTTP response code. Default 200 for Ajax requests, 500 otherwise.
  *     @type bool   $back_link      Whether to include a link to go back. Default false.
  *     @type string $text_direction The text direction. This is only useful internally, when WordPress
  *                                  is still loading and the site's locale is not set up yet. Accepts 'rtl'.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index fac0dd7dde..53fdb0cce2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38883';
+$wp_version = '4.7-alpha-38884';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.