From 2466f3fea028601800722804c1f0c69b3acb5fce Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Thu, 25 Dec 2008 20:25:58 +0000
Subject: [PATCH] * Theres no actual PECL release for JSON where the
 json_last_error exists in, so lets just say 5.3.0 for now * Merge Simion's
 grammar changes to json_last_error * Fix typo in example

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271882 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/json/functions/json-last-error.xml | 13 +++++++------
 reference/json/versions.xml                  |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/reference/json/functions/json-last-error.xml b/reference/json/functions/json-last-error.xml
index d5511e52f0..35cdc53843 100644
--- a/reference/json/functions/json-last-error.xml
+++ b/reference/json/functions/json-last-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry xml:id="function.json-last-error" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>json_last_error</refname>
@@ -25,7 +25,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an integer, the value can be one of the following: 
+   Returns an integer, the value can be one of the following 
+   constants: 
   </para>
   <table>
    <title>JSON error codes</title>
@@ -39,15 +40,15 @@
     <tbody>
      <row>
       <entry><constant>JSON_ERROR_NONE</constant></entry>
-      <entry>No error have occured</entry>
+      <entry>No error has occured</entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_DEPTH</constant></entry>
-      <entry>The maximum stack depth have been exceeded</entry>
+      <entry>The maximum stack depth has been exceeded</entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_CTRL_CHAR</constant></entry>
-      <entry>Control character error, possibly wrongly encoded</entry>
+      <entry>Control character error, possibly incorrectly encoded</entry>
      </row>
      <row>
       <entry><constant>JSON_ERROR_SYNTAX</constant></entry>
@@ -70,7 +71,7 @@
 $json[] = '{"Organization": "PHP Documentation Team"}';
 
 // An invalid json string which will cause an syntax 
-// error, in this cause we used ' instead of " for quotation
+// error, in this case we used ' instead of " for quotation
 $json[] = "{'Organization': 'PHP Documentation Team'}";
 
 
diff --git a/reference/json/versions.xml b/reference/json/versions.xml
index e081565d0d..6f72465471 100644
--- a/reference/json/versions.xml
+++ b/reference/json/versions.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!--
   Do NOT translate this file
 -->
 <versions>
  <function name='json_decode' from='PHP 5 &gt;= 5.2.0, PECL json &gt;= 1.2.0'/>
  <function name='json_encode' from='PHP 5 &gt;= 5.2.0, PECL json &gt;= 1.2.0'/>
- <function name='json_last_error' from='PHP 5 &gt;= 5.3.0, PECL json &gt;= 1.2.2'/>
+ <function name='json_last_error' from='PHP 5 &gt;= 5.3.0'/>
 </versions>
 
 <!-- Keep this comment at the end of the file