cvs: phpdoc-ja / language-snippets.ent /appendices ini.xml migration52.xml reserved.constants.core.xml /faq general.xml /features safe-mode.xml
/install/windows index.xml installermsi.xml /internals2 counter.xml /internals2/structure basics.xml globals.xml /language operators.xml
/language/oop5 overloading.xml /language/predefined/variables server.xml /reference/apc ini.xml /reference/array/functions
array-intersect-uassoc.xml array-intersect-ukey.xml array-key-exists.xml array-keys.xml array-pop.xml array-unique.xml /reference/bbcode
constants.xml /reference/bc/functions bcsub.xml /reference/classobj/functions is-a.xml /reference/com setup.xml /reference/curl/functions
curl-multi-info-read.xml curl-setopt.xml curl-version.xml /reference/dbase book.xml /reference/dom domxpath.xml /reference/dom/domattr
construct.xml /reference/dom/domdocument registernodeclass.xml /reference/dom/domdocumentfragment appendxml.xml /reference/errorfunc/functions e!
rror-get-last.xml /reference/fbsql book.xml /reference/fbsql/functions fbsql-create-db.xml fbsql-result.xml /reference/filesystem constants.xml
/reference/filesystem/functions parse-ini-file.xml /reference/geoip/functions geoip-db-get-all-info.xml geoip-record-by-name.xml
/reference/gnupg/functions gnupg-verify.xml /reference/haru/harudoc setopenaction.xml /reference/http constants.xml request-options.xml
/reference/http/HttpRequest enableCookies.xml resetCookies.xml /reference/hw/functions hw-connect.xml hw-error.xml hw-pconnect.xml /reference/info
ini.xml /security globals.xml magicquotes.xml

takagi Tue Dec 23 16:27:24 2008 UTC Modified files: /phpdoc-ja/security magicquotes.xml globals.xml /phpdoc-ja/reference/info ini.xml /phpdoc-ja/reference/hw/functions hw-pconnect.xml hw-error.xml hw-connect.xml /phpdoc-ja/reference/http/HttpRequest resetCookies.xml enableCookies.xml /phpdoc-ja/reference/http request-options.xml constants.xml /phpdoc-ja/reference/haru/harudoc setopenaction.xml /phpdoc-ja/reference/gnupg/functions gnupg-verify.xml /phpdoc-ja/reference/geoip/functions geoip-record-by-name.xml geoip-db-get-all-info.xml /phpdoc-ja/reference/filesystem/functions parse-ini-file.xml /phpdoc-ja/reference/filesystem constants.xml /phpdoc-ja/reference/fbsql/functions fbsql-result.xml fbsql-create-db.xml /phpdoc-ja/reference/fbsql book.xml /phpdoc-ja/reference/errorfunc/functions error-get-last.xml /phpdoc-ja/reference/dom/domdocumentfragment appendxml.xml /phpdoc-ja/reference/dom/domdocument registernodeclass.xml /phpdoc-ja/reference/dom/domattr construct.xml /phpdoc-ja/reference/dom domxpath.xml /phpdoc-ja/reference/dbase book.xml /phpdoc-ja/reference/curl/functions curl-version.xml curl-setopt.xml curl-multi-info-read.xml /phpdoc-ja/reference/com setup.xml /phpdoc-ja/reference/classobj/functions is-a.xml /phpdoc-ja/reference/bc/functions bcsub.xml /phpdoc-ja/reference/bbcode constants.xml /phpdoc-ja/reference/array/functions array-unique.xml array-pop.xml array-keys.xml array-key-exists.xml array-intersect-ukey.xml array-intersect-uassoc.xml /phpdoc-ja/reference/apc ini.xml /phpdoc-ja/language/predefined/variables server.xml /phpdoc-ja/language/oop5 overloading.xml /phpdoc-ja/language operators.xml /phpdoc-ja/internals2/structure globals.xml basics.xml /phpdoc-ja/internals2 counter.xml /phpdoc-ja/install/windows installermsi.xml index.xml /phpdoc-ja/features safe-mode.xml /phpdoc-ja/faq general.xml /phpdoc-ja/appendices reserved.constants.core.xml migration52.xml ini.xml /phpdoc-ja language-snippets.ent Log: sync with en.

