From e1325b0b7d9e6462e2b91e9f96efa6b16530b657 Mon Sep 17 00:00:00 2001
From: Mehdi Achour <didou@php.net>
Date: Mon, 1 Jan 2007 16:03:48 +0000
Subject: [PATCH] Fix bug #39806 and link to the JSON official site

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@226196 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/json/functions/json_encode.xml | 5 ++++-
 reference/json/reference.xml             | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/reference/json/functions/json_encode.xml b/reference/json/functions/json_encode.xml
index aa60ddf121..86d3afffd9 100644
--- a/reference/json/functions/json_encode.xml
+++ b/reference/json/functions/json_encode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.json-encode">
  <refnamediv>
   <refname>json_encode</refname>
@@ -29,6 +29,9 @@
        The <parameter>value</parameter> being encoded. Can be any type except
        a <type>resource</type>.
       </para>
+      <para>
+       This function only works with UTF-8 encoded data.
+      </para>
      </listitem>
     </varlistentry>
    </variablelist>
diff --git a/reference/json/reference.xml b/reference/json/reference.xml
index b6df603e82..ecf2281afa 100644
--- a/reference/json/reference.xml
+++ b/reference/json/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- Purpose: basic.other -->
 <!-- Membership: pecl, bundled -->
 <reference id="ref.json">
@@ -10,7 +10,8 @@
   <section id="json.intro">
    &reftitle.intro;
    <para>
-    This extension implements the JavaScript Object Notation (JSON) 
+    This extension implements the <ulink
+     url="&url.json;">JavaScript Object Notation (JSON)</ulink> 
     data-interchange format. The decoding is handled by a parser based on 
     the JSON_checker by Douglas Crockford.
    </para>