From 3b09ff696e91d8630eaf1e855d01520483639f1e Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Fri, 31 Mar 2017 17:40:30 +0000
Subject: [PATCH] Fix doc bug #67496 (json_encode changed behaviour in 5.5)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@342210 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/json/functions/json-encode.xml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/reference/json/functions/json-encode.xml b/reference/json/functions/json-encode.xml
index 0486b196c1..ed84f7745c 100644
--- a/reference/json/functions/json-encode.xml
+++ b/reference/json/functions/json-encode.xml
@@ -104,7 +104,8 @@
       <row>
        <entry>5.6.6</entry>
        <entry>
-        <constant>JSON_PRESERVE_ZERO_FRACTION</constant> <parameter>option</parameter> was added.
+        <constant>JSON_PRESERVE_ZERO_FRACTION</constant>
+        <parameter>option</parameter> was added.
        </entry>
       </row>
       <row>
@@ -113,10 +114,26 @@
         <parameter>depth</parameter> parameter was added.
        </entry>
       </row>
+      <row>
+       <entry>5.5.0</entry>
+       <entry>
+        <constant>JSON_PARTIAL_OUTPUT_ON_ERROR</constant> option was added.
+       </entry>
+      </row>
+      <row>
+       <entry>5.5.0</entry>
+       <entry>
+        The return value on failure was changed from <literal>null</literal>
+        string to &false;.
+       </entry>
+      </row>
       <row>
        <entry>5.4.0</entry>
        <entry>
-        <constant>JSON_PRETTY_PRINT</constant>, <constant>JSON_UNESCAPED_SLASHES</constant>, and <constant>JSON_UNESCAPED_UNICODE</constant> <parameter>options</parameter> were added.
+        <constant>JSON_PRETTY_PRINT</constant>,
+        <constant>JSON_UNESCAPED_SLASHES</constant>, and
+        <constant>JSON_UNESCAPED_UNICODE</constant>
+        <parameter>options</parameter> were added.
        </entry>
       </row>
       <row>