http://cvs.php.net/viewvc.cgi/phpdoc-ja/security/magicquotes.xml?r1=1.10&r2=1.11&diff_format=u Index: phpdoc-ja/security/magicquotes.xml diff -u phpdoc-ja/security/magicquotes.xml:1.10 phpdoc-ja/security/magicquotes.xml:1.11 --- phpdoc-ja/security/magicquotes.xml:1.10 Sun Oct 21 00:40:08 2007 +++ phpdoc-ja/security/magicquotes.xml Tue Dec 23 16:27:20 2008 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.10 $ --> -<!-- EN-Revision: 1.10 Maintainer: shimooka Status: ready --> +<!-- $Revision: 1.11 $ --> +<!-- EN-Revision: 1.11 Maintainer: shimooka Status: ready --> <!-- CREDITS: hirokawa --> <chapter xml:id="security.magicquotes" xmlns="http://docbook.org/ns/docbook"> <title>マジッククオート</title> - &warn.deprecated.removed-6-0-0; + &warn.deprecated.feature-5-3-0.removed-6-0-0; <para> マジッククオートは、PHPスクリプトに入力されるデータを 自動的にエスケープする機能です。 http://cvs.php.net/viewvc.cgi/phpdoc-ja/security/globals.xml?r1=1.9&r2=1.10&diff_format=u Index: phpdoc-ja/security/globals.xml diff -u phpdoc-ja/security/globals.xml:1.9 phpdoc-ja/security/globals.xml:1.10 --- phpdoc-ja/security/globals.xml:1.9 Tue Jul 1 20:27:03 2008 +++ phpdoc-ja/security/globals.xml Tue Dec 23 16:27:20 2008 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.9 $ --> -<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.10 $ --> +<!-- EN-Revision: 1.10 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <chapter xml:id="security.globals" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>グローバル変数の登録機能の使用法</title> - &warn.deprecated.removed-6-0-0; + &warn.deprecated.feature-5-3-0.removed-6-0-0; <para> PHPの変更点で最も議論の対象となったのは、おそらく、PHP <link xlink:href="&url.php.release4.2.0;">4.2.0</link>において http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/info/ini.xml?r1=1.16&r2=1.17&diff_format=u Index: phpdoc-ja/reference/info/ini.xml diff -u phpdoc-ja/reference/info/ini.xml:1.16 phpdoc-ja/reference/info/ini.xml:1.17 --- phpdoc-ja/reference/info/ini.xml:1.16 Mon Aug 25 20:42:24 2008 +++ phpdoc-ja/reference/info/ini.xml Tue Dec 23 16:27:20 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.16 $ --> -<!-- EN-Revision: 1.24 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.17 $ --> +<!-- EN-Revision: 1.25 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <section xml:id="info.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; @@ -250,7 +250,7 @@ <type>boolean</type> </term> <listitem> - &warn.deprecated.removed-6-0-0; + &warn.deprecated.feature-5-3-0.removed-6-0-0; <para> GPC(Get/Post/Cookie) 処理に関する magic_quotes の設定を行います。 magic_quotes が on の場合、'(シングルクオート)、&quot; @@ -288,7 +288,7 @@ <type>boolean</type> </term> <listitem> - &warn.deprecated.removed-6-0-0; + &warn.deprecated.feature-5-3-0.removed-6-0-0; <para> <parameter>magic_quotes_runtime</parameter> が有効の場合、 データベースおよびテクストファイルを含む外部ソースから http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/hw/functions/hw-pconnect.xml?r1=1.8&r2=1.9&diff_format=u Index: phpdoc-ja/reference/hw/functions/hw-pconnect.xml diff -u phpdoc-ja/reference/hw/functions/hw-pconnect.xml:1.8 phpdoc-ja/reference/hw/functions/hw-pconnect.xml:1.9 --- phpdoc-ja/reference/hw/functions/hw-pconnect.xml:1.8 Tue Jan 1 09:13:10 2008 +++ phpdoc-ja/reference/hw/functions/hw-pconnect.xml Tue Dec 23 16:27:20 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.8 $ --> -<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.9 $ --> +<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.hw-pconnect" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>hw_pConnect</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/hw/functions/hw-error.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/hw/functions/hw-error.xml diff -u phpdoc-ja/reference/hw/functions/hw-error.xml:1.6 phpdoc-ja/reference/hw/functions/hw-error.xml:1.7 --- phpdoc-ja/reference/hw/functions/hw-error.xml:1.6 Mon Dec 31 04:13:12 2007 +++ phpdoc-ja/reference/hw/functions/hw-error.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.hw-error" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>hw_Error</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/hw/functions/hw-connect.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/hw/functions/hw-connect.xml diff -u phpdoc-ja/reference/hw/functions/hw-connect.xml:1.7 phpdoc-ja/reference/hw/functions/hw-connect.xml:1.8 --- phpdoc-ja/reference/hw/functions/hw-connect.xml:1.7 Mon Dec 31 04:13:12 2007 +++ phpdoc-ja/reference/hw/functions/hw-connect.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> -<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.8 $ --> +<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.hw-connect" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>hw_Connect</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/http/HttpRequest/resetCookies.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/http/HttpRequest/resetCookies.xml diff -u phpdoc-ja/reference/http/HttpRequest/resetCookies.xml:1.4 phpdoc-ja/reference/http/HttpRequest/resetCookies.xml:1.5 --- phpdoc-ja/reference/http/HttpRequest/resetCookies.xml:1.4 Thu Jun 5 05:58:37 2008 +++ phpdoc-ja/reference/http/HttpRequest/resetCookies.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.5 $ --> +<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready --> <refentry xml:id="function.httprequest-resetcookies" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>HttpRequest::resetCookies</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/http/HttpRequest/enableCookies.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/http/HttpRequest/enableCookies.xml diff -u phpdoc-ja/reference/http/HttpRequest/enableCookies.xml:1.4 phpdoc-ja/reference/http/HttpRequest/enableCookies.xml:1.5 --- phpdoc-ja/reference/http/HttpRequest/enableCookies.xml:1.4 Thu Jun 5 05:58:37 2008 +++ phpdoc-ja/reference/http/HttpRequest/enableCookies.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.5 $ --> +<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready --> <refentry xml:id="function.httprequest-enablecookies" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>HttpRequest::enableCookies</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/http/request-options.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc-ja/reference/http/request-options.xml diff -u phpdoc-ja/reference/http/request-options.xml:1.3 phpdoc-ja/reference/http/request-options.xml:1.4 --- phpdoc-ja/reference/http/request-options.xml:1.3 Sun Dec 23 07:35:55 2007 +++ phpdoc-ja/reference/http/request-options.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> -<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.4 $ --> +<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready --> <appendix xml:id="http.request.options" xmlns="http://docbook.org/ns/docbook"> <title>HttpRequest クラスおよびリクエスト関数で使用するオプション</title> <titleabbrev>リクエストのオプション</titleabbrev> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/http/constants.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/http/constants.xml diff -u phpdoc-ja/reference/http/constants.xml:1.5 phpdoc-ja/reference/http/constants.xml:1.6 --- phpdoc-ja/reference/http/constants.xml:1.5 Sun Dec 23 07:35:55 2007 +++ phpdoc-ja/reference/http/constants.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.9 Maintainer: takagi Status: ready --> <appendix xml:id="http.constants" xmlns="http://docbook.org/ns/docbook"> &reftitle.constants; &extension.constants; http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/haru/harudoc/setopenaction.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/haru/harudoc/setopenaction.xml diff -u phpdoc-ja/reference/haru/harudoc/setopenaction.xml:1.1 phpdoc-ja/reference/haru/harudoc/setopenaction.xml:1.2 --- phpdoc-ja/reference/haru/harudoc/setopenaction.xml:1.1 Sun Dec 23 06:51:29 2007 +++ phpdoc-ja/reference/haru/harudoc/setopenaction.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.1 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready --> <refentry xml:id="function.harudoc-setopenaction" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>HaruDoc::setOpenAction</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/gnupg/functions/gnupg-verify.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/gnupg/functions/gnupg-verify.xml diff -u phpdoc-ja/reference/gnupg/functions/gnupg-verify.xml:1.5 phpdoc-ja/reference/gnupg/functions/gnupg-verify.xml:1.6 --- phpdoc-ja/reference/gnupg/functions/gnupg-verify.xml:1.5 Fri May 30 12:28:10 2008 +++ phpdoc-ja/reference/gnupg/functions/gnupg-verify.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <refentry xml:id="function.gnupg-verify" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>gnupg_verify</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/geoip/functions/geoip-record-by-name.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-ja/reference/geoip/functions/geoip-record-by-name.xml diff -u phpdoc-ja/reference/geoip/functions/geoip-record-by-name.xml:1.2 phpdoc-ja/reference/geoip/functions/geoip-record-by-name.xml:1.3 --- phpdoc-ja/reference/geoip/functions/geoip-record-by-name.xml:1.2 Fri Jun 22 14:31:52 2007 +++ phpdoc-ja/reference/geoip/functions/geoip-record-by-name.xml Tue Dec 23 16:27:21 2008 @@ -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 --> <refentry xml:id="function.geoip-record-by-name" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>geoip_record_by_name</refname> @@ -29,12 +29,30 @@ <itemizedlist> <listitem> <simpara> + "continent_code" -- 二文字の大陸コード (バージョン 1.0.4 以降で + libgeoip 1.4.3 以降を使用した場合) + </simpara> + </listitem> + <listitem> + <simpara> "country_code" -- 二文字の国コード (<function>geoip_country_code_by_name</function> を参照ください) </simpara> </listitem> <listitem> <simpara> + "country_code3" -- 三文字の国コード + (<function>geoip_country_code3_by_name</function> を参照ください) + </simpara> + </listitem> + <listitem> + <simpara> + "country_name" -- 国名 + (<function>geoip_country_name_by_name</function> を参照ください) + </simpara> + </listitem> + <listitem> + <simpara> "region" -- 地域コード (例: カリフォルニアなら CA) </simpara> </listitem> @@ -60,7 +78,7 @@ </listitem> <listitem> <simpara> - "dma_code" + "dma_code" -- Designated Market Area コード (アメリカおよびカナダのみ) </simpara> </listitem> <listitem> @@ -70,8 +88,8 @@ </listitem> </itemizedlist> </para> - </refsect1> + <refsect1 role="parameters"> &reftitle.parameters; <para> @@ -95,6 +113,36 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>1.0.4</entry> + <entry> + continent_code が GeoIP Library 1.4.3 以降でのみ使えるようになりました。 + </entry> + </row> + <row> + <entry>1.0.3</entry> + <entry> + country_code3 および country_name が追加されました。 + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -118,7 +166,10 @@ <![CDATA[ Array ( + [continent_code] => NA [country_code] => US + [country_code3] => USA + [country_name] => United States [region] => CA [city] => Marina Del Rey [postal_code] => http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/geoip/functions/geoip-db-get-all-info.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-ja/reference/geoip/functions/geoip-db-get-all-info.xml diff -u phpdoc-ja/reference/geoip/functions/geoip-db-get-all-info.xml:1.2 phpdoc-ja/reference/geoip/functions/geoip-db-get-all-info.xml:1.3 --- phpdoc-ja/reference/geoip/functions/geoip-db-get-all-info.xml:1.2 Mon Nov 5 13:50:20 2007 +++ phpdoc-ja/reference/geoip/functions/geoip-db-get-all-info.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> <refentry xml:id="function.geoip-db-get-all-info" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>geoip_db_get_all_info</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/filesystem/functions/parse-ini-file.xml?r1=1.16&r2=1.17&diff_format=u Index: phpdoc-ja/reference/filesystem/functions/parse-ini-file.xml diff -u phpdoc-ja/reference/filesystem/functions/parse-ini-file.xml:1.16 phpdoc-ja/reference/filesystem/functions/parse-ini-file.xml:1.17 --- phpdoc-ja/reference/filesystem/functions/parse-ini-file.xml:1.16 Thu Sep 18 00:41:30 2008 +++ phpdoc-ja/reference/filesystem/functions/parse-ini-file.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.16 $ --> -<!-- EN-Revision: 1.30 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.17 $ --> +<!-- EN-Revision: 1.31 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.parse-ini-file"> <refnamediv> @@ -14,6 +14,7 @@ <type>array</type><methodname>parse_ini_file</methodname> <methodparam><type>string</type><parameter>filename</parameter></methodparam> <methodparam choice="opt"><type>bool</type><parameter>process_sections</parameter></methodparam> + <methodparam choice="opt"><type>integer</type><parameter>scanner_mode</parameter></methodparam> </methodsynopsis> <para> <function>parse_ini_file</function> は、 @@ -48,6 +49,16 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>scanner_mode</parameter></term> + <listitem> + <para> + <constant>INI_SCANNER_NORMAL</constant> (デフォルト) あるいは + <constant>INI_SCANNER_RAW</constant>。<constant>INI_SCANNER_RAW</constant> + を指定すると、オプションの値はパースされません。 + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -74,6 +85,12 @@ </thead> <tbody> <row> + <entry>5.3.0</entry> + <entry> + オプションのパラメータ <parameter>scanner_mode</parameter> が追加されました。 + </entry> + </row> + <row> <entry>5.2.7</entry> <entry> 構文エラーが発生した場合は、空の配列ではなく http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/filesystem/constants.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/filesystem/constants.xml diff -u phpdoc-ja/reference/filesystem/constants.xml:1.7 phpdoc-ja/reference/filesystem/constants.xml:1.8 --- phpdoc-ja/reference/filesystem/constants.xml:1.7 Sat Dec 22 10:12:41 2007 +++ phpdoc-ja/reference/filesystem/constants.xml Tue Dec 23 16:27:21 2008 @@ -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.10 Maintainer: hirokawa Status: ready --> <appendix xml:id="filesystem.constants" xmlns="http://docbook.org/ns/docbook"> &reftitle.constants; &extension.constants; @@ -169,7 +169,7 @@ </term> <listitem> <simpara> - バイナリモード (PHP 6 以降)。 + バイナリモード (PHP 5.2.7 以降)。 </simpara> </listitem> </varlistentry> @@ -181,7 +181,31 @@ </term> <listitem> <simpara> - テキストモード (PHP 6 以降)。 + テキストモード (PHP 5.2.7 以降)。 + </simpara> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <constant>INI_SCANNER_NORMAL</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + 通常の INI スキャナモード (PHP 5.3 以降)。 + </simpara> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <constant>INI_SCANNER_RAW</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + 生の INI スキャナモード (PHP 5.3 以降)。 </simpara> </listitem> </varlistentry> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/fbsql/functions/fbsql-result.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/fbsql/functions/fbsql-result.xml diff -u phpdoc-ja/reference/fbsql/functions/fbsql-result.xml:1.6 phpdoc-ja/reference/fbsql/functions/fbsql-result.xml:1.7 --- phpdoc-ja/reference/fbsql/functions/fbsql-result.xml:1.6 Fri Jun 22 14:31:48 2007 +++ phpdoc-ja/reference/fbsql/functions/fbsql-result.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.fbsql-result" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>fbsql_result</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/fbsql/functions/fbsql-create-db.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/fbsql/functions/fbsql-create-db.xml diff -u phpdoc-ja/reference/fbsql/functions/fbsql-create-db.xml:1.7 phpdoc-ja/reference/fbsql/functions/fbsql-create-db.xml:1.8 --- phpdoc-ja/reference/fbsql/functions/fbsql-create-db.xml:1.7 Fri Jun 22 14:31:48 2007 +++ phpdoc-ja/reference/fbsql/functions/fbsql-create-db.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> -<!-- EN-Revision: 1.11 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.8 $ --> +<!-- EN-Revision: 1.12 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.fbsql-create-db" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>fbsql_create_db</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/fbsql/book.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/fbsql/book.xml diff -u phpdoc-ja/reference/fbsql/book.xml:1.1 phpdoc-ja/reference/fbsql/book.xml:1.2 --- phpdoc-ja/reference/fbsql/book.xml:1.1 Sat Dec 22 02:43:02 2007 +++ phpdoc-ja/reference/fbsql/book.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> <!-- CREDITS: hirokawa --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external --> @@ -23,6 +23,11 @@ <simpara> Frontbase のサポートは、PHP 4.0.6 で追加されました。 </simpara> + <note> + <para> + &pecl.moved-ver;5.3.0. + </para> + </note> </preface> <!-- }}} --> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/errorfunc/functions/error-get-last.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/errorfunc/functions/error-get-last.xml diff -u phpdoc-ja/reference/errorfunc/functions/error-get-last.xml:1.6 phpdoc-ja/reference/errorfunc/functions/error-get-last.xml:1.7 --- phpdoc-ja/reference/errorfunc/functions/error-get-last.xml:1.6 Fri Dec 5 03:34:14 2008 +++ phpdoc-ja/reference/errorfunc/functions/error-get-last.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> <refentry xml:id="function.error-get-last" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>error_get_last</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/dom/domdocumentfragment/appendxml.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/dom/domdocumentfragment/appendxml.xml diff -u phpdoc-ja/reference/dom/domdocumentfragment/appendxml.xml:1.1 phpdoc-ja/reference/dom/domdocumentfragment/appendxml.xml:1.2 --- phpdoc-ja/reference/dom/domdocumentfragment/appendxml.xml:1.1 Mon Dec 17 04:13:00 2007 +++ phpdoc-ja/reference/dom/domdocumentfragment/appendxml.xml Tue Dec 23 16:27:21 2008 @@ -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 xml:id="domdocumentfragment.appendxml" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>DOMDocumentFragment::appendXML</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/dom/domdocument/registernodeclass.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc-ja/reference/dom/domdocument/registernodeclass.xml diff -u phpdoc-ja/reference/dom/domdocument/registernodeclass.xml:1.3 phpdoc-ja/reference/dom/domdocument/registernodeclass.xml:1.4 --- phpdoc-ja/reference/dom/domdocument/registernodeclass.xml:1.3 Fri Dec 5 03:34:14 2008 +++ phpdoc-ja/reference/dom/domdocument/registernodeclass.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> -<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.4 $ --> +<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> <refentry xml:id="domdocument.registernodeclass" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>DOMDocument::registerNodeClass</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/dom/domattr/construct.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/dom/domattr/construct.xml diff -u phpdoc-ja/reference/dom/domattr/construct.xml:1.1 phpdoc-ja/reference/dom/domattr/construct.xml:1.2 --- phpdoc-ja/reference/dom/domattr/construct.xml:1.1 Mon Dec 17 04:11:46 2007 +++ phpdoc-ja/reference/dom/domattr/construct.xml Tue Dec 23 16:27:21 2008 @@ -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 xml:id='domattr.construct' xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>DOMAttr::__construct</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/dom/domxpath.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc-ja/reference/dom/domxpath.xml diff -u phpdoc-ja/reference/dom/domxpath.xml:1.3 phpdoc-ja/reference/dom/domxpath.xml:1.4 --- phpdoc-ja/reference/dom/domxpath.xml:1.3 Mon Aug 25 20:42:27 2008 +++ phpdoc-ja/reference/dom/domxpath.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> -<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.4 $ --> +<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> <!-- Remove me once you perform substitutions domxpath @@ -14,14 +14,12 @@ <partintro> <!-- {{{ DOMXPath intro --> -<!-- FIXME: <section xml:id="domxpath.intro"> &reftitle.intro; <para> - Description of the class. + XPath 1.0 をサポートします。 </para> </section> - --> <!-- }}} --> <section xml:id="domxpath.synopsis"> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/dbase/book.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/dbase/book.xml diff -u phpdoc-ja/reference/dbase/book.xml:1.1 phpdoc-ja/reference/dbase/book.xml:1.2 --- phpdoc-ja/reference/dbase/book.xml:1.1 Sun Dec 16 22:17:05 2007 +++ phpdoc-ja/reference/dbase/book.xml Tue Dec 23 16:27:21 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> <!-- CREDITS: hirokawa --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external --> @@ -83,6 +83,11 @@ </tgroup> </table> </para> + <note> + <para> + &pecl.moved-ver;5.3.0. + </para> + </note> <warning> <para> これらの関数では、インデックスおよびメモフィールドのサポートは http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/curl/functions/curl-version.xml?r1=1.8&r2=1.9&diff_format=u Index: phpdoc-ja/reference/curl/functions/curl-version.xml diff -u phpdoc-ja/reference/curl/functions/curl-version.xml:1.8 phpdoc-ja/reference/curl/functions/curl-version.xml:1.9 --- phpdoc-ja/reference/curl/functions/curl-version.xml:1.8 Thu Oct 30 03:42:09 2008 +++ phpdoc-ja/reference/curl/functions/curl-version.xml Tue Dec 23 16:27:22 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.8 $ --> -<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.9 $ --> +<!-- EN-Revision: 1.9 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry xml:id="function.curl-version" xmlns="http://docbook.org/ns/docbook"> <refnamediv> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/curl/functions/curl-setopt.xml?r1=1.18&r2=1.19&diff_format=u Index: phpdoc-ja/reference/curl/functions/curl-setopt.xml diff -u phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.18 phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.19 --- phpdoc-ja/reference/curl/functions/curl-setopt.xml:1.18 Sat Nov 29 22:02:44 2008 +++ phpdoc-ja/reference/curl/functions/curl-setopt.xml Tue Dec 23 16:27:22 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.18 $ --> -<!-- EN-Revision: 1.34 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.19 $ --> +<!-- EN-Revision: 1.36 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry xml:id="function.curl-setopt" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -602,7 +602,7 @@ <constant>CURLOPT_HEADER</constant> が &true; だと仮定すると、 ページが変更されていない場合は <literal>"304 Not Modified"</literal> ヘッダが返されます。 - <parameter>CURL_TIMECOND_ISUNMODSINCE</parameter> は反対の意味です。 + <parameter>CURL_TIMECOND_IFUNMODSINCE</parameter> は反対の意味です。 デフォルトは <parameter>CURL_TIMECOND_IFMODSINCE</parameter> です。 </entry> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/curl/functions/curl-multi-info-read.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/curl/functions/curl-multi-info-read.xml diff -u phpdoc-ja/reference/curl/functions/curl-multi-info-read.xml:1.6 phpdoc-ja/reference/curl/functions/curl-multi-info-read.xml:1.7 --- phpdoc-ja/reference/curl/functions/curl-multi-info-read.xml:1.6 Wed Dec 3 23:11:07 2008 +++ phpdoc-ja/reference/curl/functions/curl-multi-info-read.xml Tue Dec 23 16:27:22 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> <refentry xml:id="function.curl-multi-info-read" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>curl_multi_info_read</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/com/setup.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/com/setup.xml diff -u phpdoc-ja/reference/com/setup.xml:1.1 phpdoc-ja/reference/com/setup.xml:1.2 --- phpdoc-ja/reference/com/setup.xml:1.1 Thu Dec 13 21:18:47 2007 +++ phpdoc-ja/reference/com/setup.xml Tue Dec 23 16:27:22 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> <!-- CREDITS: hirokawa --> <chapter xml:id="com.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -8,6 +8,7 @@ <!-- {{{ Requirements --> <section xml:id="com.requirements"> + &reftitle.required; <para> COM 関数は、Windows 版の PHP でのみ利用可能です。 </para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/classobj/functions/is-a.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/classobj/functions/is-a.xml diff -u phpdoc-ja/reference/classobj/functions/is-a.xml:1.5 phpdoc-ja/reference/classobj/functions/is-a.xml:1.6 --- phpdoc-ja/reference/classobj/functions/is-a.xml:1.5 Fri Jun 22 14:31:39 2007 +++ phpdoc-ja/reference/classobj/functions/is-a.xml Tue Dec 23 16:27:22 2008 @@ -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.12 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <refentry xml:id="function.is-a" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -19,12 +19,6 @@ がこのクラスのものであるか、 あるいはこのクラスをその親クラスのひとつとしているかどうかを調べます。 </para> - <note> - <para> - <function>is_a</function> 関数は PHP 5 では非推奨となりました。かわりに - <link linkend="language.operators.type">instanceof</link> 演算子を使用してください。 - </para> - </note> </refsect1> <refsect1 role="parameters"> &reftitle.parameters; @@ -57,6 +51,39 @@ &true;、それ以外の場合に &false; を返します。 </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>5.3.0</entry> + <entry> + この関数は非推奨ではなくなりました。そのため + <constant>E_STRICT</constant> も発生しなくなりました。 + </entry> + </row> + <row> + <entry>5.0.0</entry> + <entry> + この関数は非推奨となり、かわりに + <link linkend="language.operators.type">instanceof</link> + 演算子の使用が推奨されるようになりました。この関数をコールすると + <constant>E_STRICT</constant> が発生します。 + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> <refsect1 role="examples"> &reftitle.examples; <para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/bc/functions/bcsub.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc-ja/reference/bc/functions/bcsub.xml diff -u phpdoc-ja/reference/bc/functions/bcsub.xml:1.7 phpdoc-ja/reference/bc/functions/bcsub.xml:1.8 --- phpdoc-ja/reference/bc/functions/bcsub.xml:1.7 Fri Jun 22 14:31:38 2007 +++ phpdoc-ja/reference/bc/functions/bcsub.xml Tue Dec 23 16:27:22 2008 @@ -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 xml:id="function.bcsub" xmlns="http://docbook.org/ns/docbook"> <refnamediv> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/bbcode/constants.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/bbcode/constants.xml diff -u phpdoc-ja/reference/bbcode/constants.xml:1.6 phpdoc-ja/reference/bbcode/constants.xml:1.7 --- phpdoc-ja/reference/bbcode/constants.xml:1.6 Mon Aug 18 19:52:33 2008 +++ phpdoc-ja/reference/bbcode/constants.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <appendix xml:id="bbcode.constants" xmlns="http://docbook.org/ns/docbook"> &reftitle.constants; &extension.constants; http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/array/functions/array-unique.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc-ja/reference/array/functions/array-unique.xml diff -u phpdoc-ja/reference/array/functions/array-unique.xml:1.11 phpdoc-ja/reference/array/functions/array-unique.xml:1.12 --- phpdoc-ja/reference/array/functions/array-unique.xml:1.11 Mon Dec 31 08:26:02 2007 +++ phpdoc-ja/reference/array/functions/array-unique.xml Tue Dec 23 16:27:23 2008 @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.11 $ --> -<!-- EN-Revision: 1.17 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.12 $ --> +<!-- EN-Revision: 1.18 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.array-unique" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_unique</refname> <refpurpose>配列から重複した値を削除する</refpurpose> </refnamediv> + <refsect1 role="description"> &reftitle.description; <methodsynopsis> <type>array</type><methodname>array_unique</methodname> <methodparam><type>array</type><parameter>array</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam> </methodsynopsis> <para> <parameter>array</parameter> を入力とし、値に重複のない新規配列を返します。 @@ -33,6 +35,7 @@ </simpara> </note> </refsect1> + <refsect1 role="parameters"> &reftitle.parameters; <para> @@ -45,15 +48,74 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>sort_flags</parameter></term> + <listitem> + <para> + オプションの 2 番目のパラメータ <parameter>sort_flags</parameter> + にこれらの値を使用して、ソートの挙動を変更します。 + </para> + <para> + ソート形式のフラグは次のとおりです。 + <itemizedlist> + <listitem> + <simpara><constant>SORT_REGULAR</constant> - 通常の比較 + (型変換をしない) を行います</simpara> + </listitem> + <listitem> + <simpara><constant>SORT_NUMERIC</constant> - 数値として比較します</simpara> + </listitem> + <listitem> + <simpara><constant>SORT_STRING</constant> - 文字列として比較します</simpara> + </listitem> + <listitem> + <simpara><constant>SORT_LOCALE_STRING</constant> - + 現在のロケールにもとづいて文字列として比較します。 + PHP 4.4.0 および 5.0.2 で追加されました。 + PHP 6 より前のバージョンではシステムのロケールを使用します。これは + <function>setlocale</function> で変更可能です。PHP 6 以降では + <function>i18n_loc_set_default</function> 関数を使用する必要があります。 + </simpara> + </listitem> + </itemizedlist> + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> + <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> 処理済の配列を返します。 </para> </refsect1> + + <refsect1 role="changelog"> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>5.2.9</entry> + <entry> + オプションの <parameter>sort_flags</parameter> が追加されました。 + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -105,6 +167,7 @@ </example> </para> </refsect1> + </refentry> <!-- Keep this comment at the end of the file http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/array/functions/array-pop.xml?r1=1.9&r2=1.10&diff_format=u Index: phpdoc-ja/reference/array/functions/array-pop.xml diff -u phpdoc-ja/reference/array/functions/array-pop.xml:1.9 phpdoc-ja/reference/array/functions/array-pop.xml:1.10 --- phpdoc-ja/reference/array/functions/array-pop.xml:1.9 Mon May 5 01:51:36 2008 +++ phpdoc-ja/reference/array/functions/array-pop.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.9 $ --> -<!-- EN-Revision: 1.15 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.10 $ --> +<!-- EN-Revision: 1.16 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.array-pop" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_pop</refname> @@ -89,9 +89,11 @@ <refsect1 role="seealso"> &reftitle.seealso; <para> - <function>array_push</function>、 - <function>array_shift</function> および - <function>array_unshift</function> も参照ください。 + <simplelist> + <member><function>array_push</function></member> + <member><function>array_shift</function></member> + <member><function>array_unshift</function></member> + </simplelist> </para> </refsect1> </refentry> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/array/functions/array-keys.xml?r1=1.10&r2=1.11&diff_format=u Index: phpdoc-ja/reference/array/functions/array-keys.xml diff -u phpdoc-ja/reference/array/functions/array-keys.xml:1.10 phpdoc-ja/reference/array/functions/array-keys.xml:1.11 --- phpdoc-ja/reference/array/functions/array-keys.xml:1.10 Sat Aug 4 03:05:07 2007 +++ phpdoc-ja/reference/array/functions/array-keys.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.10 $ --> -<!-- EN-Revision: 1.14 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.11 $ --> +<!-- EN-Revision: 1.15 Maintainer: hirokawa Status: ready --> <refentry xml:id="function.array-keys" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_keys</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/array/functions/array-key-exists.xml?r1=1.10&r2=1.11&diff_format=u Index: phpdoc-ja/reference/array/functions/array-key-exists.xml diff -u phpdoc-ja/reference/array/functions/array-key-exists.xml:1.10 phpdoc-ja/reference/array/functions/array-key-exists.xml:1.11 --- phpdoc-ja/reference/array/functions/array-key-exists.xml:1.10 Fri Sep 5 11:58:13 2008 +++ phpdoc-ja/reference/array/functions/array-key-exists.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.10 $ --> -<!-- EN-Revision: 1.16 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.11 $ --> +<!-- EN-Revision: 1.17 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry xml:id="function.array-key-exists" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -108,7 +108,7 @@ &true; を返しません。一方、<function>array_key_exists</function> は &true; を返します。 </para> - <programlisting role="php"> + <programlisting role="php"> <![CDATA[ <?php $search_array = array('first' => null, 'second' => 4); @@ -120,7 +120,7 @@ array_key_exists('first', $search_array); ?> ]]> - </programlisting> + </programlisting> </example> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/array/functions/array-intersect-ukey.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/array/functions/array-intersect-ukey.xml diff -u phpdoc-ja/reference/array/functions/array-intersect-ukey.xml:1.5 phpdoc-ja/reference/array/functions/array-intersect-ukey.xml:1.6 --- phpdoc-ja/reference/array/functions/array-intersect-ukey.xml:1.5 Fri Jun 22 14:31:37 2007 +++ phpdoc-ja/reference/array/functions/array-intersect-ukey.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <refentry xml:id="function.array-intersect-ukey" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_intersect_ukey</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/array/functions/array-intersect-uassoc.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/array/functions/array-intersect-uassoc.xml diff -u phpdoc-ja/reference/array/functions/array-intersect-uassoc.xml:1.4 phpdoc-ja/reference/array/functions/array-intersect-uassoc.xml:1.5 --- phpdoc-ja/reference/array/functions/array-intersect-uassoc.xml:1.4 Fri Jun 22 14:31:37 2007 +++ phpdoc-ja/reference/array/functions/array-intersect-uassoc.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.5 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <refentry xml:id="function.array-intersect-uassoc" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_intersect_uassoc</refname> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/apc/ini.xml?r1=1.16&r2=1.17&diff_format=u Index: phpdoc-ja/reference/apc/ini.xml diff -u phpdoc-ja/reference/apc/ini.xml:1.16 phpdoc-ja/reference/apc/ini.xml:1.17 --- phpdoc-ja/reference/apc/ini.xml:1.16 Thu Oct 30 03:42:09 2008 +++ phpdoc-ja/reference/apc/ini.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.16 $ --> -<!-- EN-Revision: 1.18 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.17 $ --> +<!-- EN-Revision: 1.19 Maintainer: takagi Status: ready --> <section xml:id="apc.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; &extension.runtime; http://cvs.php.net/viewvc.cgi/phpdoc-ja/language/predefined/variables/server.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/language/predefined/variables/server.xml diff -u phpdoc-ja/language/predefined/variables/server.xml:1.5 phpdoc-ja/language/predefined/variables/server.xml:1.6 --- phpdoc-ja/language/predefined/variables/server.xml:1.5 Thu Oct 30 03:42:09 2008 +++ phpdoc-ja/language/predefined/variables/server.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.server" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion"> <refnamediv> @@ -274,10 +274,12 @@ スクリプトが HTTPS プロトコルを通じて実行されている場合に 空でない値が設定されます。 </simpara> - <simpara> - ISAPI を IIS で使用している場合は、HTTPS プロトコルを通さないでリクエストが行われたときの値は - <literal>off</literal> となることに注意しましょう。 - </simpara> + <note> + <simpara> + ISAPI を IIS で使用している場合は、HTTPS プロトコルを通さないでリクエストが行われたときの値は + <literal>off</literal> となることに注意しましょう。 + </simpara> + </note> </listitem> </varlistentry> http://cvs.php.net/viewvc.cgi/phpdoc-ja/language/oop5/overloading.xml?r1=1.20&r2=1.21&diff_format=u Index: phpdoc-ja/language/oop5/overloading.xml diff -u phpdoc-ja/language/oop5/overloading.xml:1.20 phpdoc-ja/language/oop5/overloading.xml:1.21 --- phpdoc-ja/language/oop5/overloading.xml:1.20 Sun Jul 27 13:59:52 2008 +++ phpdoc-ja/language/oop5/overloading.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.20 $ --> -<!-- EN-Revision: 1.32 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.21 $ --> +<!-- EN-Revision: 1.33 Maintainer: takagi Status: ready --> <!-- CREDITS: hirokawa,shimooka --> <sect1 xml:id="language.oop5.overloading" xmlns="http://docbook.org/ns/docbook"> @@ -281,7 +281,7 @@ </para> <example> - <title>__call および ___callStatic による、インスタンス化されたメソッドのオーバーロードの例</title> + <title>__call および __callStatic による、インスタンス化されたメソッドのオーバーロードの例</title> <programlisting role="php"> <![CDATA[ <?php http://cvs.php.net/viewvc.cgi/phpdoc-ja/language/operators.xml?r1=1.52&r2=1.53&diff_format=u Index: phpdoc-ja/language/operators.xml diff -u phpdoc-ja/language/operators.xml:1.52 phpdoc-ja/language/operators.xml:1.53 --- phpdoc-ja/language/operators.xml:1.52 Mon Aug 25 20:42:31 2008 +++ phpdoc-ja/language/operators.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.52 $ --> -<!-- EN-Revision: 1.127 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.53 $ --> +<!-- EN-Revision: 1.128 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <chapter xml:id="language.operators" xmlns="http://docbook.org/ns/docbook"> <title>演算子</title> @@ -1374,6 +1374,7 @@ それ以前には <function>is_a</function> が使用されていましたが、 現在は <function>is_a</function> は推奨されておらず、 <literal>instanceof</literal> の使用が推奨されています。 + PHP 5.3.0 以降、<function>is_a</function> は非推奨ではなくなったことに注意しましょう。 </simpara> <para> <function>get_class</function> および http://cvs.php.net/viewvc.cgi/phpdoc-ja/internals2/structure/globals.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/internals2/structure/globals.xml diff -u phpdoc-ja/internals2/structure/globals.xml:1.5 phpdoc-ja/internals2/structure/globals.xml:1.6 --- phpdoc-ja/internals2/structure/globals.xml:1.5 Thu Oct 30 03:42:09 2008 +++ phpdoc-ja/internals2/structure/globals.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> <sect1 xml:id="internals2.structure.globals" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>拡張モジュールのグローバル変数</title> http://cvs.php.net/viewvc.cgi/phpdoc-ja/internals2/structure/basics.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/internals2/structure/basics.xml diff -u phpdoc-ja/internals2/structure/basics.xml:1.1 phpdoc-ja/internals2/structure/basics.xml:1.2 --- phpdoc-ja/internals2/structure/basics.xml:1.1 Mon May 26 21:45:48 2008 +++ phpdoc-ja/internals2/structure/basics.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.1 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.2 Maintainer: takagi Status: ready --> <sect1 xml:id="internals2.structure.basics" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>基本構造</title> http://cvs.php.net/viewvc.cgi/phpdoc-ja/internals2/counter.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/internals2/counter.xml diff -u phpdoc-ja/internals2/counter.xml:1.4 phpdoc-ja/internals2/counter.xml:1.5 --- phpdoc-ja/internals2/counter.xml:1.4 Fri Jun 20 03:35:18 2008 +++ phpdoc-ja/internals2/counter.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.5 $ --> +<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready --> <part xml:id="internals2.counter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>"counter" 拡張モジュール - サンプル</title> http://cvs.php.net/viewvc.cgi/phpdoc-ja/install/windows/installermsi.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/install/windows/installermsi.xml diff -u phpdoc-ja/install/windows/installermsi.xml:1.5 phpdoc-ja/install/windows/installermsi.xml:1.6 --- phpdoc-ja/install/windows/installermsi.xml:1.5 Tue Aug 14 20:11:40 2007 +++ phpdoc-ja/install/windows/installermsi.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.9 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.10 Maintainer: takagi Status: ready --> <sect1 xml:id="install.windows.installer.msi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Windows インストーラ (PHP 5.2 以降)</title> <para> @@ -105,7 +105,9 @@ apacheCGI - Apache CGI 実行ファイル iis4ISAPI - IIS ISAPI モジュール iis4CGI - IIS CGI 実行ファイル +iis4FastCGI - IIS CGI 実行ファイル NSAPI - Sun/iPlanet/Netscape サーバモジュール +netserve - NetServe Web Server CGI 実行ファイル Xitami - Xitami CGI 実行ファイル Sambar - Sambar Server ISAPI モジュール CGI - php-cgi.exe 実行ファイル http://cvs.php.net/viewvc.cgi/phpdoc-ja/install/windows/index.xml?r1=1.8&r2=1.9&diff_format=u Index: phpdoc-ja/install/windows/index.xml diff -u phpdoc-ja/install/windows/index.xml:1.8 phpdoc-ja/install/windows/index.xml:1.9 --- phpdoc-ja/install/windows/index.xml:1.8 Wed Aug 20 20:49:09 2008 +++ phpdoc-ja/install/windows/index.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.8 $ --> -<!-- EN-Revision: 1.21 Maintainer: haruki Status: ready --> +<!-- $Revision: 1.9 $ --> +<!-- EN-Revision: 1.22 Maintainer: haruki Status: ready --> <!-- CREDITS: fujimoto, hirokawa, yuw, haruki --> <chapter xml:id="install.windows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Windows システムへのインストール</title> @@ -46,8 +46,8 @@ </para> </warning> - &install.windows.installermsi; &install.windows.installer; + &install.windows.installermsi; &install.windows.manual; &install.windows.activescript; &install.windows.iis; http://cvs.php.net/viewvc.cgi/phpdoc-ja/features/safe-mode.xml?r1=1.31&r2=1.32&diff_format=u Index: phpdoc-ja/features/safe-mode.xml diff -u phpdoc-ja/features/safe-mode.xml:1.31 phpdoc-ja/features/safe-mode.xml:1.32 --- phpdoc-ja/features/safe-mode.xml:1.31 Sat Nov 29 09:29:03 2008 +++ phpdoc-ja/features/safe-mode.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.31 $ --> -<!-- EN-Revision: 1.79 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.32 $ --> +<!-- EN-Revision: 1.80 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <chapter xml:id="features.safe-mode" xmlns="http://docbook.org/ns/docbook"> <title>セーフモード</title> @@ -72,7 +72,7 @@ <entry>open_basedir</entry> <entry>NULL</entry> <entry>PHP_INI_ALL</entry> - <entry>PHP &lt; 6 では PHP_INI_SYSTEM。</entry> + <entry>PHP &lt; 5.3.0 では PHP_INI_SYSTEM。</entry> </row> <row> <entry>disable_functions</entry> @@ -263,6 +263,15 @@ <para> デフォルトでは全てのファイルのオープンが許可されます。 </para> + <note> + <para> + PHP 5.3.0 以降、実行時に open_basedir をより厳しくできるようになりました。 + つまり、open_basedir が &php.ini; で <literal>/www/</literal> + に設定されていた場合、スクリプト内で + <function>ini_set</function> を使って設定を + <literal>/www/tmp/</literal> にすることができます。 + </para> + </note> </listitem> </varlistentry> <varlistentry xml:id="ini.disable-functions"> http://cvs.php.net/viewvc.cgi/phpdoc-ja/faq/general.xml?r1=1.13&r2=1.14&diff_format=u Index: phpdoc-ja/faq/general.xml diff -u phpdoc-ja/faq/general.xml:1.13 phpdoc-ja/faq/general.xml:1.14 --- phpdoc-ja/faq/general.xml:1.13 Fri Jul 11 23:39:32 2008 +++ phpdoc-ja/faq/general.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.13 $ --> -<!-- EN-Revision: 1.27 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.14 $ --> +<!-- EN-Revision: 1.28 Maintainer: hirokawa Status: ready --> <chapter xml:id="faq.general" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>一般的な情報</title> <titleabbrev>一般的な情報</titleabbrev> @@ -138,21 +138,21 @@ </listitem> <listitem> <simpara>新たなエラー報告定数 - <link xlink:href="&url.php.migrating5-errorrep;">E_STRICT</link> + <link linkend="migrating5.errorrep">E_STRICT</link> による、実行時のコードへの提案メッセージ </simpara> </listitem> <listitem> <simpara>新たな - <link xlink:href="&url.php.migrating5-functions;">関数</link> + <link linkend="migration5.functions">関数</link> によるコード記述の簡素化 (および、 よくある処理のためにわざわざ自前の関数を作成する手間の削減) </simpara> </listitem> </itemizedlist> より詳細な情報は、 - <link xlink:href="&url.php.migrate-45;">PHP 4 から PHP 5 への移行</link> および - <link xlink:href="&url.php.backwards-incompatible;">過去との互換性のない変更</link> + <link linkend="faq.migration5">PHP 4 から PHP 5 への移行</link> および + <link linkend="migration5.incompatible">過去との互換性のない変更</link> を参照ください。 </para> </answer> http://cvs.php.net/viewvc.cgi/phpdoc-ja/appendices/reserved.constants.core.xml?r1=1.10&r2=1.11&diff_format=u Index: phpdoc-ja/appendices/reserved.constants.core.xml diff -u phpdoc-ja/appendices/reserved.constants.core.xml:1.10 phpdoc-ja/appendices/reserved.constants.core.xml:1.11 --- phpdoc-ja/appendices/reserved.constants.core.xml:1.10 Thu Feb 28 09:37:35 2008 +++ phpdoc-ja/appendices/reserved.constants.core.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.10 $ --> -<!-- EN-Revision: 1.21 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.11 $ --> +<!-- EN-Revision: 1.22 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <sect2 xml:id="reserved.constants.core" xmlns="http://docbook.org/ns/docbook"> <title>コアの定義済みの定数</title> @@ -97,6 +97,17 @@ </simpara> </listitem> </varlistentry> + <varlistentry> + <term> + <constant>PHP_MAXPATHLEN</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + PHP 5.3.0 以降で利用可能。 + </simpara> + </listitem> + </varlistentry> <varlistentry> <term> @@ -453,6 +464,28 @@ </varlistentry> <varlistentry> <term> + <constant>E_DEPRECATED</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + PHP 5.3.0 以降で利用可能 + </simpara> + </listitem> + </varlistentry> + <varlistentry> + <term> + <constant>E_USER_DEPRECATED</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + PHP 5.3.0 以降で利用可能 + </simpara> + </listitem> + </varlistentry> + <varlistentry> + <term> <constant>E_ALL</constant> (<type>integer</type>) </term> http://cvs.php.net/viewvc.cgi/phpdoc-ja/appendices/migration52.xml?r1=1.15&r2=1.16&diff_format=u Index: phpdoc-ja/appendices/migration52.xml diff -u phpdoc-ja/appendices/migration52.xml:1.15 phpdoc-ja/appendices/migration52.xml:1.16 --- phpdoc-ja/appendices/migration52.xml:1.15 Sat Nov 29 09:29:03 2008 +++ phpdoc-ja/appendices/migration52.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.15 $ --> -<!-- EN-Revision: 1.37 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.16 $ --> +<!-- EN-Revision: 1.38 Maintainer: takagi Status: ready --> <appendix xml:id="migration52" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>PHP 5.1.x から PHP 5.2.x への移行</title> <para> @@ -937,7 +937,7 @@ </listitem> <listitem> <simpara> - void swfmovie::protect([string pasword]) + void swfmovie::protect([string password]) - プロテクトします。 </simpara> </listitem> http://cvs.php.net/viewvc.cgi/phpdoc-ja/appendices/ini.xml?r1=1.49&r2=1.50&diff_format=u Index: phpdoc-ja/appendices/ini.xml diff -u phpdoc-ja/appendices/ini.xml:1.49 phpdoc-ja/appendices/ini.xml:1.50 --- phpdoc-ja/appendices/ini.xml:1.49 Sat Nov 29 09:29:03 2008 +++ phpdoc-ja/appendices/ini.xml Tue Dec 23 16:27:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.49 $ --> -<!-- EN-Revision: 1.78 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.50 $ --> +<!-- EN-Revision: 1.80 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi,shimooka --> <appendix xml:id="ini" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -2183,7 +2183,7 @@ <entry><link linkend="ini.open-basedir">open_basedir</link></entry> <entry>NULL</entry> <entry>PHP_INI_ALL</entry> - <entry>PHP &lt; 6 では PHP_INI_SYSTEM。</entry> + <entry>PHP &lt; 5.2.3 では PHP_INI_SYSTEM。</entry> </row> <row> <entry>oracle.allow_persistent</entry> @@ -2393,7 +2393,7 @@ <entry><link linkend="ini.register-globals">register_globals</link></entry> <entry>"0"</entry> <entry>PHP_INI_PERDIR</entry> - <entry>PHP &lt;= 4.2.3 では PHP_INI_ALL。PHP 6.0.0 で削除。</entry> + <entry>PHP &lt;= 4.2.3 では PHP_INI_ALL。PHP 5.3.0 で非推奨。PHP 6.0.0 で削除。</entry> </row> <row> <entry><link linkend="ini.register-long-arrays">register_long_arrays</link></entry> @@ -4323,7 +4323,7 @@ ディレクティブの影響を受けます。 </para> </note> - &warn.deprecated.removed-6-0-0; + &warn.deprecated.feature-5-3-0.removed-6-0-0; </listitem> </varlistentry> http://cvs.php.net/viewvc.cgi/phpdoc-ja/language-snippets.ent?r1=1.110&r2=1.111&diff_format=u Index: phpdoc-ja/language-snippets.ent diff -u phpdoc-ja/language-snippets.ent:1.110 phpdoc-ja/language-snippets.ent:1.111 --- phpdoc-ja/language-snippets.ent:1.110 Sat Nov 29 09:29:04 2008 +++ phpdoc-ja/language-snippets.ent Tue Dec 23 16:27:24 2008 @@ -1,5 +1,5 @@ -<!-- $Revision: 1.110 $ --> -<!-- EN-Revision: 1.233 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.111 $ --> +<!-- EN-Revision: 1.234 Maintainer: hirokawa Status: ready --> <!-- Credits: haruki,shimooka,takagi --> <!-- Notes --> @@ -132,10 +132,15 @@ のリリースにおいて変更される可能性があります。 このモジュールは自己責任で使用してください。</simpara></warning>'> -<!ENTITY warn.deprecated.removed-6-0-0 '<warning xmlns="http://docbook.org/ns/docbook"><simpara> -この機能は <emphasis>非推奨</emphasis> であり、PHP 6.0.0 で -<emphasis>削除</emphasis> されます。この機能を使用しないことを強く推奨します。 -</simpara></warning>'> +<!ENTITY warn.deprecated.feature-5-3-0.removed-6-0-0 '<warning +xmlns="http://docbook.org/ns/docbook"><simpara>この機能は PHP 5.3.0 で +<emphasis>非推奨</emphasis>となり、PHP 6.0.0 で<emphasis>削除</emphasis>されます。 +この機能を使用しないことを強く推奨します。</simpara></warning>'> + +<!ENTITY warn.deprecated.function-5-3-0.removed-6-0-0 '<warning +xmlns="http://docbook.org/ns/docbook"><simpara>この関数は PHP 5.3.0 で +<emphasis>非推奨</emphasis>となり、PHP 6.0.0 で<emphasis>削除</emphasis>されます。 +この機能を使用しないことを強く推奨します。</simpara></warning>'> <!ENTITY warn.deprecated.function.removed-5-3-0 '<warning xmlns="http://docbook.org/ns/docbook"><simpara> この関数は <emphasis>非推奨</emphasis> であり、PHP 5.3.0 で <emphasis>削除</emphasis> されます。</simpara></warning>'>