cvs: phpdoc /en/reference/json reference.xml /en/reference/json/functions json_encode.xml /entities global.ent

didou Mon Jan 1 16:03:48 2007 UTC Modified files: /phpdoc/entities global.ent /phpdoc/en/reference/json reference.xml /phpdoc/en/reference/json/functions json_encode.xml Log: Fix bug #39806 and link to the JSON official site http://cvs.php.net/viewvc.cgi/phpdoc/entities/global.ent?r1=1.277&r2=1.278&diff_format=u Index: phpdoc/entities/global.ent diff -u phpdoc/entities/global.ent:1.277 phpdoc/entities/global.ent:1.278 --- phpdoc/entities/global.ent:1.277 Thu Nov 30 08:40:49 2006 +++ phpdoc/entities/global.ent Mon Jan 1 16:03:47 2007 @@ -1,6 +1,6 @@ <!-- -*- SGML -*- - $Id: global.ent,v 1.277 2006/11/30 08:40:49 vrana Exp $ + $Id: global.ent,v 1.278 2007/01/01 16:03:47 didou Exp $ Contains global "macros" for all the XML documents. @@ -153,6 +153,7 @@ <!ENTITY url.jade "http://www.jclark.com/jade/"> <!ENTITY url.jclark "http://www.jclark.com/bio.htm"> <!ENTITY url.jpeg "ftp://ftp.uu.net/graphics/jpeg/"> +<!ENTITY url.json "http://www.json.org/"> <!ENTITY url.kadm5 'http://oss.gonicus.de/project/?group_id=7'> <!ENTITY url.kerberos.docs 'http://web.mit.edu/kerberos/www/krb5-1.2/krb5-1.2.8/doc/admin_toc.html'> <!ENTITY url.kerberos.info 'http://web.mit.edu/kerberos/www/'> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/reference.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/json/reference.xml diff -u phpdoc/en/reference/json/reference.xml:1.2 phpdoc/en/reference/json/reference.xml:1.3 --- phpdoc/en/reference/json/reference.xml:1.2 Fri Sep 8 12:30:07 2006 +++ phpdoc/en/reference/json/reference.xml Mon Jan 1 16:03:48 2007 @@ -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> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/functions/json_encode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/json/functions/json_encode.xml diff -u phpdoc/en/reference/json/functions/json_encode.xml:1.1 phpdoc/en/reference/json/functions/json_encode.xml:1.2 --- phpdoc/en/reference/json/functions/json_encode.xml:1.1 Wed Aug 2 15:43:50 2006 +++ phpdoc/en/reference/json/functions/json_encode.xml Mon Jan 1 16:03:48 2007 @@ -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>