cvs: phpdoc-ja / language-snippets.ent /appendices comparisons.xml /reference/ctype/functions ctype-alnum.xml /reference/curl/functions
curl-setopt.xml /reference/dbase reference.xml /reference/errorfunc examples.xml /reference/ibm_db2/functions db2-exec.xml db2-execute.xml
/reference/icap reference.xml /reference/image configure.xml reference.xml /reference/image/functions imageftbbox.xml imagefttext.xml
/reference/memcache ini.xml /reference/mysqli/functions mysqli-stmt-prepare.xml /reference/pcre/functions preg-replace.xml /reference/sdo
reference.xml /reference/strings/functions setlocale.xml /reference/zip/functions zip-entry-close.xml zip-entry-compressedsize.xml
| From: | TAKAGI Masahiro | Date: | Sun, 08 Oct 2006 04:45:25 +0000 |
| Subject: | cvs: phpdoc-ja / language-snippets.ent /appendices comparisons.xml /reference/ctype/functions ctype-alnum.xml /reference/curl/functions curl-setopt.xml /reference/dbase reference.xml /reference/errorfunc examples.xml /reference/ibm_db2/functions db2-exec.xml db2-execute.xml /reference/icap reference.xml /reference/image configure.xml reference.xml /reference/image/functions imageftbbox.xml imagefttext.xml /reference/memcache ini.xml /reference/mysqli/functions mysqli-stmt-prepare.xml /reference/pcre/functions preg-replace.xml /reference/sdo reference.xml /reference/strings/functions setlocale.xml /reference/zip/functions zip-entry-close.xml zip-entry-compressedsize.xml |
||
| Groups: | php.doc.ja | ||
| Request: | Send a blank email to doc-ja+get-1621@lists.php.net to get a copy of this message | ||
takagi Sun Oct 8 04:45:25 2006 UTC
Modified files:
/phpdoc-ja/reference/zip/functions zip-entry-compressedsize.xml
zip-entry-close.xml
/phpdoc-ja/reference/strings/functions setlocale.xml
/phpdoc-ja/reference/sdo reference.xml
/phpdoc-ja/reference/pcre/functions preg-replace.xml
/phpdoc-ja/reference/mysqli/functions mysqli-stmt-prepare.xml
/phpdoc-ja/reference/memcache ini.xml
/phpdoc-ja/reference/image/functions imagefttext.xml
imageftbbox.xml
/phpdoc-ja/reference/image reference.xml configure.xml
/phpdoc-ja/reference/icap reference.xml
/phpdoc-ja/reference/ibm_db2/functions db2-execute.xml db2-exec.xml
/phpdoc-ja/reference/errorfunc examples.xml
/phpdoc-ja/reference/dbase reference.xml
/phpdoc-ja/reference/curl/functions curl-setopt.xml
/phpdoc-ja/reference/ctype/functions ctype-alnum.xml
/phpdoc-ja/appendices comparisons.xml
/phpdoc-ja language-snippets.ent
Log:
sync with en.
http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml diff -u phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml:1.4 phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml:1.5 --- phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml:1.4 Mon Jan 3 17:08:54 2005 +++ phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml Sun Oct 8 04:45:23 2006 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- EN-Revision: 1.3 Maintainer: hirokawa Status: ready --> <refentry id="function.zip-entry-compressedsize"> <refnamediv> <refname>zip_entry_compressedsize</refname> - <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªã®å§ç¸®æã®ãµã¤ãºãåå¾ã</refpurpose> + <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªã®å§ç¸®æã®ãµã¤ãºãåå¾ãã</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/zip/functions/zip-entry-close.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/zip/functions/zip-entry-close.xml diff -u phpdoc-ja/reference/zip/functions/zip-entry-close.xml:1.7 phpdoc-ja/reference/zip/functions/zip-entry-close.xml:1.8 --- phpdoc-ja/reference/zip/functions/zip-entry-close.xml:1.7 Mon Aug 14 21:07:35 2006 +++ phpdoc-ja/reference/zip/functions/zip-entry-close.xml Sun Oct 8 04:45:23 2006 @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry id="function.zip-entry-close"> <refnamediv> <refname>zip_entry_close</refname> - <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªãã¯ãã¼ãºãã</refpurpose> + <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªãéãã</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; @@ -14,7 +14,7 @@ <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam> </methodsynopsis> <para> - æå®ããããã£ã¬ã¯ããªã¨ã³ããªãã¯ãã¼ãºãã¾ãã + æå®ããããã£ã¬ã¯ããªã¨ã³ããªãéãã¾ãã </para> </refsect1> <refsect1 role="parameters"> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/strings/functions/setlocale.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/strings/functions/setlocale.xml diff -u phpdoc-ja/reference/strings/functions/setlocale.xml:1.6 phpdoc-ja/reference/strings/functions/setlocale.xml:1.7 --- phpdoc-ja/reference/strings/functions/setlocale.xml:1.6 Mon Oct 17 12:36:56 2005 +++ phpdoc-ja/reference/strings/functions/setlocale.xml Sun Oct 8 04:45:23 2006 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./ja/functions/strings.xml, last change in rev 1.1 --> -<!-- EN-Revision: 1.26 Maintainer: hirokawa Status: ready --> +<!-- EN-Revision: 1.27 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id="function.setlocale"> <refnamediv> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/sdo/reference.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/sdo/reference.xml diff -u phpdoc-ja/reference/sdo/reference.xml:1.5 phpdoc-ja/reference/sdo/reference.xml:1.6 --- phpdoc-ja/reference/sdo/reference.xml:1.5 Sun Jun 11 19:54:23 2006 +++ phpdoc-ja/reference/sdo/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.23 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.25 Maintainer: takagi Status: ready --> <!-- Purpose: database.abstract --> <!-- Membership: pecl --> -<!-- State: experimental --> <reference id="ref.sdo"> <title>SDO é¢æ°</title> @@ -42,7 +41,7 @@ Service Data Objects specification </ulink> ã®æ¦å¿µã«ç±æ¥ãããã®ã§ãã - <ulink url="&url.apache.tuscany;">Apache Tuscany</ulink> SDO 2.0 for C++ project + <ulink url="&url.apache.tuscany;">Apache Tuscany</ulink> SDO for C++ project ãå«ãã§ãã¾ãã </para> @@ -96,6 +95,15 @@ <section id="sdo.installation"> &reftitle.install; + <note> + <para> + åæã®ãã¼ã¸ã§ã³ã® SDO æ¡å¼µã¢ã¸ã¥ã¼ã«ã¯ãXML DAS + ç¨ã«å¥ã®å ±æã©ã¤ãã©ãªãå¿ è¦ã§ãããããã¯ä»ã¯ä½¿ããã¦ããªãã®ã§ã + <filename>php_sdo_das_xml.dll</filename> ã + <filename>sdo_das_xml.so</filename> ã¸ã®åç §ã + &php.ini; ããåé¤ãã¦ãã ããã + </para> + </note> <procedure id='sdo.install.unix'> <title>Unix ã·ã¹ãã </title> <step> @@ -109,7 +117,7 @@ </screen> </para> <para> - ãã®ã³ãã³ã㯠SDO ããã³ XML å ±æã©ã¤ãã©ãªããã«ããã + ãã®ã³ãã³ã㯠SDO å ±æã©ã¤ãã©ãªããã«ããã ãªã¬ã¼ã·ã§ãã« DAS ã® PHP ãã¡ã¤ã«ãã¤ã³ã¹ãã¼ã«ãã¾ãã </para> <para> @@ -123,13 +131,12 @@ </step> <step> <para> - <command>pecl</command> ã³ãã³ãã¯ãSDO ããã³ SDO_DAS_XML + <command>pecl</command> ã³ãã³ãã¯ãSDO ã¢ã¸ã¥ã¼ã«ãèªåçã« PHP æ¡å¼µã¢ã¸ã¥ã¼ã«ãã£ã¬ã¯ããªã«ã¤ã³ã¹ãã¼ã«ãã¾ãã SDO æ¡å¼µã¢ã¸ã¥ã¼ã«ãæå¹ã«ããã«ã¯ã以ä¸ã®è¡ã &php.ini; ã«è¿½å ããªããã°ãªãã¾ããã <screen> <![CDATA[ extension=sdo.so -extension=sdo_das_xml.so ]]> </screen> </para> @@ -145,9 +152,8 @@ <title>Windows</title> <step> <para> - SDO ã³ã¢ããã³ XML DAS ã®ææ°çã® DLL ã¯ããããã - <ulink url='&url.pecl.win.ext;php_sdo.dll'>php_sdo.dll</ulink> ããã³ - <ulink url='&url.pecl.win.ext;php_sdo_das_xml.dll'>php_sdo_das_xml.dll</ulink> + SDO ã®ææ°çã® DLL ã¯ã + <ulink url='&url.pecl.win.ext;php_sdo.dll'>php_sdo.dll</ulink> ãããã¦ã³ãã¼ãã§ãã¾ãã </para> <para> @@ -158,14 +164,13 @@ </step> <step> <para> - <command>pecl</command> ã³ãã³ãã¯ãSDO ããã³ SDO_DAS_XML + <command>pecl</command> ã³ãã³ãã¯ãSDO ã¢ã¸ã¥ã¼ã«ãèªåçã« PHP æ¡å¼µã¢ã¸ã¥ã¼ã«ãã£ã¬ã¯ããªã«ã¤ã³ã¹ãã¼ã«ãã¾ãã SDO æ¡å¼µã¢ã¸ã¥ã¼ã«ãæå¹ã«ããã«ã¯ã以ä¸ã®è¡ã &php.ini; ã«è¿½å ããªããã°ãªãã¾ããã <screen> <![CDATA[ extension=php_sdo.dll -extension=php_sdo_das_xml.dll ]]> </screen> </para> @@ -205,8 +210,7 @@ <step> <para> <command>phpize</command> ãå®è¡ãã¾ããããã«ããã - SDO ããã³ XML ãã¼ã¿ã¢ã¯ã»ã¹ãµã¼ãã¹ãã³ã³ãã¤ã«ããããã® - ç°å¢ãè¨å®ãã¾ãã + SDO ãã³ã³ãã¤ã«ããããã®ç°å¢ãè¨å®ãã¾ãã </para> </step> <step> @@ -219,9 +223,8 @@ <step> <para> &php.ini; ãã¡ã¤ã«ã« - <command>extension=sdo.so</command> ããã³ - <command>extension=sdo_das_xml.so</command> ããã®é åºã§ - 追å ãããã¨ã§ããããã®ã¢ã¸ã¥ã¼ã«ã PHP ã«èªã¿è¾¼ã¾ããããã«ãã¾ãã + <command>extension=sdo.so</command> + ã追å ãããã¨ã§ããã®ã¢ã¸ã¥ã¼ã«ã PHP ã«èªã¿è¾¼ã¾ããããã«ãã¾ãã </para> </step> </procedure> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/pcre/functions/preg-replace.xml?r1=1.9&r2=1.10&diff_format=u Index: phpdoc-ja/reference/pcre/functions/preg-replace.xml diff -u phpdoc-ja/reference/pcre/functions/preg-replace.xml:1.9 phpdoc-ja/reference/pcre/functions/preg-replace.xml:1.10 --- phpdoc-ja/reference/pcre/functions/preg-replace.xml:1.9 Fri Jun 23 21:02:13 2006 +++ phpdoc-ja/reference/pcre/functions/preg-replace.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.9 $ --> -<!-- EN-Revision: 1.17 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.10 $ --> +<!-- EN-Revision: 1.18 Maintainer: hirokawa Status: ready --> <!-- Credits: haruki --> <refentry id="function.preg-replace"> <refnamediv> @@ -84,7 +84,7 @@ <parameter>pattern</parameter> ããã³ <parameter>replacement</parameter> ã®ãããããé åã®å ´åãå <parameter>pattern</parameter> 㯠対å¿ãã <parameter>replacement</parameter> ã«ç½®æããã¾ãã - ããã<parameter>replacement</parameter> é åã <parameter>pattern</parameter> + ããã<parameter>replacement</parameter> é åã®è¦ç´ ã®æ°ã <parameter>pattern</parameter> é åãããå°ãªãå ´åã¯ãä½ã£ã <parameter>pattern</parameter> 㯠空æåã«ç½®æããã¾ãã </para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml diff -u phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml:1.1 phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml:1.2 --- phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml:1.1 Sun Sep 25 05:43:27 2005 +++ phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> <refentry id="function.mysqli-stmt-prepare"> <refnamediv> <refname>mysqli_stmt_prepare</refname> @@ -146,7 +146,7 @@ $city = "Amersfoort"; /* ããªãã¢ãã¹ãã¼ãã¡ã³ããä½æãã¾ã */ -$stmt = mysqli_stmt_init(); +$stmt = mysqli_stmt_init($link); if ($stmt = mysqli_stmt_prepare($stmt, "SELECT District FROM City WHERE Name=?")) { /* ãã¼ã«ã«ãã©ã¡ã¼ã¿ããã¤ã³ããã¾ã */ http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/memcache/ini.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-ja/reference/memcache/ini.xml diff -u phpdoc-ja/reference/memcache/ini.xml:1.2 phpdoc-ja/reference/memcache/ini.xml:1.3 --- phpdoc-ja/reference/memcache/ini.xml:1.2 Tue Sep 12 03:50:47 2006 +++ phpdoc-ja/reference/memcache/ini.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> <section id="memcache.ini"> &reftitle.runtime; &extension.runtime; @@ -39,7 +39,7 @@ </tgroup> </table> &ini.php.constants; -</para> + </para> &ini.descriptions.title; @@ -58,6 +58,20 @@ </listitem> </varlistentry> + <varlistentry id="ini.memcache.max-failover-attempts"> + <term> + <parameter>memcache.max_failover_attempts</parameter> + <type>integer</type> + </term> + <listitem> + <para> + ãã¼ã¿ã®è¨å®ãåå¾ã試ã¿ããµã¼ãã®æ°ãæå®ãã¾ãã + memcache.allow_failover ãæå®ããå ´åã«ã®ã¿ä½¿ç¨ãã¾ãã + ãã®é ç®ã¯ããã¼ã¸ã§ã³ 2.1.0 以éã§ä½¿ç¨å¯è½ã§ãã + </para> + </listitem> + </varlistentry> + <varlistentry id="ini.memcache.chunk-size"> <term> <parameter>memcache.chunk_size</parameter> @@ -87,7 +101,7 @@ </varlistentry> </variablelist> - </para> +</para> </section> <!-- Keep this comment at the end of the file http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/functions/imagefttext.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/image/functions/imagefttext.xml diff -u phpdoc-ja/reference/image/functions/imagefttext.xml:1.5 phpdoc-ja/reference/image/functions/imagefttext.xml:1.6 --- phpdoc-ja/reference/image/functions/imagefttext.xml:1.5 Sat Jul 2 08:00:47 2005 +++ phpdoc-ja/reference/image/functions/imagefttext.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id='function.imagefttext'> <refnamediv> @@ -25,6 +25,8 @@ </methodsynopsis> <para> &warn.undocumented.func; + ¬e.gd.2; + ¬e.freetype; </para> <note> <para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/functions/imageftbbox.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/image/functions/imageftbbox.xml diff -u phpdoc-ja/reference/image/functions/imageftbbox.xml:1.5 phpdoc-ja/reference/image/functions/imageftbbox.xml:1.6 --- phpdoc-ja/reference/image/functions/imageftbbox.xml:1.5 Sat Jul 2 08:00:47 2005 +++ phpdoc-ja/reference/image/functions/imageftbbox.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.5 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id='function.imageftbbox'> <refnamediv> @@ -21,6 +21,8 @@ </methodsynopsis> <para> &warn.undocumented.func; + ¬e.gd.2; + ¬e.freetype; </para> <note> <para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/reference.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc-ja/reference/image/reference.xml diff -u phpdoc-ja/reference/image/reference.xml:1.11 phpdoc-ja/reference/image/reference.xml:1.12 --- phpdoc-ja/reference/image/reference.xml:1.11 Wed Jun 7 03:13:46 2006 +++ phpdoc-ja/reference/image/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 1.27 Maintainer: hirokawa Status: ready --> -<!-- $Revision: 1.11 $ --> +<!-- EN-Revision: 1.28 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.12 $ --> <!-- Purpose: utilspec.image --> <!-- Membership: bundled --> @@ -29,11 +29,21 @@ 大ãããç¥ããã¨ãã§ãã¾ãã </para> <para> + <link linkend="ref.exif">exif æ¡å¼µã¢ã¸ã¥ã¼ã«</link> ã使ç¨ããã¨ã + <acronym>JPEG</acronym> ã <acronym>TIFF</acronym> + ç»åã®ãããã«ä¿åãããæ å ±ãæ±ããã¨ãã§ãã¾ãã + ããã«ããããã¸ã¿ã«ã«ã¡ã©ãä½æããã¡ã¿ãã¼ã¿ãèªã¿è¾¼ããã¨ãã§ãã¾ãã + exif é¢æ°ã¯ <acronym>GD</acronym> ã©ã¤ãã©ãªãå¿ è¦ã¨ãã¾ããã + </para> + + <para> <note> <simpara> - ã¤ã¡ã¼ã¸ã®èªã¿è¾¼ã¿ãæ¸ãè¾¼ã¿ãä¿®æ£ã®æ©è½ã®æ¡å¼µããã¸ã¿ã«ã«ã¡ã© - ã«ããæ®å½±ãããç»åã®ã¡ã¿ãã¼ã¿ãèªã¿è¾¼ãã«ã¯ãè¦æ±ã®ç¯ãèªã - ã§ãã ããã + ã¤ã¡ã¼ã¸ã®èªã¿è¾¼ã¿ãæ¸ãè¾¼ã¿ãä¿®æ£ã®æ©è½ãæ¡å¼µããã«ã¯ã + è¦æ±ã®ç¯ãå¼ãã§ãã ããã + ãã¸ã¿ã«ã«ã¡ã©ã§æ®å½±ããç»åã®ã¡ã¿ãã¼ã¿ãèªã¿è¾¼ãã«ã¯ã + ä¸ã§èª¬æãã <link linkend="ref.exif">exif + æ¡å¼µã¢ã¸ã¥ã¼ã«</link> ãå¿ è¦ã§ãã </simpara> </note> </para> @@ -147,22 +157,13 @@ <entry><literal>T1lib</literal></entry> <entry><ulink url="&url.t1lib;">&url.t1lib;</ulink>)</entry> <entry> - Type 1ãã©ã³ãããµãã¼ããã¾ãã + Postscript Type 1 ãã©ã³ãããµãã¼ããã¾ãã </entry> </row> </tbody> </tgroup> </table> </para> - - <para> - <option role="configure">--enable-exif</option>ãæå®ãã¦PHPãã³ - ã³ãã¤ã«ããå ´åã<acronym>JPEG</acronym>ããã³ - <acronym>TIFF</acronym>ã¤ã¡ã¼ã¸ã®ãããã«æ ¼ç´ãããæ å ±ãå¦çãã - ãã¨ãã§ããããã«ãªãã¾ããããã«ããã以ä¸ã«ç¤ºãããã«ãã¸ã¿ã« - ã«ã¡ã©ã«ããçæãããã¡ã¿ãã¼ã¿ãèªããã¨ãã§ããããã«ãªãã¾ãã - 以ä¸ã®é¢æ°ã¯ã<acronym>GD</acronym>ã©ã¤ãã©ãªãå¿ è¦ã¨ãã¾ããã - </para> </section> &reference.image.configure; http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/configure.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/image/configure.xml diff -u phpdoc-ja/reference/image/configure.xml:1.5 phpdoc-ja/reference/image/configure.xml:1.6 --- phpdoc-ja/reference/image/configure.xml:1.5 Tue Jun 13 21:23:01 2006 +++ phpdoc-ja/reference/image/configure.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.10 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.11 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <section id="image.installation"> &reftitle.install; @@ -20,12 +20,6 @@ <function>imagecreatetruecolor</function>ã®ããã«Trueã«ã©ã¼ãåªå ãããé¢æ° ã«ã¤ãã¦ã¯GD2ãå¿ é ã§ãã </para> - <note> - <para> - Windows 㧠exif ãµãã¼ããæå¹ã«ããã«ã¯ãphp.ini å 㧠php_mbstring.dll - ã php_exif.dll ã®åã«ãã¼ãããå¿ è¦ãããã¾ãã - </para> - </note> <para id="image.configure.php3"> PHP3ã«ããã¦GDãµãã¼ããç¡å¹ã«ããã«ã¯ <option role="configure">--without-gd</option>ãæå®ãã¦ãã ããã @@ -107,7 +101,7 @@ <row> <entry><literal>T1lib</literal></entry> <entry> - T1lib (Type 1 fonts) ããµãã¼ãããã«ã¯ + T1lib (Postscript Type 1 ãã©ã³ã) ããµãã¼ãããã«ã¯ <option role="configure">--with-t1lib[=DIR]</option>ãæå®ãã¾ãã </entry> </row> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/icap/reference.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/icap/reference.xml diff -u phpdoc-ja/reference/icap/reference.xml:1.6 phpdoc-ja/reference/icap/reference.xml:1.7 --- phpdoc-ja/reference/icap/reference.xml:1.6 Mon Sep 5 11:34:06 2005 +++ phpdoc-ja/reference/icap/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.5 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> <!-- State: deprecated --> <reference id="ref.icap"> - <title>ICAP é¢æ°ï¼éæ¨å¥¨ï¼</title> + <title>ICAP é¢æ° (åé¤ããã¾ãã)</title> <titleabbrev>ICAP</titleabbrev> <partintro> @@ -12,8 +12,8 @@ &reftitle.intro; <note> <simpara> - icapãµãã¼ãã¯ãè¿ãå°æ¥åé¤ããã¾ãããã®ã¢ã¸ã¥ã¼ã«ã - icap ã©ã¤ãã©ãªã®å¯¾å¿ãããã¼ã¸ã§ã³ããµãã¼ããããªããªãã¾ãã + icap ãµãã¼ãã¯ãPHP ããåé¤ããã¾ããããã®ã¢ã¸ã¥ã¼ã«ã + icap ã©ã¤ãã©ãªã®å¯¾å¿ãããã¼ã¸ã§ã³ãããã¯ããµãã¼ãããã¾ããã ã«ã¬ã³ãã¼æ©è½ã PHP ã§ä½¿ç¨ãããå ´åã¯ã代ããã« <link linkend="ref.mcal">mcal</link> ã使ç¨ãã¦ãã ããã </simpara> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml diff -u phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml:1.1 phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml:1.2 --- phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml:1.1 Sun Feb 19 04:55:55 2006 +++ phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <refentry id="function.db2-execute"> <refnamediv> <refname>db2_execute</refname> @@ -134,8 +134,202 @@ ]]> </screen> </example> + <example> + <title>XML ãã¼ã¿ã SQL ã®çµæã»ããã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãXML ã«ã©ã ã«æ ¼ç´ããããã¼ã¿ã®æ±ãæ¹ããSAMPLE + ãã¼ã¿ãã¼ã¹ãç¨ãã¦èª¬æãããã®ã§ããããåç´ãª SQL/XML + ã使ç¨ãã¦ããã®ä¾ã§ã¯ XML ããã¥ã¡ã³ãã®ããã¤ãã®ãã¼ãã + ã¿ãªããããªãã¿ã® SQL çµæã»ããå½¢å¼ã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = 'SELECT * FROM XMLTABLE( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' + COLUMNS + "CID" VARCHAR (50) PATH \'@Cid\', + "NAME" VARCHAR (50) PATH \'name\', + "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' + ) AS T + WHERE NAME = ? + '; + +$stmt = db2_prepare($conn, $query); + +$name = 'Kathy Smith'; + +if ($stmt) { + db2_bind_param($stmt, 1, "name", DB2_PARAM_IN); + db2_execute($stmt); + + while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE\n"); + } +} +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1000 Kathy Smith 416-555-1358 +1001 Kathy Smith 905-555-7258 +]]> + </screen> + </example> + <example> + <title>XML ãã¼ã¿ã® "JOIN"</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã® 2 ã¤ã®ç°ãªã + XML ã«ã©ã ã«æ ¼ç´ãããããã¥ã¡ã³ãã使ç¨ãã¾ãã + ã¾ãã2 ã¤ã®ç°ãªãã«ã©ã ã® XML ããã¥ã¡ã³ãããã¨ã«ã㦠+ 2 ã¤ã®ãã³ãã©ãªãã¼ãã«ãä½æãã¾ãã + ããã¦ç¹å®ã®é¡§å®¢ã®é éæ å ±ã SQL çµæã»ããã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' +SELECT A.CID, A.NAME, A.PHONE, C.PONUM, C.STATUS +FROM +XMLTABLE( +XMLNAMESPACES (DEFAULT \'http://posample.org\'), +\'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' +COLUMNS +"CID" BIGINT PATH \'@Cid\', +"NAME" VARCHAR (50) PATH \'name\', +"PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' +) as A, +PURCHASEORDER AS B, +XMLTABLE ( +XMLNAMESPACES (DEFAULT \'http://posample.org\'), +\'db2-fn:xmlcolumn("PURCHASEORDER.PORDER")/PurchaseOrder\' +COLUMNS +"PONUM" BIGINT PATH \'@PoNum\', +"STATUS" VARCHAR (50) PATH \'@Status\' +) as C +WHERE A.CID = B.CUSTID AND + B.POID = C.PONUM AND + A.NAME = ? +'; + +$stmt = db2_prepare($conn, $query); + +$name = 'Kathy Smith'; + +if ($stmt) { + db2_bind_param($stmt, 1, "name", DB2_PARAM_IN); + db2_execute($stmt); + + while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE $row->PONUM $row->STATUS\n"); + } +} +db2_close($conn); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1001 Kathy Smith 905-555-7258 5002 Shipped +]]> + </screen> + </example> + <example> + <title>大ã㪠XML ããã¥ã¡ã³ãã®ä¸é¨ã SQL ãã¼ã¿ã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã®ããã¥ã¡ã³ã PRODUCT.DESCRIPTION + ã®ä¸é¨ã使ç¨ãã¾ããããã¯ãååã®èª¬æ (XML ãã¼ã¿) ããã³ä¾¡æ ¼æ å ± + (SQL ãã¼ã¿) ãå«ã XML ããã¥ã¡ã³ããè¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' +SELECT +XMLSERIALIZE( +XMLQUERY(\' + declare boundary-space strip; + declare default element namespace "http://posample.org"; + <promoList> { + for $prod in $doc/product + where $prod/description/price < 10.00 + order by $prod/description/price ascending + return( + <promoitem> { + $prod, + <startdate> {$start} </startdate>, + <enddate> {$end} </enddate>, + <promoprice> {$promo} </promoprice> + } </promoitem> + ) + } </promoList> +\' passing by ref DESCRIPTION AS "doc", +PROMOSTART as "start", +PROMOEND as "end", +PROMOPRICE as "promo" +RETURNING SEQUENCE) +AS CLOB (32000)) +AS NEW_PRODUCT_INFO +FROM PRODUCT +WHERE PID = ? +'; + +$stmt = db2_prepare($conn, $query); + +$pid = "100-100-01"; + +if ($stmt) { + db2_bind_param($stmt, 1, "pid", DB2_PARAM_IN); + db2_execute($stmt); + + while($row = db2_fetch_array($stmt)){ + printf("$row[0]\n"); + } +} + +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +<promoList xmlns="http://posample.org"> + <promoitem> + <product pid="100-100-01"> + <description> + <name>Snow Shovel, Basic 22 inch</name> + <details>Basic Snow Shovel, 22 inches wide, straight handle with D-Grip</details> + <price>9.99</price> + <weight>1 kg</weight> + </description> + </product> + <startdate>2004-11-19</startdate> + <enddate>2004-12-19</enddate> + <promoprice>7.25</promoprice> + </promoitem> +</promoList> +]]> + </screen> + </example> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml diff -u phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml:1.1 phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml:1.2 --- phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml:1.1 Sun Feb 19 04:55:55 2006 +++ phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.9 Maintainer: takagi Status: ready --> <refentry id="function.db2-exec"> <refnamediv> <refname>db2_exec</refname> @@ -189,6 +189,180 @@ ]]> </screen> </example> + <example> + <title>XML ãã¼ã¿ã SQL ã®çµæã»ããã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãXML ã«ã©ã ã«æ ¼ç´ããããã¼ã¿ã®æ±ãæ¹ããSAMPLE + ãã¼ã¿ãã¼ã¹ãç¨ãã¦èª¬æãããã®ã§ããããåç´ãª SQL/XML + ã使ç¨ãã¦ããã®ä¾ã§ã¯ XML ããã¥ã¡ã³ãã®ããã¤ãã®ãã¼ãã + ã¿ãªããããªãã¿ã® SQL çµæã»ããå½¢å¼ã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = 'SELECT * FROM XMLTABLE( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' + COLUMNS + "CID" VARCHAR (50) PATH \'@Cid\', + "NAME" VARCHAR (50) PATH \'name\', + "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' + ) AS T + WHERE NAME = \'Kathy Smith\' + '; +$stmt = db2_exec($conn, $query); + +while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE\n"); +} +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1000 Kathy Smith 416-555-1358 +1001 Kathy Smith 905-555-7258 +]]> + </screen> + </example> + <example> + <title>XML ãã¼ã¿ã® "JOIN"</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã® 2 ã¤ã®ç°ãªã + XML ã«ã©ã ã«æ ¼ç´ãããããã¥ã¡ã³ãã使ç¨ãã¾ãã + ã¾ãã2 ã¤ã®ç°ãªãã«ã©ã ã® XML ããã¥ã¡ã³ãããã¨ã«ã㦠+ 2 ã¤ã®ãã³ãã©ãªãã¼ãã«ãä½æãã¾ãã + ããã¦ç¹å®ã®é¡§å®¢ã®é éæ å ±ã SQL çµæã»ããã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' + SELECT A.CID, A.NAME, A.PHONE, C.PONUM, C.STATUS + FROM + XMLTABLE( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' + COLUMNS + "CID" BIGINT PATH \'@Cid\', + "NAME" VARCHAR (50) PATH \'name\', + "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' + ) as A, + PURCHASEORDER AS B, + XMLTABLE ( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("PURCHASEORDER.PORDER")/PurchaseOrder\' + COLUMNS + "PONUM" BIGINT PATH \'@PoNum\', + "STATUS" VARCHAR (50) PATH \'@Status\' + ) as C + WHERE A.CID = B.CUSTID AND + B.POID = C.PONUM AND + A.NAME = \'Kathy Smith\' +'; + +$stmt = db2_exec($conn, $query); + +while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE $row->PONUM $row->STATUS\n"); +} + +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1001 Kathy Smith 905-555-7258 5002 Shipped +]]> + </screen> + </example> + <example> + <title>大ã㪠XML ããã¥ã¡ã³ãã®ä¸é¨ã SQL ãã¼ã¿ã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã®ããã¥ã¡ã³ã PRODUCT.DESCRIPTION + ã®ä¸é¨ã使ç¨ãã¾ããããã¯ãååã®èª¬æ (XML ãã¼ã¿) ããã³ä¾¡æ ¼æ å ± + (SQL ãã¼ã¿) ãå«ã XML ããã¥ã¡ã³ããè¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' +SELECT +XMLSERIALIZE( +XMLQUERY(\' + declare boundary-space strip; + declare default element namespace "http://posample.org"; + <promoList> { + for $prod in $doc/product + where $prod/description/price < 10.00 + order by $prod/description/price ascending + return( + <promoitem> { + $prod, + <startdate> {$start} </startdate>, + <enddate> {$end} </enddate>, + <promoprice> {$promo} </promoprice> + } </promoitem> + ) + } </promoList> +\' passing by ref DESCRIPTION AS "doc", +PROMOSTART as "start", +PROMOEND as "end", +PROMOPRICE as "promo" +RETURNING SEQUENCE) +AS CLOB (32000)) +AS NEW_PRODUCT_INFO +FROM PRODUCT +WHERE PID = \'100-100-01\' +'; + +$stmt = db2_exec($conn, $query); + +while($row = db2_fetch_array($stmt)){ + printf("$row[0]\n"); +} +db2_close($conn); + +?> +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +<promoList xmlns="http://posample.org"> + <promoitem> + <product pid="100-100-01"> + <description> + <name>Snow Shovel, Basic 22 inch</name> + <details>Basic Snow Shovel, 22 inches wide, straight handle with D-Grip</details> + <price>9.99</price> + <weight>1 kg</weight> + </description> + </product> + <startdate>2004-11-19</startdate> + <enddate>2004-12-19</enddate> + <promoprice>7.25</promoprice> + </promoitem> +</promoList> +]]> + </screen> + </example> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/errorfunc/examples.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/errorfunc/examples.xml diff -u phpdoc-ja/reference/errorfunc/examples.xml:1.4 phpdoc-ja/reference/errorfunc/examples.xml:1.5 --- phpdoc-ja/reference/errorfunc/examples.xml:1.4 Sun Jun 11 19:54:23 2006 +++ phpdoc-ja/reference/errorfunc/examples.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.8 Maintainer: elf Status: partial --> +<!-- $Revision: 1.5 $ --> +<!-- EN-Revision: 1.9 Maintainer: elf Status: partial --> <section id="errorfunc.examples"> &reftitle.examples; <para> @@ -11,6 +11,7 @@ <title>ã¹ã¯ãªããå ã§ã®ã¨ã©ã¼å¦ç</title> <programlisting role="php"> <![CDATA[ +<?php // èªåã®ã¨ã©ã¼ãã³ããªã³ã°ãè¡ãã¾ã error_reporting(0); @@ -20,10 +21,10 @@ // ã¨ã©ã¼ã¨ã³ããªã®ã¿ã¤ã ã¹ã¿ã³ã $dt = date("Y-m-d H:i:s (T)"); - // define an assoc array of error string - // in reality the only entries we should - // consider are E_WARNING, E_NOTICE, E_USER_ERROR, - // E_USER_WARNING and E_USER_NOTICE + // ã¨ã©ã¼æååã®é£æ³é åãå®ç¾©ãã¾ãã + // å®éã®ã¨ãããèæ ®ããå¿ è¦ãããã®ã¯ + // E_WARNINGãE_NOTICEãE_USER_ERRORã + // E_USER_WARNING ãã㦠E_USER_NOTICE ã ãã§ãã $errortype = array ( E_ERROR => 'Error', E_WARNING => 'Warning', @@ -37,7 +38,7 @@ E_USER_WARNING => 'User Warning', E_USER_NOTICE => 'User Notice', E_STRICT => 'Runtime Notice', - E_RECOVERABLE_ERRROR => 'Catchable Fatal Error' + E_RECOVERABLE_ERROR => 'Catchable Fatal Error' ); // set of errors for which a var trace will be saved $user_errors = array(E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE); http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/dbase/reference.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/dbase/reference.xml diff -u phpdoc-ja/reference/dbase/reference.xml:1.7 phpdoc-ja/reference/dbase/reference.xml:1.8 --- phpdoc-ja/reference/dbase/reference.xml:1.7 Fri May 12 21:24:48 2006 +++ phpdoc-ja/reference/dbase/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> -<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.8 $ --> +<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external --> @@ -74,6 +74,12 @@ <literal>F</literal> ããã㯠<literal>N</literal> ã &false; ã§ãã</entry> <entry>èªã¿æ¸ãã¯æ´æ°å¤ï¼1 ã¾ã㯠0ï¼ã§è¡ããã¾ãã</entry> </row> + <row> + <entry><literal>F</literal></entry> + <entry>Float</entry> + <entry>æµ®åå°æ°ç¹æ°å¤</entry> + <entry>ãã®åã®ãã£ã¼ã«ãã®ãµãã¼ã㯠PHP 5.2.0 ã§è¿½å ããã¾ããã</entry> + </row> </tbody> </tgroup> </table> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/curl/functions/curl-setopt.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/curl/functions/curl-setopt.xml diff -u phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.7 phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.8 --- phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.7 Fri Dec 9 23:30:17 2005 +++ phpdoc-ja/reference/curl/functions/curl-setopt.xml Sun Oct 8 04:45:24 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- EN-Revision: 1.21 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry id="function.curl-setopt"> @@ -417,10 +417,11 @@ <row> <entry><constant>CURLOPT_HTTP_VERSION</constant></entry> <entry> - <parameter>CURL_HTTP_VERSION_NONE</parameter> (default, lets CURL - decide which version to use), - <parameter>CURL_HTTP_VERSION_1_0</parameter> (forces HTTP/1.0), - or <parameter>CURL_HTTP_VERSION_1_1</parameter> (forces HTTP/1.1). + <parameter>CURL_HTTP_VERSION_NONE</parameter> (ããã©ã«ãã + 使ç¨ãããã¼ã¸ã§ã³ã決ããã®ã¯ CURL ã«ã¾ããã)ã + <parameter>CURL_HTTP_VERSION_1_0</parameter> (HTTP/1.0 ã使ç¨ãã)ã + ããã㯠<parameter>CURL_HTTP_VERSION_1_1</parameter> (HTTP/1.1 ã使ç¨ãã) + ã®ããããã§ãã </entry> <entry> </entry> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/ctype/functions/ctype-alnum.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/ctype/functions/ctype-alnum.xml diff -u phpdoc-ja/reference/ctype/functions/ctype-alnum.xml:1.7 phpdoc-ja/reference/ctype/functions/ctype-alnum.xml:1.8 --- phpdoc-ja/reference/ctype/functions/ctype-alnum.xml:1.7 Thu Jul 27 03:31:29 2006 +++ phpdoc-ja/reference/ctype/functions/ctype-alnum.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> -<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.8 $ --> +<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry id="function.ctype-alnum"> <refnamediv> @@ -18,7 +18,7 @@ ä¸ããããæåå <parameter>text</parameter> ã®ãã¹ã¦ã®æåãè±åã¾ã㯠æ°åã§ãããã©ããã調ã¹ã¾ããæ¨æºã® <literal>C</literal> ãã±ã¼ã«ã®å ´åã æå㯠<literal>[A-Za-z]</literal> ã§ããã®é¢æ°ã¯ - <literal>preg_match('/^[a-z0-9]+$/i', $text)</literal> ã¨ç価ã§ãã + <literal>preg_match('/^[a-z0-9]+$/iD', $text)</literal> ã¨ç価ã§ãã </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/appendices/comparisons.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc-ja/appendices/comparisons.xml diff -u phpdoc-ja/appendices/comparisons.xml:1.3 phpdoc-ja/appendices/comparisons.xml:1.4 --- phpdoc-ja/appendices/comparisons.xml:1.3 Fri Dec 3 15:58:25 2004 +++ phpdoc-ja/appendices/comparisons.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> -<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.4 $ --> +<!-- EN-Revision: 1.10 Maintainer: hirokawa Status: ready --> <appendix id="types.comparisons"> <title>PHP åã®æ¯è¼è¡¨</title> <para> @@ -210,6 +210,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -226,6 +227,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -240,6 +242,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -254,6 +257,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -268,6 +272,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -282,6 +287,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -296,6 +302,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -310,6 +317,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -324,6 +332,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>NULL</literal></entry> @@ -338,6 +347,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -352,6 +362,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -366,6 +377,22 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> @@ -390,6 +417,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -406,6 +434,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -420,6 +449,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -434,6 +464,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -448,6 +479,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -462,6 +494,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -476,6 +509,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -490,6 +524,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -504,6 +539,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&null;</entry> @@ -518,6 +554,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -532,6 +569,7 @@ <entry>&false;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -546,16 +584,32 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> </table> </para> <note> - <title>PHP 3.0 note</title> + <title>PHP 3.0 ã«é¢ãã注æ</title> <para> - The string value <literal>"0"</literal> was considered non-empty in - PHP 3, this behavior changed in PHP 4 where it's now seen as empty. + æåå <literal>"0"</literal> ã¯ãPHP 3 ã§ã¯ç©ºã®å¤ã¨ã¿ãªããã¾ããã§ããã + ãã®æå㯠PHP 4 ã§å¤æ´ãããç¾å¨ã¯ç©ºã®å¤ã¨ã¿ãªããã¾ãã </para> </note> </appendix> http://cvs.php.net/viewvc.cgi/phpdoc-ja/language-snippets.ent?r1=1.65&r2=1.66&diff_format=u Index: phpdoc-ja/language-snippets.ent diff -u phpdoc-ja/language-snippets.ent:1.65 phpdoc-ja/language-snippets.ent:1.66 --- phpdoc-ja/language-snippets.ent:1.65 Tue Sep 12 03:50:49 2006 +++ phpdoc-ja/language-snippets.ent Sun Oct 8 04:45:24 2006 @@ -1,5 +1,5 @@ -<!-- $Revision: 1.65 $ --> -<!-- EN-Revision: 1.173 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.66 $ --> +<!-- EN-Revision: 1.175 Maintainer: hirokawa Status: ready --> <!-- Credits: haruki,shimooka,takagi --> <!-- Notes --> @@ -233,6 +233,11 @@ <!ENTITY note.bundled.gd '<note><simpara>ãã®é¢æ°ã¯ãPHP ããã³ãã«çã® GD ã©ã¤ãã©ãªã§ ã³ã³ãã¤ã«ããã¦ããå ´åã®ã¿ä½¿ç¨å¯è½ã§ãã</simpara></note>'> +<!ENTITY note.freetype '<note><simpara>ãã®é¢æ°ã¯ãPHP ã FreeType ãµãã¼ã +(<option role="configure">--with-freetype-dir=DIR</option>) +ãæå¹ã«ãã¦ã³ã³ãã¤ã«ããã¦ããå ´åã®ã¿ä½¿ç¨å¯è½ã§ãã +</simpara></note>'> + <!ENTITY note.gd.2 '<note><simpara>ãã®é¢æ°ã¯ãGD 2.0.1 以éãå¿ è¦ã¨ãã¾ã (2.0.28 以éãæ¨å¥¨ãã¾ã)ã</simpara></note>'> <!-- Date and time entities -->
http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml diff -u phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml:1.4 phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml:1.5 --- phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml:1.4 Mon Jan 3 17:08:54 2005 +++ phpdoc-ja/reference/zip/functions/zip-entry-compressedsize.xml Sun Oct 8 04:45:23 2006 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- EN-Revision: 1.3 Maintainer: hirokawa Status: ready --> <refentry id="function.zip-entry-compressedsize"> <refnamediv> <refname>zip_entry_compressedsize</refname> - <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªã®å§ç¸®æã®ãµã¤ãºãåå¾ã</refpurpose> + <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªã®å§ç¸®æã®ãµã¤ãºãåå¾ãã</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/zip/functions/zip-entry-close.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/zip/functions/zip-entry-close.xml diff -u phpdoc-ja/reference/zip/functions/zip-entry-close.xml:1.7 phpdoc-ja/reference/zip/functions/zip-entry-close.xml:1.8 --- phpdoc-ja/reference/zip/functions/zip-entry-close.xml:1.7 Mon Aug 14 21:07:35 2006 +++ phpdoc-ja/reference/zip/functions/zip-entry-close.xml Sun Oct 8 04:45:23 2006 @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry id="function.zip-entry-close"> <refnamediv> <refname>zip_entry_close</refname> - <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªãã¯ãã¼ãºãã</refpurpose> + <refpurpose>ãã£ã¬ã¯ããªã¨ã³ããªãéãã</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; @@ -14,7 +14,7 @@ <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam> </methodsynopsis> <para> - æå®ããããã£ã¬ã¯ããªã¨ã³ããªãã¯ãã¼ãºãã¾ãã + æå®ããããã£ã¬ã¯ããªã¨ã³ããªãéãã¾ãã </para> </refsect1> <refsect1 role="parameters"> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/strings/functions/setlocale.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/strings/functions/setlocale.xml diff -u phpdoc-ja/reference/strings/functions/setlocale.xml:1.6 phpdoc-ja/reference/strings/functions/setlocale.xml:1.7 --- phpdoc-ja/reference/strings/functions/setlocale.xml:1.6 Mon Oct 17 12:36:56 2005 +++ phpdoc-ja/reference/strings/functions/setlocale.xml Sun Oct 8 04:45:23 2006 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./ja/functions/strings.xml, last change in rev 1.1 --> -<!-- EN-Revision: 1.26 Maintainer: hirokawa Status: ready --> +<!-- EN-Revision: 1.27 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id="function.setlocale"> <refnamediv> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/sdo/reference.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/sdo/reference.xml diff -u phpdoc-ja/reference/sdo/reference.xml:1.5 phpdoc-ja/reference/sdo/reference.xml:1.6 --- phpdoc-ja/reference/sdo/reference.xml:1.5 Sun Jun 11 19:54:23 2006 +++ phpdoc-ja/reference/sdo/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.23 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.25 Maintainer: takagi Status: ready --> <!-- Purpose: database.abstract --> <!-- Membership: pecl --> -<!-- State: experimental --> <reference id="ref.sdo"> <title>SDO é¢æ°</title> @@ -42,7 +41,7 @@ Service Data Objects specification </ulink> ã®æ¦å¿µã«ç±æ¥ãããã®ã§ãã - <ulink url="&url.apache.tuscany;">Apache Tuscany</ulink> SDO 2.0 for C++ project + <ulink url="&url.apache.tuscany;">Apache Tuscany</ulink> SDO for C++ project ãå«ãã§ãã¾ãã </para> @@ -96,6 +95,15 @@ <section id="sdo.installation"> &reftitle.install; + <note> + <para> + åæã®ãã¼ã¸ã§ã³ã® SDO æ¡å¼µã¢ã¸ã¥ã¼ã«ã¯ãXML DAS + ç¨ã«å¥ã®å ±æã©ã¤ãã©ãªãå¿ è¦ã§ãããããã¯ä»ã¯ä½¿ããã¦ããªãã®ã§ã + <filename>php_sdo_das_xml.dll</filename> ã + <filename>sdo_das_xml.so</filename> ã¸ã®åç §ã + &php.ini; ããåé¤ãã¦ãã ããã + </para> + </note> <procedure id='sdo.install.unix'> <title>Unix ã·ã¹ãã </title> <step> @@ -109,7 +117,7 @@ </screen> </para> <para> - ãã®ã³ãã³ã㯠SDO ããã³ XML å ±æã©ã¤ãã©ãªããã«ããã + ãã®ã³ãã³ã㯠SDO å ±æã©ã¤ãã©ãªããã«ããã ãªã¬ã¼ã·ã§ãã« DAS ã® PHP ãã¡ã¤ã«ãã¤ã³ã¹ãã¼ã«ãã¾ãã </para> <para> @@ -123,13 +131,12 @@ </step> <step> <para> - <command>pecl</command> ã³ãã³ãã¯ãSDO ããã³ SDO_DAS_XML + <command>pecl</command> ã³ãã³ãã¯ãSDO ã¢ã¸ã¥ã¼ã«ãèªåçã« PHP æ¡å¼µã¢ã¸ã¥ã¼ã«ãã£ã¬ã¯ããªã«ã¤ã³ã¹ãã¼ã«ãã¾ãã SDO æ¡å¼µã¢ã¸ã¥ã¼ã«ãæå¹ã«ããã«ã¯ã以ä¸ã®è¡ã &php.ini; ã«è¿½å ããªããã°ãªãã¾ããã <screen> <![CDATA[ extension=sdo.so -extension=sdo_das_xml.so ]]> </screen> </para> @@ -145,9 +152,8 @@ <title>Windows</title> <step> <para> - SDO ã³ã¢ããã³ XML DAS ã®ææ°çã® DLL ã¯ããããã - <ulink url='&url.pecl.win.ext;php_sdo.dll'>php_sdo.dll</ulink> ããã³ - <ulink url='&url.pecl.win.ext;php_sdo_das_xml.dll'>php_sdo_das_xml.dll</ulink> + SDO ã®ææ°çã® DLL ã¯ã + <ulink url='&url.pecl.win.ext;php_sdo.dll'>php_sdo.dll</ulink> ãããã¦ã³ãã¼ãã§ãã¾ãã </para> <para> @@ -158,14 +164,13 @@ </step> <step> <para> - <command>pecl</command> ã³ãã³ãã¯ãSDO ããã³ SDO_DAS_XML + <command>pecl</command> ã³ãã³ãã¯ãSDO ã¢ã¸ã¥ã¼ã«ãèªåçã« PHP æ¡å¼µã¢ã¸ã¥ã¼ã«ãã£ã¬ã¯ããªã«ã¤ã³ã¹ãã¼ã«ãã¾ãã SDO æ¡å¼µã¢ã¸ã¥ã¼ã«ãæå¹ã«ããã«ã¯ã以ä¸ã®è¡ã &php.ini; ã«è¿½å ããªããã°ãªãã¾ããã <screen> <![CDATA[ extension=php_sdo.dll -extension=php_sdo_das_xml.dll ]]> </screen> </para> @@ -205,8 +210,7 @@ <step> <para> <command>phpize</command> ãå®è¡ãã¾ããããã«ããã - SDO ããã³ XML ãã¼ã¿ã¢ã¯ã»ã¹ãµã¼ãã¹ãã³ã³ãã¤ã«ããããã® - ç°å¢ãè¨å®ãã¾ãã + SDO ãã³ã³ãã¤ã«ããããã®ç°å¢ãè¨å®ãã¾ãã </para> </step> <step> @@ -219,9 +223,8 @@ <step> <para> &php.ini; ãã¡ã¤ã«ã« - <command>extension=sdo.so</command> ããã³ - <command>extension=sdo_das_xml.so</command> ããã®é åºã§ - 追å ãããã¨ã§ããããã®ã¢ã¸ã¥ã¼ã«ã PHP ã«èªã¿è¾¼ã¾ããããã«ãã¾ãã + <command>extension=sdo.so</command> + ã追å ãããã¨ã§ããã®ã¢ã¸ã¥ã¼ã«ã PHP ã«èªã¿è¾¼ã¾ããããã«ãã¾ãã </para> </step> </procedure> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/pcre/functions/preg-replace.xml?r1=1.9&r2=1.10&diff_format=u Index: phpdoc-ja/reference/pcre/functions/preg-replace.xml diff -u phpdoc-ja/reference/pcre/functions/preg-replace.xml:1.9 phpdoc-ja/reference/pcre/functions/preg-replace.xml:1.10 --- phpdoc-ja/reference/pcre/functions/preg-replace.xml:1.9 Fri Jun 23 21:02:13 2006 +++ phpdoc-ja/reference/pcre/functions/preg-replace.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.9 $ --> -<!-- EN-Revision: 1.17 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.10 $ --> +<!-- EN-Revision: 1.18 Maintainer: hirokawa Status: ready --> <!-- Credits: haruki --> <refentry id="function.preg-replace"> <refnamediv> @@ -84,7 +84,7 @@ <parameter>pattern</parameter> ããã³ <parameter>replacement</parameter> ã®ãããããé åã®å ´åãå <parameter>pattern</parameter> 㯠対å¿ãã <parameter>replacement</parameter> ã«ç½®æããã¾ãã - ããã<parameter>replacement</parameter> é åã <parameter>pattern</parameter> + ããã<parameter>replacement</parameter> é åã®è¦ç´ ã®æ°ã <parameter>pattern</parameter> é åãããå°ãªãå ´åã¯ãä½ã£ã <parameter>pattern</parameter> 㯠空æåã«ç½®æããã¾ãã </para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml diff -u phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml:1.1 phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml:1.2 --- phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml:1.1 Sun Sep 25 05:43:27 2005 +++ phpdoc-ja/reference/mysqli/functions/mysqli-stmt-prepare.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> <refentry id="function.mysqli-stmt-prepare"> <refnamediv> <refname>mysqli_stmt_prepare</refname> @@ -146,7 +146,7 @@ $city = "Amersfoort"; /* ããªãã¢ãã¹ãã¼ãã¡ã³ããä½æãã¾ã */ -$stmt = mysqli_stmt_init(); +$stmt = mysqli_stmt_init($link); if ($stmt = mysqli_stmt_prepare($stmt, "SELECT District FROM City WHERE Name=?")) { /* ãã¼ã«ã«ãã©ã¡ã¼ã¿ããã¤ã³ããã¾ã */ http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/memcache/ini.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-ja/reference/memcache/ini.xml diff -u phpdoc-ja/reference/memcache/ini.xml:1.2 phpdoc-ja/reference/memcache/ini.xml:1.3 --- phpdoc-ja/reference/memcache/ini.xml:1.2 Tue Sep 12 03:50:47 2006 +++ phpdoc-ja/reference/memcache/ini.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> <section id="memcache.ini"> &reftitle.runtime; &extension.runtime; @@ -39,7 +39,7 @@ </tgroup> </table> &ini.php.constants; -</para> + </para> &ini.descriptions.title; @@ -58,6 +58,20 @@ </listitem> </varlistentry> + <varlistentry id="ini.memcache.max-failover-attempts"> + <term> + <parameter>memcache.max_failover_attempts</parameter> + <type>integer</type> + </term> + <listitem> + <para> + ãã¼ã¿ã®è¨å®ãåå¾ã試ã¿ããµã¼ãã®æ°ãæå®ãã¾ãã + memcache.allow_failover ãæå®ããå ´åã«ã®ã¿ä½¿ç¨ãã¾ãã + ãã®é ç®ã¯ããã¼ã¸ã§ã³ 2.1.0 以éã§ä½¿ç¨å¯è½ã§ãã + </para> + </listitem> + </varlistentry> + <varlistentry id="ini.memcache.chunk-size"> <term> <parameter>memcache.chunk_size</parameter> @@ -87,7 +101,7 @@ </varlistentry> </variablelist> - </para> +</para> </section> <!-- Keep this comment at the end of the file http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/functions/imagefttext.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/image/functions/imagefttext.xml diff -u phpdoc-ja/reference/image/functions/imagefttext.xml:1.5 phpdoc-ja/reference/image/functions/imagefttext.xml:1.6 --- phpdoc-ja/reference/image/functions/imagefttext.xml:1.5 Sat Jul 2 08:00:47 2005 +++ phpdoc-ja/reference/image/functions/imagefttext.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id='function.imagefttext'> <refnamediv> @@ -25,6 +25,8 @@ </methodsynopsis> <para> &warn.undocumented.func; + ¬e.gd.2; + ¬e.freetype; </para> <note> <para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/functions/imageftbbox.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/image/functions/imageftbbox.xml diff -u phpdoc-ja/reference/image/functions/imageftbbox.xml:1.5 phpdoc-ja/reference/image/functions/imageftbbox.xml:1.6 --- phpdoc-ja/reference/image/functions/imageftbbox.xml:1.5 Sat Jul 2 08:00:47 2005 +++ phpdoc-ja/reference/image/functions/imageftbbox.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.5 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id='function.imageftbbox'> <refnamediv> @@ -21,6 +21,8 @@ </methodsynopsis> <para> &warn.undocumented.func; + ¬e.gd.2; + ¬e.freetype; </para> <note> <para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/reference.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc-ja/reference/image/reference.xml diff -u phpdoc-ja/reference/image/reference.xml:1.11 phpdoc-ja/reference/image/reference.xml:1.12 --- phpdoc-ja/reference/image/reference.xml:1.11 Wed Jun 7 03:13:46 2006 +++ phpdoc-ja/reference/image/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 1.27 Maintainer: hirokawa Status: ready --> -<!-- $Revision: 1.11 $ --> +<!-- EN-Revision: 1.28 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.12 $ --> <!-- Purpose: utilspec.image --> <!-- Membership: bundled --> @@ -29,11 +29,21 @@ 大ãããç¥ããã¨ãã§ãã¾ãã </para> <para> + <link linkend="ref.exif">exif æ¡å¼µã¢ã¸ã¥ã¼ã«</link> ã使ç¨ããã¨ã + <acronym>JPEG</acronym> ã <acronym>TIFF</acronym> + ç»åã®ãããã«ä¿åãããæ å ±ãæ±ããã¨ãã§ãã¾ãã + ããã«ããããã¸ã¿ã«ã«ã¡ã©ãä½æããã¡ã¿ãã¼ã¿ãèªã¿è¾¼ããã¨ãã§ãã¾ãã + exif é¢æ°ã¯ <acronym>GD</acronym> ã©ã¤ãã©ãªãå¿ è¦ã¨ãã¾ããã + </para> + + <para> <note> <simpara> - ã¤ã¡ã¼ã¸ã®èªã¿è¾¼ã¿ãæ¸ãè¾¼ã¿ãä¿®æ£ã®æ©è½ã®æ¡å¼µããã¸ã¿ã«ã«ã¡ã© - ã«ããæ®å½±ãããç»åã®ã¡ã¿ãã¼ã¿ãèªã¿è¾¼ãã«ã¯ãè¦æ±ã®ç¯ãèªã - ã§ãã ããã + ã¤ã¡ã¼ã¸ã®èªã¿è¾¼ã¿ãæ¸ãè¾¼ã¿ãä¿®æ£ã®æ©è½ãæ¡å¼µããã«ã¯ã + è¦æ±ã®ç¯ãå¼ãã§ãã ããã + ãã¸ã¿ã«ã«ã¡ã©ã§æ®å½±ããç»åã®ã¡ã¿ãã¼ã¿ãèªã¿è¾¼ãã«ã¯ã + ä¸ã§èª¬æãã <link linkend="ref.exif">exif + æ¡å¼µã¢ã¸ã¥ã¼ã«</link> ãå¿ è¦ã§ãã </simpara> </note> </para> @@ -147,22 +157,13 @@ <entry><literal>T1lib</literal></entry> <entry><ulink url="&url.t1lib;">&url.t1lib;</ulink>)</entry> <entry> - Type 1ãã©ã³ãããµãã¼ããã¾ãã + Postscript Type 1 ãã©ã³ãããµãã¼ããã¾ãã </entry> </row> </tbody> </tgroup> </table> </para> - - <para> - <option role="configure">--enable-exif</option>ãæå®ãã¦PHPãã³ - ã³ãã¤ã«ããå ´åã<acronym>JPEG</acronym>ããã³ - <acronym>TIFF</acronym>ã¤ã¡ã¼ã¸ã®ãããã«æ ¼ç´ãããæ å ±ãå¦çãã - ãã¨ãã§ããããã«ãªãã¾ããããã«ããã以ä¸ã«ç¤ºãããã«ãã¸ã¿ã« - ã«ã¡ã©ã«ããçæãããã¡ã¿ãã¼ã¿ãèªããã¨ãã§ããããã«ãªãã¾ãã - 以ä¸ã®é¢æ°ã¯ã<acronym>GD</acronym>ã©ã¤ãã©ãªãå¿ è¦ã¨ãã¾ããã - </para> </section> &reference.image.configure; http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/configure.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/image/configure.xml diff -u phpdoc-ja/reference/image/configure.xml:1.5 phpdoc-ja/reference/image/configure.xml:1.6 --- phpdoc-ja/reference/image/configure.xml:1.5 Tue Jun 13 21:23:01 2006 +++ phpdoc-ja/reference/image/configure.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.10 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.11 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <section id="image.installation"> &reftitle.install; @@ -20,12 +20,6 @@ <function>imagecreatetruecolor</function>ã®ããã«Trueã«ã©ã¼ãåªå ãããé¢æ° ã«ã¤ãã¦ã¯GD2ãå¿ é ã§ãã </para> - <note> - <para> - Windows 㧠exif ãµãã¼ããæå¹ã«ããã«ã¯ãphp.ini å 㧠php_mbstring.dll - ã php_exif.dll ã®åã«ãã¼ãããå¿ è¦ãããã¾ãã - </para> - </note> <para id="image.configure.php3"> PHP3ã«ããã¦GDãµãã¼ããç¡å¹ã«ããã«ã¯ <option role="configure">--without-gd</option>ãæå®ãã¦ãã ããã @@ -107,7 +101,7 @@ <row> <entry><literal>T1lib</literal></entry> <entry> - T1lib (Type 1 fonts) ããµãã¼ãããã«ã¯ + T1lib (Postscript Type 1 ãã©ã³ã) ããµãã¼ãããã«ã¯ <option role="configure">--with-t1lib[=DIR]</option>ãæå®ãã¾ãã </entry> </row> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/icap/reference.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/icap/reference.xml diff -u phpdoc-ja/reference/icap/reference.xml:1.6 phpdoc-ja/reference/icap/reference.xml:1.7 --- phpdoc-ja/reference/icap/reference.xml:1.6 Mon Sep 5 11:34:06 2005 +++ phpdoc-ja/reference/icap/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.5 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> <!-- State: deprecated --> <reference id="ref.icap"> - <title>ICAP é¢æ°ï¼éæ¨å¥¨ï¼</title> + <title>ICAP é¢æ° (åé¤ããã¾ãã)</title> <titleabbrev>ICAP</titleabbrev> <partintro> @@ -12,8 +12,8 @@ &reftitle.intro; <note> <simpara> - icapãµãã¼ãã¯ãè¿ãå°æ¥åé¤ããã¾ãããã®ã¢ã¸ã¥ã¼ã«ã - icap ã©ã¤ãã©ãªã®å¯¾å¿ãããã¼ã¸ã§ã³ããµãã¼ããããªããªãã¾ãã + icap ãµãã¼ãã¯ãPHP ããåé¤ããã¾ããããã®ã¢ã¸ã¥ã¼ã«ã + icap ã©ã¤ãã©ãªã®å¯¾å¿ãããã¼ã¸ã§ã³ãããã¯ããµãã¼ãããã¾ããã ã«ã¬ã³ãã¼æ©è½ã PHP ã§ä½¿ç¨ãããå ´åã¯ã代ããã« <link linkend="ref.mcal">mcal</link> ã使ç¨ãã¦ãã ããã </simpara> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml diff -u phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml:1.1 phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml:1.2 --- phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml:1.1 Sun Feb 19 04:55:55 2006 +++ phpdoc-ja/reference/ibm_db2/functions/db2-execute.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <refentry id="function.db2-execute"> <refnamediv> <refname>db2_execute</refname> @@ -134,8 +134,202 @@ ]]> </screen> </example> + <example> + <title>XML ãã¼ã¿ã SQL ã®çµæã»ããã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãXML ã«ã©ã ã«æ ¼ç´ããããã¼ã¿ã®æ±ãæ¹ããSAMPLE + ãã¼ã¿ãã¼ã¹ãç¨ãã¦èª¬æãããã®ã§ããããåç´ãª SQL/XML + ã使ç¨ãã¦ããã®ä¾ã§ã¯ XML ããã¥ã¡ã³ãã®ããã¤ãã®ãã¼ãã + ã¿ãªããããªãã¿ã® SQL çµæã»ããå½¢å¼ã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = 'SELECT * FROM XMLTABLE( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' + COLUMNS + "CID" VARCHAR (50) PATH \'@Cid\', + "NAME" VARCHAR (50) PATH \'name\', + "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' + ) AS T + WHERE NAME = ? + '; + +$stmt = db2_prepare($conn, $query); + +$name = 'Kathy Smith'; + +if ($stmt) { + db2_bind_param($stmt, 1, "name", DB2_PARAM_IN); + db2_execute($stmt); + + while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE\n"); + } +} +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1000 Kathy Smith 416-555-1358 +1001 Kathy Smith 905-555-7258 +]]> + </screen> + </example> + <example> + <title>XML ãã¼ã¿ã® "JOIN"</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã® 2 ã¤ã®ç°ãªã + XML ã«ã©ã ã«æ ¼ç´ãããããã¥ã¡ã³ãã使ç¨ãã¾ãã + ã¾ãã2 ã¤ã®ç°ãªãã«ã©ã ã® XML ããã¥ã¡ã³ãããã¨ã«ã㦠+ 2 ã¤ã®ãã³ãã©ãªãã¼ãã«ãä½æãã¾ãã + ããã¦ç¹å®ã®é¡§å®¢ã®é éæ å ±ã SQL çµæã»ããã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' +SELECT A.CID, A.NAME, A.PHONE, C.PONUM, C.STATUS +FROM +XMLTABLE( +XMLNAMESPACES (DEFAULT \'http://posample.org\'), +\'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' +COLUMNS +"CID" BIGINT PATH \'@Cid\', +"NAME" VARCHAR (50) PATH \'name\', +"PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' +) as A, +PURCHASEORDER AS B, +XMLTABLE ( +XMLNAMESPACES (DEFAULT \'http://posample.org\'), +\'db2-fn:xmlcolumn("PURCHASEORDER.PORDER")/PurchaseOrder\' +COLUMNS +"PONUM" BIGINT PATH \'@PoNum\', +"STATUS" VARCHAR (50) PATH \'@Status\' +) as C +WHERE A.CID = B.CUSTID AND + B.POID = C.PONUM AND + A.NAME = ? +'; + +$stmt = db2_prepare($conn, $query); + +$name = 'Kathy Smith'; + +if ($stmt) { + db2_bind_param($stmt, 1, "name", DB2_PARAM_IN); + db2_execute($stmt); + + while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE $row->PONUM $row->STATUS\n"); + } +} +db2_close($conn); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1001 Kathy Smith 905-555-7258 5002 Shipped +]]> + </screen> + </example> + <example> + <title>大ã㪠XML ããã¥ã¡ã³ãã®ä¸é¨ã SQL ãã¼ã¿ã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã®ããã¥ã¡ã³ã PRODUCT.DESCRIPTION + ã®ä¸é¨ã使ç¨ãã¾ããããã¯ãååã®èª¬æ (XML ãã¼ã¿) ããã³ä¾¡æ ¼æ å ± + (SQL ãã¼ã¿) ãå«ã XML ããã¥ã¡ã³ããè¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' +SELECT +XMLSERIALIZE( +XMLQUERY(\' + declare boundary-space strip; + declare default element namespace "http://posample.org"; + <promoList> { + for $prod in $doc/product + where $prod/description/price < 10.00 + order by $prod/description/price ascending + return( + <promoitem> { + $prod, + <startdate> {$start} </startdate>, + <enddate> {$end} </enddate>, + <promoprice> {$promo} </promoprice> + } </promoitem> + ) + } </promoList> +\' passing by ref DESCRIPTION AS "doc", +PROMOSTART as "start", +PROMOEND as "end", +PROMOPRICE as "promo" +RETURNING SEQUENCE) +AS CLOB (32000)) +AS NEW_PRODUCT_INFO +FROM PRODUCT +WHERE PID = ? +'; + +$stmt = db2_prepare($conn, $query); + +$pid = "100-100-01"; + +if ($stmt) { + db2_bind_param($stmt, 1, "pid", DB2_PARAM_IN); + db2_execute($stmt); + + while($row = db2_fetch_array($stmt)){ + printf("$row[0]\n"); + } +} + +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +<promoList xmlns="http://posample.org"> + <promoitem> + <product pid="100-100-01"> + <description> + <name>Snow Shovel, Basic 22 inch</name> + <details>Basic Snow Shovel, 22 inches wide, straight handle with D-Grip</details> + <price>9.99</price> + <weight>1 kg</weight> + </description> + </product> + <startdate>2004-11-19</startdate> + <enddate>2004-12-19</enddate> + <promoprice>7.25</promoprice> + </promoitem> +</promoList> +]]> + </screen> + </example> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml diff -u phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml:1.1 phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml:1.2 --- phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml:1.1 Sun Feb 19 04:55:55 2006 +++ phpdoc-ja/reference/ibm_db2/functions/db2-exec.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.9 Maintainer: takagi Status: ready --> <refentry id="function.db2-exec"> <refnamediv> <refname>db2_exec</refname> @@ -189,6 +189,180 @@ ]]> </screen> </example> + <example> + <title>XML ãã¼ã¿ã SQL ã®çµæã»ããã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãXML ã«ã©ã ã«æ ¼ç´ããããã¼ã¿ã®æ±ãæ¹ããSAMPLE + ãã¼ã¿ãã¼ã¹ãç¨ãã¦èª¬æãããã®ã§ããããåç´ãª SQL/XML + ã使ç¨ãã¦ããã®ä¾ã§ã¯ XML ããã¥ã¡ã³ãã®ããã¤ãã®ãã¼ãã + ã¿ãªããããªãã¿ã® SQL çµæã»ããå½¢å¼ã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = 'SELECT * FROM XMLTABLE( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' + COLUMNS + "CID" VARCHAR (50) PATH \'@Cid\', + "NAME" VARCHAR (50) PATH \'name\', + "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' + ) AS T + WHERE NAME = \'Kathy Smith\' + '; +$stmt = db2_exec($conn, $query); + +while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE\n"); +} +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1000 Kathy Smith 416-555-1358 +1001 Kathy Smith 905-555-7258 +]]> + </screen> + </example> + <example> + <title>XML ãã¼ã¿ã® "JOIN"</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã® 2 ã¤ã®ç°ãªã + XML ã«ã©ã ã«æ ¼ç´ãããããã¥ã¡ã³ãã使ç¨ãã¾ãã + ã¾ãã2 ã¤ã®ç°ãªãã«ã©ã ã® XML ããã¥ã¡ã³ãããã¨ã«ã㦠+ 2 ã¤ã®ãã³ãã©ãªãã¼ãã«ãä½æãã¾ãã + ããã¦ç¹å®ã®é¡§å®¢ã®é éæ å ±ã SQL çµæã»ããã§è¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' + SELECT A.CID, A.NAME, A.PHONE, C.PONUM, C.STATUS + FROM + XMLTABLE( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\' + COLUMNS + "CID" BIGINT PATH \'@Cid\', + "NAME" VARCHAR (50) PATH \'name\', + "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\' + ) as A, + PURCHASEORDER AS B, + XMLTABLE ( + XMLNAMESPACES (DEFAULT \'http://posample.org\'), + \'db2-fn:xmlcolumn("PURCHASEORDER.PORDER")/PurchaseOrder\' + COLUMNS + "PONUM" BIGINT PATH \'@PoNum\', + "STATUS" VARCHAR (50) PATH \'@Status\' + ) as C + WHERE A.CID = B.CUSTID AND + B.POID = C.PONUM AND + A.NAME = \'Kathy Smith\' +'; + +$stmt = db2_exec($conn, $query); + +while($row = db2_fetch_object($stmt)){ + printf("$row->CID $row->NAME $row->PHONE $row->PONUM $row->STATUS\n"); +} + +db2_close($conn); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +1001 Kathy Smith 905-555-7258 5002 Shipped +]]> + </screen> + </example> + <example> + <title>大ã㪠XML ããã¥ã¡ã³ãã®ä¸é¨ã SQL ãã¼ã¿ã¨ãã¦è¿ã</title> + <para> + 次ã®ä¾ã¯ãSAMPLE ãã¼ã¿ãã¼ã¹ã®ããã¥ã¡ã³ã PRODUCT.DESCRIPTION + ã®ä¸é¨ã使ç¨ãã¾ããããã¯ãååã®èª¬æ (XML ãã¼ã¿) ããã³ä¾¡æ ¼æ å ± + (SQL ãã¼ã¿) ãå«ã XML ããã¥ã¡ã³ããè¿ãã¾ãã + </para> + <programlisting role="php"> +<![CDATA[ +<?php + +$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2"); + +$query = ' +SELECT +XMLSERIALIZE( +XMLQUERY(\' + declare boundary-space strip; + declare default element namespace "http://posample.org"; + <promoList> { + for $prod in $doc/product + where $prod/description/price < 10.00 + order by $prod/description/price ascending + return( + <promoitem> { + $prod, + <startdate> {$start} </startdate>, + <enddate> {$end} </enddate>, + <promoprice> {$promo} </promoprice> + } </promoitem> + ) + } </promoList> +\' passing by ref DESCRIPTION AS "doc", +PROMOSTART as "start", +PROMOEND as "end", +PROMOPRICE as "promo" +RETURNING SEQUENCE) +AS CLOB (32000)) +AS NEW_PRODUCT_INFO +FROM PRODUCT +WHERE PID = \'100-100-01\' +'; + +$stmt = db2_exec($conn, $query); + +while($row = db2_fetch_array($stmt)){ + printf("$row[0]\n"); +} +db2_close($conn); + +?> +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +<promoList xmlns="http://posample.org"> + <promoitem> + <product pid="100-100-01"> + <description> + <name>Snow Shovel, Basic 22 inch</name> + <details>Basic Snow Shovel, 22 inches wide, straight handle with D-Grip</details> + <price>9.99</price> + <weight>1 kg</weight> + </description> + </product> + <startdate>2004-11-19</startdate> + <enddate>2004-12-19</enddate> + <promoprice>7.25</promoprice> + </promoitem> +</promoList> +]]> + </screen> + </example> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/errorfunc/examples.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/errorfunc/examples.xml diff -u phpdoc-ja/reference/errorfunc/examples.xml:1.4 phpdoc-ja/reference/errorfunc/examples.xml:1.5 --- phpdoc-ja/reference/errorfunc/examples.xml:1.4 Sun Jun 11 19:54:23 2006 +++ phpdoc-ja/reference/errorfunc/examples.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.8 Maintainer: elf Status: partial --> +<!-- $Revision: 1.5 $ --> +<!-- EN-Revision: 1.9 Maintainer: elf Status: partial --> <section id="errorfunc.examples"> &reftitle.examples; <para> @@ -11,6 +11,7 @@ <title>ã¹ã¯ãªããå ã§ã®ã¨ã©ã¼å¦ç</title> <programlisting role="php"> <![CDATA[ +<?php // èªåã®ã¨ã©ã¼ãã³ããªã³ã°ãè¡ãã¾ã error_reporting(0); @@ -20,10 +21,10 @@ // ã¨ã©ã¼ã¨ã³ããªã®ã¿ã¤ã ã¹ã¿ã³ã $dt = date("Y-m-d H:i:s (T)"); - // define an assoc array of error string - // in reality the only entries we should - // consider are E_WARNING, E_NOTICE, E_USER_ERROR, - // E_USER_WARNING and E_USER_NOTICE + // ã¨ã©ã¼æååã®é£æ³é åãå®ç¾©ãã¾ãã + // å®éã®ã¨ãããèæ ®ããå¿ è¦ãããã®ã¯ + // E_WARNINGãE_NOTICEãE_USER_ERRORã + // E_USER_WARNING ãã㦠E_USER_NOTICE ã ãã§ãã $errortype = array ( E_ERROR => 'Error', E_WARNING => 'Warning', @@ -37,7 +38,7 @@ E_USER_WARNING => 'User Warning', E_USER_NOTICE => 'User Notice', E_STRICT => 'Runtime Notice', - E_RECOVERABLE_ERRROR => 'Catchable Fatal Error' + E_RECOVERABLE_ERROR => 'Catchable Fatal Error' ); // set of errors for which a var trace will be saved $user_errors = array(E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE); http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/dbase/reference.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/dbase/reference.xml diff -u phpdoc-ja/reference/dbase/reference.xml:1.7 phpdoc-ja/reference/dbase/reference.xml:1.8 --- phpdoc-ja/reference/dbase/reference.xml:1.7 Fri May 12 21:24:48 2006 +++ phpdoc-ja/reference/dbase/reference.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> -<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.8 $ --> +<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external --> @@ -74,6 +74,12 @@ <literal>F</literal> ããã㯠<literal>N</literal> ã &false; ã§ãã</entry> <entry>èªã¿æ¸ãã¯æ´æ°å¤ï¼1 ã¾ã㯠0ï¼ã§è¡ããã¾ãã</entry> </row> + <row> + <entry><literal>F</literal></entry> + <entry>Float</entry> + <entry>æµ®åå°æ°ç¹æ°å¤</entry> + <entry>ãã®åã®ãã£ã¼ã«ãã®ãµãã¼ã㯠PHP 5.2.0 ã§è¿½å ããã¾ããã</entry> + </row> </tbody> </tgroup> </table> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/curl/functions/curl-setopt.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/curl/functions/curl-setopt.xml diff -u phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.7 phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.8 --- phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.7 Fri Dec 9 23:30:17 2005 +++ phpdoc-ja/reference/curl/functions/curl-setopt.xml Sun Oct 8 04:45:24 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- EN-Revision: 1.21 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry id="function.curl-setopt"> @@ -417,10 +417,11 @@ <row> <entry><constant>CURLOPT_HTTP_VERSION</constant></entry> <entry> - <parameter>CURL_HTTP_VERSION_NONE</parameter> (default, lets CURL - decide which version to use), - <parameter>CURL_HTTP_VERSION_1_0</parameter> (forces HTTP/1.0), - or <parameter>CURL_HTTP_VERSION_1_1</parameter> (forces HTTP/1.1). + <parameter>CURL_HTTP_VERSION_NONE</parameter> (ããã©ã«ãã + 使ç¨ãããã¼ã¸ã§ã³ã決ããã®ã¯ CURL ã«ã¾ããã)ã + <parameter>CURL_HTTP_VERSION_1_0</parameter> (HTTP/1.0 ã使ç¨ãã)ã + ããã㯠<parameter>CURL_HTTP_VERSION_1_1</parameter> (HTTP/1.1 ã使ç¨ãã) + ã®ããããã§ãã </entry> <entry> </entry> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/ctype/functions/ctype-alnum.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/ctype/functions/ctype-alnum.xml diff -u phpdoc-ja/reference/ctype/functions/ctype-alnum.xml:1.7 phpdoc-ja/reference/ctype/functions/ctype-alnum.xml:1.8 --- phpdoc-ja/reference/ctype/functions/ctype-alnum.xml:1.7 Thu Jul 27 03:31:29 2006 +++ phpdoc-ja/reference/ctype/functions/ctype-alnum.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> -<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.8 $ --> +<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry id="function.ctype-alnum"> <refnamediv> @@ -18,7 +18,7 @@ ä¸ããããæåå <parameter>text</parameter> ã®ãã¹ã¦ã®æåãè±åã¾ã㯠æ°åã§ãããã©ããã調ã¹ã¾ããæ¨æºã® <literal>C</literal> ãã±ã¼ã«ã®å ´åã æå㯠<literal>[A-Za-z]</literal> ã§ããã®é¢æ°ã¯ - <literal>preg_match('/^[a-z0-9]+$/i', $text)</literal> ã¨ç価ã§ãã + <literal>preg_match('/^[a-z0-9]+$/iD', $text)</literal> ã¨ç価ã§ãã </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/appendices/comparisons.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc-ja/appendices/comparisons.xml diff -u phpdoc-ja/appendices/comparisons.xml:1.3 phpdoc-ja/appendices/comparisons.xml:1.4 --- phpdoc-ja/appendices/comparisons.xml:1.3 Fri Dec 3 15:58:25 2004 +++ phpdoc-ja/appendices/comparisons.xml Sun Oct 8 04:45:24 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> -<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.4 $ --> +<!-- EN-Revision: 1.10 Maintainer: hirokawa Status: ready --> <appendix id="types.comparisons"> <title>PHP åã®æ¯è¼è¡¨</title> <para> @@ -210,6 +210,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -226,6 +227,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -240,6 +242,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -254,6 +257,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -268,6 +272,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -282,6 +287,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -296,6 +302,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -310,6 +317,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -324,6 +332,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>NULL</literal></entry> @@ -338,6 +347,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -352,6 +362,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -366,6 +377,22 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> @@ -390,6 +417,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -406,6 +434,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -420,6 +449,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -434,6 +464,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -448,6 +479,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -462,6 +494,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -476,6 +509,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -490,6 +524,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -504,6 +539,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&null;</entry> @@ -518,6 +554,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -532,6 +569,7 @@ <entry>&false;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -546,16 +584,32 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> </table> </para> <note> - <title>PHP 3.0 note</title> + <title>PHP 3.0 ã«é¢ãã注æ</title> <para> - The string value <literal>"0"</literal> was considered non-empty in - PHP 3, this behavior changed in PHP 4 where it's now seen as empty. + æåå <literal>"0"</literal> ã¯ãPHP 3 ã§ã¯ç©ºã®å¤ã¨ã¿ãªããã¾ããã§ããã + ãã®æå㯠PHP 4 ã§å¤æ´ãããç¾å¨ã¯ç©ºã®å¤ã¨ã¿ãªããã¾ãã </para> </note> </appendix> http://cvs.php.net/viewvc.cgi/phpdoc-ja/language-snippets.ent?r1=1.65&r2=1.66&diff_format=u Index: phpdoc-ja/language-snippets.ent diff -u phpdoc-ja/language-snippets.ent:1.65 phpdoc-ja/language-snippets.ent:1.66 --- phpdoc-ja/language-snippets.ent:1.65 Tue Sep 12 03:50:49 2006 +++ phpdoc-ja/language-snippets.ent Sun Oct 8 04:45:24 2006 @@ -1,5 +1,5 @@ -<!-- $Revision: 1.65 $ --> -<!-- EN-Revision: 1.173 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.66 $ --> +<!-- EN-Revision: 1.175 Maintainer: hirokawa Status: ready --> <!-- Credits: haruki,shimooka,takagi --> <!-- Notes --> @@ -233,6 +233,11 @@ <!ENTITY note.bundled.gd '<note><simpara>ãã®é¢æ°ã¯ãPHP ããã³ãã«çã® GD ã©ã¤ãã©ãªã§ ã³ã³ãã¤ã«ããã¦ããå ´åã®ã¿ä½¿ç¨å¯è½ã§ãã</simpara></note>'> +<!ENTITY note.freetype '<note><simpara>ãã®é¢æ°ã¯ãPHP ã FreeType ãµãã¼ã +(<option role="configure">--with-freetype-dir=DIR</option>) +ãæå¹ã«ãã¦ã³ã³ãã¤ã«ããã¦ããå ´åã®ã¿ä½¿ç¨å¯è½ã§ãã +</simpara></note>'> + <!ENTITY note.gd.2 '<note><simpara>ãã®é¢æ°ã¯ãGD 2.0.1 以éãå¿ è¦ã¨ãã¾ã (2.0.28 以éãæ¨å¥¨ãã¾ã)ã</simpara></note>'> <!-- Date and time entities -->