From 68432b0cd1fe42abd6eb996730ead89ebc0035d4 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Fri, 28 Nov 2014 11:36:23 +0000
Subject: [PATCH] 4.1 Docs Audit: Ensure optional arguments in
 `wp_json_encode()` are properly documented as such.

See #30469.

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


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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 9f229291a7..2a2de21cdd 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2641,8 +2641,9 @@ function _scalar_wp_die_handler( $message = '' ) {
  * @since 4.1.0
  *
  * @param mixed $data    Variable (usually an array or object) to encode as JSON.
- * @param int   $options Options to be passed to json_encode(). Default 0.
- * @param int   $depth   Maximum depth to walk through $data. Must be greater than 0, default 512.
+ * @param int   $options Optional. Options to be passed to json_encode(). Default 0.
+ * @param int   $depth   Optional. Maximum depth to walk through $data. Must be
+ *                       greater than 0. Default 512.
  * @return bool|string The JSON encoded string, or false if it cannot be encoded.
  */
 function wp_json_encode( $data, $options = 0, $depth = 512 ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6a04e37b28..9ab66f4c47 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30612';
+$wp_version = '4.1-beta2-30613';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.