cvs: phpdoc /en/reference/array/functions array-map.xml array-walk-recursive.xml range.xml /en/reference/calendar/functions cal-info.xml
jddayofweek.xml /en/reference/com/functions com-load-typelib.xml com-print-typeinfo.xml /en/reference/curl/functions curl-version.xml
/en/reference/dba/functions dba-handlers.xml /en/reference/dio/functions dio-seek.xml /en/reference/exec/functions proc-open.xml
/en/reference/fdf/functions fdf-get-flags.xml /en/reference/filesystem/functions fgetcsv.xml pathinfo.xml /en/reference/ftp/functions
ftp-rawlist.xml /en/reference/http/functions setcookie.xml setrawcookie.xml /en/reference/ibase/functions ibase-blob-echo.xml ibase-blob-import.xml
ibase-blob-info.xml ibase-blob-open.xml ibase-execute.xml /en/reference/iconv/functions iconv-strpos.xml /en/reference/ldap/functions
ldap-set-rebind-proc.xml /en/reference/mailparse/functions mailparse-msg-extract-part-file.xml mailparse-msg-extract-part.xml
/en/reference/mbstring/functions mb-convert-kana.xml /en/reference/mcrypt/functions mcrypt-create-iv.xml /en/reference/mysqli/functions
mysqli-embedded-connect.xml mysqli-server-init.xml /en/reference/openssl/functions openssl-pkcs7-encrypt.xml openssl-sign.xml
openssl-x509-checkpurpose.xml /en/reference/outcontrol/functions ob-gzhandler.xml /en/reference/pcntl/functions pcntl-getpriority.xml
pcntl-setpriority.xml pcntl-waitpid.xml /en/reference/pdf/functions pdf-open-image-file.xml pdf-open-image.xml /en/reference/sem/functions
sem-get.xml /en/reference/simplexml/functions simplexml-import-dom.xml simplexml-load-file.xml simplexml-load-string.xml
/en/reference/sqlite/functions sqlite-create-aggregate.xml sqlite-create-function.xml sqlite-fetch-single.xml /en/reference/stream/functions
stream-context-create.xml stream-socket-accept.xml /en/reference/strings/functions get-html-translation-table.xml metaphone.xml wordwrap.xml
/en/reference/url/functions get-headers.xml get-meta-tags.xml /en/reference/xsl/functions xsl-xsltprocessor-transform-to-uri.xml
xsl-xsltprocessor-transform-to-xml.xml /en/reference/yaz/functions yaz-wait.xml

From:	Jakub Vrana	Date:	Thu, 12 Aug 2004 18:12:01 +0000
Subject:	cvs: phpdoc /en/reference/array/functions array-map.xml array-walk-recursive.xml range.xml /en/reference/calendar/functions cal-info.xml jddayofweek.xml /en/reference/com/functions com-load-typelib.xml com-print-typeinfo.xml /en/reference/curl/functions curl-version.xml /en/reference/dba/functions dba-handlers.xml /en/reference/dio/functions dio-seek.xml /en/reference/exec/functions proc-open.xml /en/reference/fdf/functions fdf-get-flags.xml /en/reference/filesystem/functions fgetcsv.xml pathinfo.xml /en/reference/ftp/functions ftp-rawlist.xml /en/reference/http/functions setcookie.xml setrawcookie.xml /en/reference/ibase/functions ibase-blob-echo.xml ibase-blob-import.xml ibase-blob-info.xml ibase-blob-open.xml ibase-execute.xml /en/reference/iconv/functions iconv-strpos.xml /en/reference/ldap/functions ldap-set-rebind-proc.xml /en/reference/mailparse/functions mailparse-msg-extract-part-file.xml mailparse-msg-extract-part.xml /en/reference/mbstring/functions mb-convert-kana.xml /en/reference/mcrypt/functions mcrypt-create-iv.xml /en/reference/mysqli/functions mysqli-embedded-connect.xml mysqli-server-init.xml /en/reference/openssl/functions openssl-pkcs7-encrypt.xml openssl-sign.xml openssl-x509-checkpurpose.xml /en/reference/outcontrol/functions ob-gzhandler.xml /en/reference/pcntl/functions pcntl-getpriority.xml pcntl-setpriority.xml pcntl-waitpid.xml /en/reference/pdf/functions pdf-open-image-file.xml pdf-open-image.xml /en/reference/sem/functions sem-get.xml /en/reference/simplexml/functions simplexml-import-dom.xml simplexml-load-file.xml simplexml-load-string.xml /en/reference/sqlite/functions sqlite-create-aggregate.xml sqlite-create-function.xml sqlite-fetch-single.xml /en/reference/stream/functions stream-context-create.xml stream-socket-accept.xml /en/reference/strings/functions get-html-translation-table.xml metaphone.xml wordwrap.xml /en/reference/url/functions get-headers.xml get-meta-tags.xml /en/reference/xsl/functions xsl-xsltprocessor-transform-to-uri.xml xsl-xsltprocessor-transform-to-xml.xml /en/reference/yaz/functions yaz-wait.xml
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969363082@lists.php.net to get a copy of this message

vrana Thu Aug 12 14:12:01 2004 EDT Modified files: /phpdoc/en/reference/array/functions array-map.xml array-walk-recursive.xml range.xml /phpdoc/en/reference/calendar/functions cal-info.xml jddayofweek.xml /phpdoc/en/reference/com/functions com-load-typelib.xml com-print-typeinfo.xml /phpdoc/en/reference/curl/functions curl-version.xml /phpdoc/en/reference/dba/functions dba-handlers.xml /phpdoc/en/reference/dio/functions dio-seek.xml /phpdoc/en/reference/exec/functions proc-open.xml /phpdoc/en/reference/fdf/functions fdf-get-flags.xml /phpdoc/en/reference/filesystem/functions fgetcsv.xml pathinfo.xml /phpdoc/en/reference/ftp/functions ftp-rawlist.xml /phpdoc/en/reference/http/functions setcookie.xml setrawcookie.xml /phpdoc/en/reference/ibase/functions ibase-blob-echo.xml ibase-blob-import.xml ibase-blob-info.xml ibase-blob-open.xml ibase-execute.xml /phpdoc/en/reference/iconv/functions iconv-strpos.xml /phpdoc/en/reference/ldap/functions ldap-set-rebind-proc.xml /phpdoc/en/reference/mailparse/functions mailparse-msg-extract-part-file.xml mailparse-msg-extract-part.xml /phpdoc/en/reference/mbstring/functions mb-convert-kana.xml /phpdoc/en/reference/mcrypt/functions mcrypt-create-iv.xml /phpdoc/en/reference/mysqli/functions mysqli-embedded-connect.xml mysqli-server-init.xml /phpdoc/en/reference/openssl/functions openssl-pkcs7-encrypt.xml openssl-sign.xml openssl-x509-checkpurpose.xml /phpdoc/en/reference/outcontrol/functions ob-gzhandler.xml /phpdoc/en/reference/pcntl/functions pcntl-getpriority.xml pcntl-setpriority.xml pcntl-waitpid.xml /phpdoc/en/reference/pdf/functions pdf-open-image-file.xml pdf-open-image.xml /phpdoc/en/reference/sem/functions sem-get.xml /phpdoc/en/reference/simplexml/functions simplexml-import-dom.xml simplexml-load-file.xml simplexml-load-string.xml /phpdoc/en/reference/sqlite/functions sqlite-create-aggregate.xml sqlite-create-function.xml sqlite-fetch-single.xml /phpdoc/en/reference/stream/functions stream-context-create.xml stream-socket-accept.xml /phpdoc/en/reference/strings/functions get-html-translation-table.xml metaphone.xml wordwrap.xml /phpdoc/en/reference/url/functions get-headers.xml get-meta-tags.xml /phpdoc/en/reference/xsl/functions xsl-xsltprocessor-transform-to-uri.xml xsl-xsltprocessor-transform-to-xml.xml /phpdoc/en/reference/yaz/functions yaz-wait.xml Log: Fix protos from sources

http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-map.xml?r1=1.11&r2=1.12&ty=u Index: phpdoc/en/reference/array/functions/array-map.xml diff -u phpdoc/en/reference/array/functions/array-map.xml:1.11 phpdoc/en/reference/array/functions/array-map.xml:1.12 --- phpdoc/en/reference/array/functions/array-map.xml:1.11 Thu Jan 15 07:42:01 2004 +++ phpdoc/en/reference/array/functions/array-map.xml Thu Aug 12 14:11:56 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.array-map"> <refnamediv> @@ -12,7 +12,7 @@ <title>Description</title> <methodsynopsis> <type>array</type><methodname>array_map</methodname> - <methodparam><type>mixed</type><parameter>callback</parameter></methodparam> + <methodparam><type>callback</type><parameter>callback</parameter></methodparam> <methodparam><type>array</type><parameter>arr1</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam> </methodsynopsis> http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-walk-recursive.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/array/functions/array-walk-recursive.xml diff -u phpdoc/en/reference/array/functions/array-walk-recursive.xml:1.4 phpdoc/en/reference/array/functions/array-walk-recursive.xml:1.5 --- phpdoc/en/reference/array/functions/array-walk-recursive.xml:1.4 Tue Aug 3 06:24:05 2004 +++ phpdoc/en/reference/array/functions/array-walk-recursive.xml Thu Aug 12 14:11:56 2004 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> - + <refentry id="function.array-walk-recursive"> <refnamediv> <refname>array_walk_recursive</refname> @@ -12,7 +12,7 @@ <methodsynopsis> <type>bool</type><methodname>array_walk_recursive</methodname> <methodparam><type>array</type><parameter>&input</parameter></methodparam> - <methodparam><type>string</type><parameter>funcname</parameter></methodparam> + <methodparam><type>callback</type><parameter>funcname</parameter></methodparam> <methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter></methodparam> </methodsynopsis> <simpara> http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/range.xml?r1=1.14&r2=1.15&ty=u Index: phpdoc/en/reference/array/functions/range.xml diff -u phpdoc/en/reference/array/functions/range.xml:1.14 phpdoc/en/reference/array/functions/range.xml:1.15 --- phpdoc/en/reference/array/functions/range.xml:1.14 Fri Mar 5 21:40:19 2004 +++ phpdoc/en/reference/array/functions/range.xml Thu Aug 12 14:11:56 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.range"> <refnamediv> @@ -12,9 +12,9 @@ <title>Description</title> <methodsynopsis> <type>array</type><methodname>range</methodname> - <methodparam><type>int</type><parameter>low</parameter></methodparam> - <methodparam><type>int</type><parameter>high</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>step</parameter></methodparam> + <methodparam><type>number</type><parameter>low</parameter></methodparam> + <methodparam><type>number</type><parameter>high</parameter></methodparam> + <methodparam choice="opt"><type>number</type><parameter>step</parameter></methodparam> </methodsynopsis> <para> <function>range</function> returns an array of elements from http://cvs.php.net/diff.php/phpdoc/en/reference/calendar/functions/cal-info.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/calendar/functions/cal-info.xml diff -u phpdoc/en/reference/calendar/functions/cal-info.xml:1.8 phpdoc/en/reference/calendar/functions/cal-info.xml:1.9 --- phpdoc/en/reference/calendar/functions/cal-info.xml:1.8 Mon Oct 6 23:49:00 2003 +++ phpdoc/en/reference/calendar/functions/cal-info.xml Thu Aug 12 14:11:56 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.cal-info'> <refnamediv> @@ -10,12 +10,11 @@ <title>Description</title> <methodsynopsis> <type>array</type><methodname>cal_info</methodname> - <methodparam choice='opt'><type>int</type><parameter>calendar</parameter></methodparam> + <methodparam><type>int</type><parameter>calendar</parameter></methodparam> </methodsynopsis> <para> <function>cal_info</function> returns information on the - specified <parameter>calendar</parameter> or on all supported - calendars if no <parameter>calendar</parameter> is specified. + specified <parameter>calendar</parameter>. </para> <para> Calendar information is returned as an array containing the http://cvs.php.net/diff.php/phpdoc/en/reference/calendar/functions/jddayofweek.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/calendar/functions/jddayofweek.xml diff -u phpdoc/en/reference/calendar/functions/jddayofweek.xml:1.5 phpdoc/en/reference/calendar/functions/jddayofweek.xml:1.6 --- phpdoc/en/reference/calendar/functions/jddayofweek.xml:1.5 Mon Dec 15 13:41:57 2003 +++ phpdoc/en/reference/calendar/functions/jddayofweek.xml Thu Aug 12 14:11:56 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.jddayofweek"> <refnamediv> @@ -11,7 +11,7 @@ <methodsynopsis> <type>mixed</type><methodname>jddayofweek</methodname> <methodparam><type>int</type><parameter>julianday</parameter></methodparam> - <methodparam><type>int</type><parameter>mode</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam> </methodsynopsis> <para> Returns the day of the week. Can return a string or an integer @@ -27,7 +27,7 @@ </thead> <tbody> <row> - <entry>0</entry> + <entry>0 (Default)</entry> <entry> Returns the day number as an int (0=Sunday, 1=Monday, etc) </entry> http://cvs.php.net/diff.php/phpdoc/en/reference/com/functions/com-load-typelib.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/com/functions/com-load-typelib.xml diff -u phpdoc/en/reference/com/functions/com-load-typelib.xml:1.3 phpdoc/en/reference/com/functions/com-load-typelib.xml:1.4 --- phpdoc/en/reference/com/functions/com-load-typelib.xml:1.3 Mon May 3 10:55:01 2004 +++ phpdoc/en/reference/com/functions/com-load-typelib.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.com-load-typelib'> <refnamediv> @@ -11,7 +11,7 @@ <methodsynopsis> <type>bool</type><methodname>com_load_typelib</methodname> <methodparam><type>string</type><parameter>typelib_name</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>case_insensitive</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>case_insensitive</parameter></methodparam> </methodsynopsis> <para> Loads a type-library and registers its constants in the engine, as though http://cvs.php.net/diff.php/phpdoc/en/reference/com/functions/com-print-typeinfo.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/com/functions/com-print-typeinfo.xml diff -u phpdoc/en/reference/com/functions/com-print-typeinfo.xml:1.1 phpdoc/en/reference/com/functions/com-print-typeinfo.xml:1.2 --- phpdoc/en/reference/com/functions/com-print-typeinfo.xml:1.1 Mon May 3 10:55:01 2004 +++ phpdoc/en/reference/com/functions/com-print-typeinfo.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> - +  <refentry id="function.com-print-typeinfo"> <refnamediv> @@ -14,8 +14,8 @@ <methodsynopsis> <type>bool</type><methodname>com_print_typeinfo</methodname> <methodparam><type>object</type><parameter>comobject</parameter></methodparam> - <methodparam><type>string</type><parameter>dispinterface</parameter></methodparam> - <methodparam><type>bool</type><parameter>wantsink</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>dispinterface</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>wantsink</parameter></methodparam> </methodsynopsis> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/curl/functions/curl-version.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/curl/functions/curl-version.xml diff -u phpdoc/en/reference/curl/functions/curl-version.xml:1.2 phpdoc/en/reference/curl/functions/curl-version.xml:1.3 --- phpdoc/en/reference/curl/functions/curl-version.xml:1.2 Wed Apr 17 02:37:05 2002 +++ phpdoc/en/reference/curl/functions/curl-version.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.curl-version"> <refnamediv> @@ -10,7 +10,7 @@ <title>Description</title> <methodsynopsis> <type>string</type><methodname>curl_version</methodname> - <void/> + <methodparam choice="opt"><type>int</type><parameter>version</parameter></methodparam> </methodsynopsis> <para> The <function>curl_version</function> function returns a string http://cvs.php.net/diff.php/phpdoc/en/reference/dba/functions/dba-handlers.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/dba/functions/dba-handlers.xml diff -u phpdoc/en/reference/dba/functions/dba-handlers.xml:1.4 phpdoc/en/reference/dba/functions/dba-handlers.xml:1.5 --- phpdoc/en/reference/dba/functions/dba-handlers.xml:1.4 Mon May 10 11:00:23 2004 +++ phpdoc/en/reference/dba/functions/dba-handlers.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.dba-handlers"> <refnamediv> @@ -10,7 +10,7 @@ <title>Description</title> <methodsynopsis> <type>array</type><methodname>dba_handlers</methodname> - <void/> + <methodparam choice="opt"><type>bool</type><parameter>full_info</parameter></methodparam> </methodsynopsis> <para> <function>dba_handlers</function> returns an array with all handlers http://cvs.php.net/diff.php/phpdoc/en/reference/dio/functions/dio-seek.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/dio/functions/dio-seek.xml diff -u phpdoc/en/reference/dio/functions/dio-seek.xml:1.3 phpdoc/en/reference/dio/functions/dio-seek.xml:1.4 --- phpdoc/en/reference/dio/functions/dio-seek.xml:1.3 Sun Jun 29 12:59:53 2003 +++ phpdoc/en/reference/dio/functions/dio-seek.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.dio-seek"> <refnamediv> @@ -12,7 +12,7 @@ <type>int</type><methodname>dio_seek</methodname> <methodparam><type>resource</type><parameter>fd</parameter></methodparam> <methodparam><type>int</type><parameter>pos</parameter></methodparam> - <methodparam><type>int</type><parameter>whence</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>whence</parameter></methodparam> </methodsynopsis> <para> The function <function>dio_seek</function> is used to change the @@ -23,7 +23,7 @@ <itemizedlist> <listitem> <para> - SEEK_SET - specifies that <parameter>pos</parameter> is + SEEK_SET (default) - specifies that <parameter>pos</parameter> is specified from the beginning of the file. </para> </listitem> http://cvs.php.net/diff.php/phpdoc/en/reference/exec/functions/proc-open.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/exec/functions/proc-open.xml diff -u phpdoc/en/reference/exec/functions/proc-open.xml:1.10 phpdoc/en/reference/exec/functions/proc-open.xml:1.11 --- phpdoc/en/reference/exec/functions/proc-open.xml:1.10 Tue Aug 3 11:51:09 2004 +++ phpdoc/en/reference/exec/functions/proc-open.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.proc-open'> <refnamediv> @@ -15,6 +15,9 @@ <methodparam><type>string</type><parameter>cmd</parameter></methodparam> <methodparam><type>array</type><parameter>descriptorspec</parameter></methodparam> <methodparam><type>array</type><parameter>&pipes</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>cwd</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>env</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>other_options</parameter></methodparam> </methodsynopsis> <para> <function>proc_open</function> is similar to <function>popen</function> @@ -29,6 +32,7 @@ free it using <function>proc_close</function> when you are finished with it. </para> +  <para> <informalexample> <programlisting role="php"> http://cvs.php.net/diff.php/phpdoc/en/reference/fdf/functions/fdf-get-flags.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/fdf/functions/fdf-get-flags.xml diff -u phpdoc/en/reference/fdf/functions/fdf-get-flags.xml:1.1 phpdoc/en/reference/fdf/functions/fdf-get-flags.xml:1.2 --- phpdoc/en/reference/fdf/functions/fdf-get-flags.xml:1.1 Wed Mar 19 12:06:49 2003 +++ phpdoc/en/reference/fdf/functions/fdf-get-flags.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.fdf-get-flags"> <refnamediv> <refname>fdf_get_flags</refname> @@ -9,7 +9,9 @@ <title>Description</title> <methodsynopsis> <type></type><methodname>fdf_get_flags</methodname> - <void/> + <methodparam><type>resource</type><parameter>fdfdoc</parameter></methodparam> + <methodparam><type>string</type><parameter>fieldname</parameter></methodparam> + <methodparam><type>int</type><parameter>whichflags</parameter></methodparam> </methodsynopsis> <para> &warn.undocumented.func; http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fgetcsv.xml?r1=1.12&r2=1.13&ty=u Index: phpdoc/en/reference/filesystem/functions/fgetcsv.xml diff -u phpdoc/en/reference/filesystem/functions/fgetcsv.xml:1.12 phpdoc/en/reference/filesystem/functions/fgetcsv.xml:1.13 --- phpdoc/en/reference/filesystem/functions/fgetcsv.xml:1.12 Fri Jul 30 10:03:28 2004 +++ phpdoc/en/reference/filesystem/functions/fgetcsv.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.fgetcsv"> <refnamediv> @@ -11,7 +11,7 @@ <methodsynopsis> <type>array</type><methodname>fgetcsv</methodname> <methodparam><type>resource</type><parameter>handle</parameter></methodparam> - <methodparam><type>int</type><parameter>length</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>enclosure</parameter></methodparam> </methodsynopsis> @@ -38,6 +38,7 @@ <simpara> The <parameter>length</parameter> parameter must be greater than the longest line to be found in the CSV file (allowing for trailing line-end characters). + It became optional in PHP 5. </simpara> <simpara> <function>fgetcsv</function> returns &false; on error, including http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/pathinfo.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/filesystem/functions/pathinfo.xml diff -u phpdoc/en/reference/filesystem/functions/pathinfo.xml:1.5 phpdoc/en/reference/filesystem/functions/pathinfo.xml:1.6 --- phpdoc/en/reference/filesystem/functions/pathinfo.xml:1.5 Tue May 18 10:23:19 2004 +++ phpdoc/en/reference/filesystem/functions/pathinfo.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.pathinfo"> <refnamediv> @@ -11,6 +11,7 @@ <methodsynopsis> <type>array</type><methodname>pathinfo</methodname> <methodparam><type>string</type><parameter>path</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam> </methodsynopsis> <para> <function>pathinfo</function> returns an associative array @@ -18,6 +19,14 @@ following array elements are returned: <literal>dirname</literal>, <literal>basename</literal> and <literal>extension</literal>. + </para> + <para> + You can specify which elements are returned with optional parameter + <parameter>options</parameter>. It composes from + <constant>PHP_PATHINFO_DIRNAME</constant>, + <constant>PHP_PATHINFO_BASENAME</constant> and + <constant>PHP_PATHINFO_EXTENSION</constant>. It defaults to return all + elements. </para> <para> <example> http://cvs.php.net/diff.php/phpdoc/en/reference/ftp/functions/ftp-rawlist.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/ftp/functions/ftp-rawlist.xml diff -u phpdoc/en/reference/ftp/functions/ftp-rawlist.xml:1.4 phpdoc/en/reference/ftp/functions/ftp-rawlist.xml:1.5 --- phpdoc/en/reference/ftp/functions/ftp-rawlist.xml:1.4 Fri Dec 19 09:40:54 2003 +++ phpdoc/en/reference/ftp/functions/ftp-rawlist.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.ftp-rawlist"> <refnamediv> @@ -12,6 +12,7 @@ <type>array</type><methodname>ftp_rawlist</methodname> <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam> <methodparam><type>string</type><parameter>directory</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter></methodparam> </methodsynopsis> <para> <function>ftp_rawlist</function> executes the FTP LIST command, @@ -19,6 +20,10 @@ to one line of text. The output is not parsed in any way. The system type identifier returned by <function>ftp_systype</function> can be used to determine how the results should be interpreted. + </para> + <para> + Optional parameter <parameter>recursive</parameter> is available since PHP + 4.3.0. </para> <para> <example> http://cvs.php.net/diff.php/phpdoc/en/reference/http/functions/setcookie.xml?r1=1.30&r2=1.31&ty=u Index: phpdoc/en/reference/http/functions/setcookie.xml diff -u phpdoc/en/reference/http/functions/setcookie.xml:1.30 phpdoc/en/reference/http/functions/setcookie.xml:1.31 --- phpdoc/en/reference/http/functions/setcookie.xml:1.30 Mon Jul 26 17:31:36 2004 +++ phpdoc/en/reference/http/functions/setcookie.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.setcookie"> <refnamediv> @@ -15,7 +15,7 @@ <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>path</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>domain</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>secure</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>secure</parameter></methodparam> </methodsynopsis> <para> <function>setcookie</function> defines a cookie to be sent along @@ -44,8 +44,8 @@ All the arguments except the <parameter>name</parameter> argument are optional. You may also replace an argument with an empty string (<emphasis>""</emphasis>) in order to skip that - argument. Because the <parameter>expire</parameter> and - <parameter>secure</parameter> arguments are integers, they cannot + argument. Because the <parameter>expire</parameter> + argument is integer, it cannot be skipped with an empty string, use a zero (<emphasis>0</emphasis>) instead. The following table explains each parameter of the <function>setcookie</function> function, be sure to read the @@ -135,9 +135,9 @@ <entry><parameter>secure</parameter></entry> <entry> Indicates that the cookie should only be transmitted over a - secure HTTPS connection. When set to <literal>1</literal>, the + secure HTTPS connection. When set to &true;, the cookie will only be set if a secure connection exists. The default - is <literal>0</literal>. + is &false;. </entry> <entry> <literal>0</literal> or <literal>1</literal> http://cvs.php.net/diff.php/phpdoc/en/reference/http/functions/setrawcookie.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/http/functions/setrawcookie.xml diff -u phpdoc/en/reference/http/functions/setrawcookie.xml:1.2 phpdoc/en/reference/http/functions/setrawcookie.xml:1.3 --- phpdoc/en/reference/http/functions/setrawcookie.xml:1.2 Sun Jul 11 11:41:38 2004 +++ phpdoc/en/reference/http/functions/setrawcookie.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.setrawcookie"> <refnamediv> @@ -15,7 +15,7 @@ <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>path</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>domain</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>secure</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>secure</parameter></methodparam> </methodsynopsis> <para> <function>setrawcookie</function> is exactly the same as http://cvs.php.net/diff.php/phpdoc/en/reference/ibase/functions/ibase-blob-echo.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/ibase/functions/ibase-blob-echo.xml diff -u phpdoc/en/reference/ibase/functions/ibase-blob-echo.xml:1.4 phpdoc/en/reference/ibase/functions/ibase-blob-echo.xml:1.5 --- phpdoc/en/reference/ibase/functions/ibase-blob-echo.xml:1.4 Mon Sep 1 19:49:57 2003 +++ phpdoc/en/reference/ibase/functions/ibase-blob-echo.xml Thu Aug 12 14:11:57 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.ibase-blob-echo'> <refnamediv> @@ -10,6 +10,11 @@ </refnamediv> <refsect1> <title>Description</title> + <methodsynopsis> + <type>bool</type><methodname>ibase_blob_echo</methodname> + <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam> + <methodparam><type>string</type><parameter>blob_id</parameter></methodparam> + </methodsynopsis> <methodsynopsis> <type>bool</type><methodname>ibase_blob_echo</methodname> <methodparam><type>string</type><parameter>blob_id</parameter></methodparam> http://cvs.php.net/diff.php/phpdoc/en/reference/ibase/functions/ibase-blob-import.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/ibase/functions/ibase-blob-import.xml diff -u phpdoc/en/reference/ibase/functions/ibase-blob-import.xml:1.4 phpdoc/en/reference/ibase/functions/ibase-blob-import.xml:1.5 --- phpdoc/en/reference/ibase/functions/ibase-blob-import.xml:1.4 Mon Sep 1 19:49:57 2003 +++ phpdoc/en/reference/ibase/functions/ibase-blob-import.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.ibase-blob-import'> <refnamediv> @@ -12,7 +12,11 @@ <title>Description</title> <methodsynopsis> <type>string</type><methodname>ibase_blob_import</methodname> - <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam> + <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam> + <methodparam><type>resource</type><parameter>file_handle</parameter></methodparam> + </methodsynopsis> + <methodsynopsis> + <type>string</type><methodname>ibase_blob_import</methodname> <methodparam><type>resource</type><parameter>file_handle</parameter></methodparam> </methodsynopsis> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/ibase/functions/ibase-blob-info.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/ibase/functions/ibase-blob-info.xml diff -u phpdoc/en/reference/ibase/functions/ibase-blob-info.xml:1.3 phpdoc/en/reference/ibase/functions/ibase-blob-info.xml:1.4 --- phpdoc/en/reference/ibase/functions/ibase-blob-info.xml:1.3 Mon Sep 1 19:49:57 2003 +++ phpdoc/en/reference/ibase/functions/ibase-blob-info.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.ibase-blob-info'> <refnamediv> @@ -10,6 +10,11 @@ </refnamediv> <refsect1> <title>Description</title> + <methodsynopsis> + <type>array</type><methodname>ibase_blob_info</methodname> + <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam> + <methodparam><type>string</type><parameter>blob_id</parameter></methodparam> + </methodsynopsis> <methodsynopsis> <type>array</type><methodname>ibase_blob_info</methodname> <methodparam><type>string</type><parameter>blob_id</parameter></methodparam> http://cvs.php.net/diff.php/phpdoc/en/reference/ibase/functions/ibase-blob-open.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/ibase/functions/ibase-blob-open.xml diff -u phpdoc/en/reference/ibase/functions/ibase-blob-open.xml:1.3 phpdoc/en/reference/ibase/functions/ibase-blob-open.xml:1.4 --- phpdoc/en/reference/ibase/functions/ibase-blob-open.xml:1.3 Mon Sep 1 19:49:57 2003 +++ phpdoc/en/reference/ibase/functions/ibase-blob-open.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.ibase-blob-open'> <refnamediv> @@ -10,6 +10,11 @@ </refnamediv> <refsect1> <title>Description</title> + <methodsynopsis> + <type>resource</type><methodname>ibase_blob_open</methodname> + <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam> + <methodparam><type>string</type><parameter>blob_id</parameter></methodparam> + </methodsynopsis> <methodsynopsis> <type>resource</type><methodname>ibase_blob_open</methodname> <methodparam><type>string</type><parameter>blob_id</parameter></methodparam> http://cvs.php.net/diff.php/phpdoc/en/reference/ibase/functions/ibase-execute.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/ibase/functions/ibase-execute.xml diff -u phpdoc/en/reference/ibase/functions/ibase-execute.xml:1.6 phpdoc/en/reference/ibase/functions/ibase-execute.xml:1.7 --- phpdoc/en/reference/ibase/functions/ibase-execute.xml:1.6 Wed Dec 17 09:32:24 2003 +++ phpdoc/en/reference/ibase/functions/ibase-execute.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.ibase-execute"> <refnamediv> @@ -11,7 +11,6 @@ <methodsynopsis> <type>resource</type><methodname>ibase_execute</methodname> <methodparam><type>resource</type><parameter>query</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>bind_args</parameter></methodparam> </methodsynopsis> <para> Execute a query prepared by <function>ibase_prepare</function>. If http://cvs.php.net/diff.php/phpdoc/en/reference/iconv/functions/iconv-strpos.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/iconv/functions/iconv-strpos.xml diff -u phpdoc/en/reference/iconv/functions/iconv-strpos.xml:1.5 phpdoc/en/reference/iconv/functions/iconv-strpos.xml:1.6 --- phpdoc/en/reference/iconv/functions/iconv-strpos.xml:1.5 Tue Dec 23 07:21:27 2003 +++ phpdoc/en/reference/iconv/functions/iconv-strpos.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> - +  <refentry id="function.iconv-strpos"> <refnamediv> @@ -14,7 +14,7 @@ <type>int</type><methodname>iconv_strpos</methodname> <methodparam><type>string</type><parameter>haystack</parameter></methodparam> <methodparam><type>string</type><parameter>needle</parameter></methodparam> - <methodparam><type>int</type><parameter>offset</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam> </methodsynopsis> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/ldap/functions/ldap-set-rebind-proc.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/ldap/functions/ldap-set-rebind-proc.xml diff -u phpdoc/en/reference/ldap/functions/ldap-set-rebind-proc.xml:1.2 phpdoc/en/reference/ldap/functions/ldap-set-rebind-proc.xml:1.3 --- phpdoc/en/reference/ldap/functions/ldap-set-rebind-proc.xml:1.2 Wed Apr 17 02:39:46 2002 +++ phpdoc/en/reference/ldap/functions/ldap-set-rebind-proc.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id='function.ldap-set-rebind-proc'> <refnamediv> @@ -13,7 +13,7 @@ <methodsynopsis> <type>bool</type><methodname>ldap_set_rebind_proc</methodname> <methodparam><type>resource</type><parameter>link</parameter></methodparam> - <methodparam><type>string</type><parameter>callback</parameter></methodparam> + <methodparam><type>callback</type><parameter>callback</parameter></methodparam> </methodsynopsis> <para> &warn.undocumented.func; http://cvs.php.net/diff.php/phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part-file.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part-file.xml diff -u phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part-file.xml:1.2 phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part-file.xml:1.3 --- phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part-file.xml:1.2 Wed Apr 17 02:39:48 2002 +++ phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part-file.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.mailparse-msg-extract-part-file"> <refnamediv> @@ -12,7 +12,7 @@ <type>string</type><methodname>mailparse_msg_extract_part_file</methodname> <methodparam><type>resource</type><parameter>rfc2045</parameter></methodparam> <methodparam><type>string</type><parameter>filename</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>callbackfunc</parameter></methodparam> + <methodparam choice="opt"><type>callback</type><parameter>callbackfunc</parameter></methodparam> </methodsynopsis> &warn.experimental.func; <para> http://cvs.php.net/diff.php/phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part.xml diff -u phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part.xml:1.2 phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part.xml:1.3 --- phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part.xml:1.2 Wed Apr 17 02:39:48 2002 +++ phpdoc/en/reference/mailparse/functions/mailparse-msg-extract-part.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.mailparse-msg-extract-part"> <refnamediv> @@ -15,7 +15,7 @@ <type>void</type><methodname>mailparse_msg_extract_part</methodname> <methodparam><type>resource</type><parameter>rfc2045</parameter></methodparam> <methodparam><type>string</type><parameter>msgbody</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>callbackfunc</parameter></methodparam> + <methodparam choice="opt"><type>callback</type><parameter>callbackfunc</parameter></methodparam> </methodsynopsis> &warn.experimental.func; <para> http://cvs.php.net/diff.php/phpdoc/en/reference/mbstring/functions/mb-convert-kana.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/mbstring/functions/mb-convert-kana.xml diff -u phpdoc/en/reference/mbstring/functions/mb-convert-kana.xml:1.8 phpdoc/en/reference/mbstring/functions/mb-convert-kana.xml:1.9 --- phpdoc/en/reference/mbstring/functions/mb-convert-kana.xml:1.8 Tue Aug 3 13:25:32 2004 +++ phpdoc/en/reference/mbstring/functions/mb-convert-kana.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.mb-convert-kana"> <refnamediv> @@ -13,8 +13,8 @@ <methodsynopsis> <type>string</type><methodname>mb_convert_kana</methodname> <methodparam><type>string</type><parameter>str</parameter></methodparam> - <methodparam><type>string</type><parameter>option</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>encoding</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>option</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam> </methodsynopsis> <para> <function>mb_convert_kana</function> performs "han-kaku" - http://cvs.php.net/diff.php/phpdoc/en/reference/mcrypt/functions/mcrypt-create-iv.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/mcrypt/functions/mcrypt-create-iv.xml diff -u phpdoc/en/reference/mcrypt/functions/mcrypt-create-iv.xml:1.7 phpdoc/en/reference/mcrypt/functions/mcrypt-create-iv.xml:1.8 --- phpdoc/en/reference/mcrypt/functions/mcrypt-create-iv.xml:1.7 Thu Aug 5 04:54:11 2004 +++ phpdoc/en/reference/mcrypt/functions/mcrypt-create-iv.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.mcrypt-create-iv"> <refnamediv> @@ -13,15 +13,16 @@ <methodsynopsis> <type>string</type><methodname>mcrypt_create_iv</methodname> <methodparam><type>int</type><parameter>size</parameter></methodparam> - <methodparam><type>int</type><parameter>source</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>source</parameter></methodparam> </methodsynopsis> <para> <function>mcrypt_create_iv</function> is used to create an IV. </para> <para> - <function>mcrypt_create_iv</function> takes two arguments, + Parameter <parameter>size</parameter> determines the size of the IV, - <parameter>source</parameter> specifies the source of the IV. + parameter <parameter>source</parameter> (defaults to random value) + specifies the source of the IV. </para> <para> The source can be <constant>MCRYPT_RAND</constant> (system random http://cvs.php.net/diff.php/phpdoc/en/reference/mysqli/functions/mysqli-embedded-connect.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/mysqli/functions/mysqli-embedded-connect.xml diff -u phpdoc/en/reference/mysqli/functions/mysqli-embedded-connect.xml:1.6 phpdoc/en/reference/mysqli/functions/mysqli-embedded-connect.xml:1.7 --- phpdoc/en/reference/mysqli/functions/mysqli-embedded-connect.xml:1.6 Tue Jul 27 00:48:55 2004 +++ phpdoc/en/reference/mysqli/functions/mysqli-embedded-connect.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.mysqli-embedded-connect"> <refnamediv> <refname>mysqli_embedded_connect</refname> @@ -9,7 +9,7 @@ <title>Description</title> <methodsynopsis> <type>object</type><methodname>mysqli_embedded_connect</methodname> - <void /> + <methodparam choice="opt"><type>string</type><parameter>dbname</parameter></methodparam> </methodsynopsis> &warn.experimental.func; http://cvs.php.net/diff.php/phpdoc/en/reference/mysqli/functions/mysqli-server-init.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/mysqli/functions/mysqli-server-init.xml diff -u phpdoc/en/reference/mysqli/functions/mysqli-server-init.xml:1.3 phpdoc/en/reference/mysqli/functions/mysqli-server-init.xml:1.4 --- phpdoc/en/reference/mysqli/functions/mysqli-server-init.xml:1.3 Tue Jul 27 00:48:55 2004 +++ phpdoc/en/reference/mysqli/functions/mysqli-server-init.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.mysqli-server-init"> <refnamediv> <refname>mysqli_server_init</refname> @@ -9,7 +9,8 @@ <title>Description</title> <methodsynopsis> <type>bool</type><methodname>mysqli_server_init</methodname> - <void/> + <methodparam choice="opt"><type>array</type><parameter>server</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>groups</parameter></methodparam> </methodsynopsis> &warn.experimental.func; http://cvs.php.net/diff.php/phpdoc/en/reference/openssl/functions/openssl-pkcs7-encrypt.xml?r1=1.9&r2=1.10&ty=u Index: phpdoc/en/reference/openssl/functions/openssl-pkcs7-encrypt.xml diff -u phpdoc/en/reference/openssl/functions/openssl-pkcs7-encrypt.xml:1.9 phpdoc/en/reference/openssl/functions/openssl-pkcs7-encrypt.xml:1.10 --- phpdoc/en/reference/openssl/functions/openssl-pkcs7-encrypt.xml:1.9 Mon Dec 15 11:52:33 2003 +++ phpdoc/en/reference/openssl/functions/openssl-pkcs7-encrypt.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.openssl-pkcs7-encrypt"> <refnamediv> @@ -15,6 +15,7 @@ <methodparam><type>mixed</type><parameter>recipcerts</parameter></methodparam> <methodparam><type>array</type><parameter>headers</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>cipherid</parameter></methodparam> </methodsynopsis> <para> <function>openssl_pkcs7_encrypt</function> takes the contents of the @@ -30,6 +31,7 @@ <parameter>headers</parameter> can be either an associative array keyed by header name, or an indexed array, where each element contains a single header line. + Cipher can be selected with <parameter>cipherid</parameter> since PHP 5. </para> <para> <example> http://cvs.php.net/diff.php/phpdoc/en/reference/openssl/functions/openssl-sign.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/openssl/functions/openssl-sign.xml diff -u phpdoc/en/reference/openssl/functions/openssl-sign.xml:1.5 phpdoc/en/reference/openssl/functions/openssl-sign.xml:1.6 --- phpdoc/en/reference/openssl/functions/openssl-sign.xml:1.5 Tue Aug 3 13:25:33 2004 +++ phpdoc/en/reference/openssl/functions/openssl-sign.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.openssl-sign"> <refnamediv> @@ -13,6 +13,7 @@ <methodparam><type>string</type><parameter>data</parameter></methodparam> <methodparam><type>string</type><parameter>&signature</parameter></methodparam> <methodparam><type>mixed</type><parameter>priv_key_id</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>signature_alg</parameter></methodparam> </methodsynopsis> &warn.experimental.func; <para> http://cvs.php.net/diff.php/phpdoc/en/reference/openssl/functions/openssl-x509-checkpurpose.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/openssl/functions/openssl-x509-checkpurpose.xml diff -u phpdoc/en/reference/openssl/functions/openssl-x509-checkpurpose.xml:1.4 phpdoc/en/reference/openssl/functions/openssl-x509-checkpurpose.xml:1.5 --- phpdoc/en/reference/openssl/functions/openssl-x509-checkpurpose.xml:1.4 Sun Jan 18 10:34:39 2004 +++ phpdoc/en/reference/openssl/functions/openssl-x509-checkpurpose.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.openssl-x509-checkpurpose"> <refnamediv> @@ -13,7 +13,7 @@ <type>bool</type><methodname>openssl_x509_checkpurpose</methodname> <methodparam><type>mixed</type><parameter>x509cert</parameter></methodparam> <methodparam><type>int</type><parameter>purpose</parameter></methodparam> - <methodparam><type>array</type><parameter>cainfo</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>cainfo</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>untrustedfile</parameter></methodparam> </methodsynopsis> <para> @@ -28,7 +28,7 @@ <para> <parameter>cainfo</parameter> should be an array of trusted CA files/dirs as described in <link linkend="openssl.cert.verification">Certificate - Verification</link>. + Verification</link>. It defaults to an empty array. </para> <para><parameter>untrustedfile</parameter>, if specified, is the name of a PEM encoded file holding certificates that can be used to http://cvs.php.net/diff.php/phpdoc/en/reference/outcontrol/functions/ob-gzhandler.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/outcontrol/functions/ob-gzhandler.xml diff -u phpdoc/en/reference/outcontrol/functions/ob-gzhandler.xml:1.7 phpdoc/en/reference/outcontrol/functions/ob-gzhandler.xml:1.8 --- phpdoc/en/reference/outcontrol/functions/ob-gzhandler.xml:1.7 Tue Aug 3 13:25:33 2004 +++ phpdoc/en/reference/outcontrol/functions/ob-gzhandler.xml Thu Aug 12 14:11:58 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.ob-gzhandler"> <refnamediv> @@ -13,7 +13,7 @@ <methodsynopsis> <type>string</type><methodname>ob_gzhandler</methodname> <methodparam><type>string</type><parameter>buffer</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam> + <methodparam><type>int</type><parameter>mode</parameter></methodparam> </methodsynopsis> <para> <function>ob_gzhandler</function> is intended to be used as a http://cvs.php.net/diff.php/phpdoc/en/reference/pcntl/functions/pcntl-getpriority.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/pcntl/functions/pcntl-getpriority.xml diff -u phpdoc/en/reference/pcntl/functions/pcntl-getpriority.xml:1.2 phpdoc/en/reference/pcntl/functions/pcntl-getpriority.xml:1.3 --- phpdoc/en/reference/pcntl/functions/pcntl-getpriority.xml:1.2 Wed Feb 25 12:36:15 2004 +++ phpdoc/en/reference/pcntl/functions/pcntl-getpriority.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id='function.pcntl-getpriority'> <refnamediv> <refname>pcntl_getpriority</refname> @@ -12,6 +12,7 @@ <methodsynopsis> <type>int</type><methodname>pcntl_getpriority</methodname> <methodparam choice="opt"><type>int</type><parameter>pid</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>process_identifier</parameter></methodparam> </methodsynopsis> <para> <function>pcntl_getpriority</function> gets the priority of @@ -24,6 +25,12 @@ <function>pcntl_getpriority</function> returns the priority of the process or &false; on error. A lower numerical value causes more favorable scheduling. + </para> + <para> + <parameter>process_identifier</parameter> is one of + <constant>PRIO_PGRP</constant>, + <constant>PRIO_USER</constant> or + <constant>PRIO_PROCESS</constant>. </para> &return.falseproblem; </refsect1> http://cvs.php.net/diff.php/phpdoc/en/reference/pcntl/functions/pcntl-setpriority.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/pcntl/functions/pcntl-setpriority.xml diff -u phpdoc/en/reference/pcntl/functions/pcntl-setpriority.xml:1.2 phpdoc/en/reference/pcntl/functions/pcntl-setpriority.xml:1.3 --- phpdoc/en/reference/pcntl/functions/pcntl-setpriority.xml:1.2 Wed Feb 25 12:36:15 2004 +++ phpdoc/en/reference/pcntl/functions/pcntl-setpriority.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id='function.pcntl-setpriority'> <refnamediv> <refname>pcntl_setpriority</refname> @@ -13,6 +13,7 @@ <type>bool</type><methodname>pcntl_setpriority</methodname> <methodparam><type>int</type><parameter>priority</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>pid</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>process_identifier</parameter></methodparam> </methodsynopsis> <para> <function>pcntl_setpriority</function> sets the priority of @@ -27,6 +28,12 @@ favorable scheduling. Because priority levels can differ between system types and kernel versions, please see your system's setpriority(2) man page for specific details. + </para> + <para> + <parameter>process_identifier</parameter> is one of + <constant>PRIO_PGRP</constant>, + <constant>PRIO_USER</constant> or + <constant>PRIO_PROCESS</constant>. </para> <para> &return.success; http://cvs.php.net/diff.php/phpdoc/en/reference/pcntl/functions/pcntl-waitpid.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/pcntl/functions/pcntl-waitpid.xml diff -u phpdoc/en/reference/pcntl/functions/pcntl-waitpid.xml:1.6 phpdoc/en/reference/pcntl/functions/pcntl-waitpid.xml:1.7 --- phpdoc/en/reference/pcntl/functions/pcntl-waitpid.xml:1.6 Wed Feb 25 11:42:00 2004 +++ phpdoc/en/reference/pcntl/functions/pcntl-waitpid.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.pcntl-waitpid"> <refnamediv> @@ -12,7 +12,7 @@ <type>int</type><methodname>pcntl_waitpid</methodname> <methodparam><type>int</type><parameter>pid</parameter></methodparam> <methodparam><type>int</type><parameter>&status</parameter></methodparam> - <methodparam><type>int</type><parameter>options</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam> </methodsynopsis> <para> The <function>pcntl_waitpid</function> function suspends execution http://cvs.php.net/diff.php/phpdoc/en/reference/pdf/functions/pdf-open-image-file.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/pdf/functions/pdf-open-image-file.xml diff -u phpdoc/en/reference/pdf/functions/pdf-open-image-file.xml:1.3 phpdoc/en/reference/pdf/functions/pdf-open-image-file.xml:1.4 --- phpdoc/en/reference/pdf/functions/pdf-open-image-file.xml:1.3 Sat Aug 9 00:31:34 2003 +++ phpdoc/en/reference/pdf/functions/pdf-open-image-file.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.pdf-open-image-file"> <refnamediv> @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>imagetype</parameter></methodparam> <methodparam><type>string</type><parameter>filename</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>stringparam</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>intparam</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>intparam</parameter></methodparam> </methodsynopsis> <para> Open an image file. Supported types are <literal>jpeg</literal>, http://cvs.php.net/diff.php/phpdoc/en/reference/pdf/functions/pdf-open-image.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/pdf/functions/pdf-open-image.xml diff -u phpdoc/en/reference/pdf/functions/pdf-open-image.xml:1.3 phpdoc/en/reference/pdf/functions/pdf-open-image.xml:1.4 --- phpdoc/en/reference/pdf/functions/pdf-open-image.xml:1.3 Sat Aug 9 00:31:34 2003 +++ phpdoc/en/reference/pdf/functions/pdf-open-image.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.pdf-open-image"> <refnamediv> @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>imagetype</parameter></methodparam> <methodparam><type>string</type><parameter>source</parameter></methodparam> <methodparam><type>string</type><parameter>data</parameter></methodparam> - <methodparam><type>long</type><parameter>length</parameter></methodparam> + <methodparam><type>int</type><parameter>length</parameter></methodparam> <methodparam><type>int</type><parameter>width</parameter></methodparam> <methodparam><type>int</type><parameter>height</parameter></methodparam> <methodparam><type>int</type><parameter>components</parameter></methodparam> http://cvs.php.net/diff.php/phpdoc/en/reference/sem/functions/sem-get.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/sem/functions/sem-get.xml diff -u phpdoc/en/reference/sem/functions/sem-get.xml:1.8 phpdoc/en/reference/sem/functions/sem-get.xml:1.9 --- phpdoc/en/reference/sem/functions/sem-get.xml:1.8 Wed Apr 28 07:39:18 2004 +++ phpdoc/en/reference/sem/functions/sem-get.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.sem-get"> <refnamediv> @@ -13,6 +13,7 @@ <methodparam><type>int</type><parameter>key</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>max_acquire</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>perm</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>auto_release</parameter></methodparam> </methodsynopsis> <para> <function>sem_get</function> returns an id that can be used to @@ -24,7 +25,12 @@ finds it is the only process currently attached to the semaphore. </para> <para> - Returns: A positive semaphore identifier on success, or &false; on + Optional parameter <parameter>auto_release</parameter> specifies if the + semaphore should be automatically released on request shutdown. + It is available since PHP 4.3.0. + </para> + <para> + Returns a positive semaphore identifier on success, or &false; on error. </para> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/simplexml/functions/simplexml-import-dom.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/simplexml/functions/simplexml-import-dom.xml diff -u phpdoc/en/reference/simplexml/functions/simplexml-import-dom.xml:1.3 phpdoc/en/reference/simplexml/functions/simplexml-import-dom.xml:1.4 --- phpdoc/en/reference/simplexml/functions/simplexml-import-dom.xml:1.3 Sun Jul 18 12:57:43 2004 +++ phpdoc/en/reference/simplexml/functions/simplexml-import-dom.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id='function.simplexml-import-dom'> <refnamediv> <refname>simplexml_import_dom</refname> @@ -12,7 +12,8 @@ <title>Description</title> <methodsynopsis> <type>object SimpleXMLElement</type><methodname>simplexml_import_dom</methodname> - <methodparam><type>domNode</type><parameter>node</parameter></methodparam> + <methodparam><type>object</type><parameter>node</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam> </methodsynopsis> <para>  @@ -22,6 +23,7 @@ it returns &false;. </para>  +  <example> <title>Import DOM</title> <programlisting role="php"> http://cvs.php.net/diff.php/phpdoc/en/reference/simplexml/functions/simplexml-load-file.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/simplexml/functions/simplexml-load-file.xml diff -u phpdoc/en/reference/simplexml/functions/simplexml-load-file.xml:1.3 phpdoc/en/reference/simplexml/functions/simplexml-load-file.xml:1.4 --- phpdoc/en/reference/simplexml/functions/simplexml-load-file.xml:1.3 Sun Jul 18 12:57:43 2004 +++ phpdoc/en/reference/simplexml/functions/simplexml-load-file.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id='function.simplexml-load-file'> <refnamediv> <refname>simplexml_load_file</refname> @@ -12,6 +12,7 @@ <methodsynopsis> <type>object SimpleXMLElement</type><methodname>simplexml_load_file</methodname> <methodparam><type>string</type><parameter>filename</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam> </methodsynopsis> <para> This function will convert the well-formed XML document in the file @@ -19,6 +20,7 @@ of class <literal>SimpleXMLElement</literal>. If any errors occur during file access or interpretation, the function returns &false;. </para> +  <para> <example> <title>Interpret an XML document</title> http://cvs.php.net/diff.php/phpdoc/en/reference/simplexml/functions/simplexml-load-string.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/simplexml/functions/simplexml-load-string.xml diff -u phpdoc/en/reference/simplexml/functions/simplexml-load-string.xml:1.3 phpdoc/en/reference/simplexml/functions/simplexml-load-string.xml:1.4 --- phpdoc/en/reference/simplexml/functions/simplexml-load-string.xml:1.3 Sun Jul 18 12:57:43 2004 +++ phpdoc/en/reference/simplexml/functions/simplexml-load-string.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id='function.simplexml-load-string'> <refnamediv> <refname>simplexml_load_string</refname> @@ -12,6 +12,7 @@ <methodsynopsis> <type>object SimpleXMLElement</type><methodname>simplexml_load_string</methodname> <methodparam><type>string</type><parameter>data</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam> </methodsynopsis> <para> This function will take the well-formed xml string @@ -19,6 +20,7 @@ containing the data held within the xml document. If any errors occur, it returns &false;. </para> +  <para> <example> <title>Interpret an XML string</title> http://cvs.php.net/diff.php/phpdoc/en/reference/sqlite/functions/sqlite-create-aggregate.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/sqlite/functions/sqlite-create-aggregate.xml diff -u phpdoc/en/reference/sqlite/functions/sqlite-create-aggregate.xml:1.7 phpdoc/en/reference/sqlite/functions/sqlite-create-aggregate.xml:1.8 --- phpdoc/en/reference/sqlite/functions/sqlite-create-aggregate.xml:1.7 Tue Jul 27 00:48:55 2004 +++ phpdoc/en/reference/sqlite/functions/sqlite-create-aggregate.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.sqlite-create-aggregate"> <refnamediv> <refname>sqlite_create_aggregate</refname> @@ -11,8 +11,8 @@ <type>bool</type><methodname>sqlite_create_aggregate</methodname> <methodparam><type>resource</type><parameter>dbhandle</parameter></methodparam> <methodparam><type>string</type><parameter>function_name</parameter></methodparam> - <methodparam><type>mixed</type><parameter>step_func</parameter></methodparam> - <methodparam><type>mixed</type><parameter>finalize_func</parameter></methodparam> + <methodparam><type>callback</type><parameter>step_func</parameter></methodparam> + <methodparam><type>callback</type><parameter>finalize_func</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>num_args</parameter></methodparam> </methodsynopsis> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml?r1=1.9&r2=1.10&ty=u Index: phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml diff -u phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.9 phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.10 --- phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.9 Tue Jul 27 00:48:55 2004 +++ phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.sqlite-create-function"> <refnamediv> <refname>sqlite_create_function</refname> @@ -13,7 +13,7 @@ <type>bool</type><methodname>sqlite_create_function</methodname> <methodparam><type>resource</type><parameter>dbhandle</parameter></methodparam> <methodparam><type>string</type><parameter>function_name</parameter></methodparam> - <methodparam><type>mixed</type><parameter>callback</parameter></methodparam> + <methodparam><type>callback</type><parameter>callback</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>num_args</parameter></methodparam> </methodsynopsis> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/sqlite/functions/sqlite-fetch-single.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/sqlite/functions/sqlite-fetch-single.xml diff -u phpdoc/en/reference/sqlite/functions/sqlite-fetch-single.xml:1.4 phpdoc/en/reference/sqlite/functions/sqlite-fetch-single.xml:1.5 --- phpdoc/en/reference/sqlite/functions/sqlite-fetch-single.xml:1.4 Tue Jul 27 00:48:55 2004 +++ phpdoc/en/reference/sqlite/functions/sqlite-fetch-single.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.sqlite-fetch-single"> <refnamediv> <refname>sqlite_fetch_single</refname> @@ -10,7 +10,6 @@ <methodsynopsis> <type>string</type><methodname>sqlite_fetch_single</methodname> <methodparam><type>resource</type><parameter>result</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>result_type</parameter></methodparam> <methodparam choice="opt"><type>bool</type><parameter>decode_binary</parameter></methodparam> </methodsynopsis> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-context-create.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/stream/functions/stream-context-create.xml diff -u phpdoc/en/reference/stream/functions/stream-context-create.xml:1.3 phpdoc/en/reference/stream/functions/stream-context-create.xml:1.4 --- phpdoc/en/reference/stream/functions/stream-context-create.xml:1.3 Wed Jun 16 09:01:22 2004 +++ phpdoc/en/reference/stream/functions/stream-context-create.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.stream-context-create"> <refnamediv> <refname>stream_context_create</refname> @@ -9,7 +9,7 @@ <title>Description</title> <methodsynopsis> <type>resource</type><methodname>stream_context_create</methodname> - <methodparam><type>array</type><parameter>options</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam> </methodsynopsis> <simpara> Creates and returns a stream context with any options supplied in @@ -19,6 +19,7 @@ <parameter>options</parameter> must be an associative array of associative arrays in the format <literal>$arr['wrapper']['option'] = $value</literal>. + It defaults to an empty array. </simpara> <example> <title>Using <function>stream_context_create</function></title> http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-accept.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/stream/functions/stream-socket-accept.xml diff -u phpdoc/en/reference/stream/functions/stream-socket-accept.xml:1.4 phpdoc/en/reference/stream/functions/stream-socket-accept.xml:1.5 --- phpdoc/en/reference/stream/functions/stream-socket-accept.xml:1.4 Sat Jul 31 10:41:54 2004 +++ phpdoc/en/reference/stream/functions/stream-socket-accept.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.stream-socket-accept"> <refnamediv> <refname>stream_socket_accept</refname> @@ -12,7 +12,7 @@ <methodsynopsis> <type>resource</type><methodname>stream_socket_accept</methodname> <methodparam><type>resource</type><parameter>server_socket</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam> + <methodparam choice="opt"><type>float</type><parameter>timeout</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>&peername</parameter></methodparam> </methodsynopsis> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/get-html-translation-table.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/strings/functions/get-html-translation-table.xml diff -u phpdoc/en/reference/strings/functions/get-html-translation-table.xml:1.6 phpdoc/en/reference/strings/functions/get-html-translation-table.xml:1.7 --- phpdoc/en/reference/strings/functions/get-html-translation-table.xml:1.6 Fri May 21 19:05:20 2004 +++ phpdoc/en/reference/strings/functions/get-html-translation-table.xml Thu Aug 12 14:11:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.get-html-translation-table"> <refnamediv> @@ -14,7 +14,7 @@ <title>Description</title> <methodsynopsis> <type>array</type><methodname>get_html_translation_table</methodname> - <methodparam><type>int</type><parameter>table</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>table</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>quote_style</parameter></methodparam> </methodsynopsis> <para> @@ -27,7 +27,8 @@ There are two new constants (<constant>HTML_ENTITIES</constant>, <constant>HTML_SPECIALCHARS</constant>) that allow you to - specify the table you want. And as in the + specify the table you want. Default value for <parameter>table</parameter> + is <constant>HTML_SPECIALCHARS</constant>. And as in the <function>htmlspecialchars</function> and <function>htmlentities</function> functions you can optionally specify the <parameter>quote_style</parameter> you are working with. The default is http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/metaphone.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/strings/functions/metaphone.xml diff -u phpdoc/en/reference/strings/functions/metaphone.xml:1.3 phpdoc/en/reference/strings/functions/metaphone.xml:1.4 --- phpdoc/en/reference/strings/functions/metaphone.xml:1.3 Fri Oct 24 08:07:07 2003 +++ phpdoc/en/reference/strings/functions/metaphone.xml Thu Aug 12 14:12:00 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.metaphone"> <refnamediv> @@ -11,6 +11,7 @@ <methodsynopsis> <type>string</type><methodname>metaphone</methodname> <methodparam><type>string</type><parameter>str</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>phones</parameter></methodparam> </methodsynopsis> <para> Calculates the metaphone key of <parameter>str</parameter>. @@ -22,6 +23,7 @@ English pronunciation. The metaphone generated keys are of variable length. </para> +  <para> Metaphone was developed by Lawrence Philips <lphilips at verity dot com>. It is described in ["Practical http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/wordwrap.xml?r1=1.11&r2=1.12&ty=u Index: phpdoc/en/reference/strings/functions/wordwrap.xml diff -u phpdoc/en/reference/strings/functions/wordwrap.xml:1.11 phpdoc/en/reference/strings/functions/wordwrap.xml:1.12 --- phpdoc/en/reference/strings/functions/wordwrap.xml:1.11 Tue May 25 14:49:45 2004 +++ phpdoc/en/reference/strings/functions/wordwrap.xml Thu Aug 12 14:12:00 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.wordwrap"> <refnamediv> @@ -16,7 +16,7 @@ <methodparam><type>string</type><parameter>str</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>width</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>break</parameter></methodparam> - <methodparam choice="opt"><type>boolean</type><parameter>cut</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>cut</parameter></methodparam> </methodsynopsis> <para> Returns a string with <parameter>str</parameter> wrapped http://cvs.php.net/diff.php/phpdoc/en/reference/url/functions/get-headers.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/url/functions/get-headers.xml diff -u phpdoc/en/reference/url/functions/get-headers.xml:1.2 phpdoc/en/reference/url/functions/get-headers.xml:1.3 --- phpdoc/en/reference/url/functions/get-headers.xml:1.2 Sat May 29 06:39:03 2004 +++ phpdoc/en/reference/url/functions/get-headers.xml Thu Aug 12 14:12:00 2004 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> - + <refentry id="function.get-headers"> <refnamediv> <refname>get_headers</refname> @@ -19,7 +19,7 @@ by the server in response to a HTTP request. </para> <para> - If the optional <parameter>format</parameter> parameter is true, + If the optional <parameter>format</parameter> parameter is &true;, <function>get_headers</function> parses the response and sets the array's keys. </para> http://cvs.php.net/diff.php/phpdoc/en/reference/url/functions/get-meta-tags.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/url/functions/get-meta-tags.xml diff -u phpdoc/en/reference/url/functions/get-meta-tags.xml:1.6 phpdoc/en/reference/url/functions/get-meta-tags.xml:1.7 --- phpdoc/en/reference/url/functions/get-meta-tags.xml:1.6 Mon Dec 15 11:54:10 2003 +++ phpdoc/en/reference/url/functions/get-meta-tags.xml Thu Aug 12 14:12:00 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.get-meta-tags"> <refnamediv> @@ -14,7 +14,7 @@ <methodsynopsis> <type>array</type><methodname>get_meta_tags</methodname> <methodparam><type>string</type><parameter>filename</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>use_include_path</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter></methodparam> </methodsynopsis> <para> Opens <parameter>filename</parameter> and parses it line by line @@ -23,7 +23,7 @@ <literal></head></literal>. </para> <para> - Setting <parameter>use_include_path</parameter> to 1 will result + Setting <parameter>use_include_path</parameter> to &true; will result in PHP trying to open the file along the standard include path as per the <link linkend="ini.include-path">include_path</link> directive. This is used for local files, not URLs. http://cvs.php.net/diff.php/phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-uri.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-uri.xml diff -u phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-uri.xml:1.1 phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-uri.xml:1.2 --- phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-uri.xml:1.1 Wed Apr 14 03:17:18 2004 +++ phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-uri.xml Thu Aug 12 14:12:00 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.xsl-xsltprocessor-transform-to-uri"> <refnamediv> <refname>xsl_xsltprocessor_transform_to_uri</refname> @@ -10,9 +10,8 @@ <para>Procedural style</para> <methodsynopsis> <type>bool</type><methodname>xsl_xsltprocessor_transform_to_uri</methodname> - <methodparam><type>node</type><parameter>doc</parameter></methodparam> + <methodparam><type>object</type><parameter>doc</parameter></methodparam> <methodparam><type>string</type><parameter>uri</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>clone</parameter></methodparam> </methodsynopsis> <para>Object oriented style (method)</para> <classsynopsis> @@ -20,9 +19,8 @@ <methodsynopsis> <type>bool</type> <methodname>transformToUri</methodname> - <methodparam><type>node</type><parameter>doc</parameter></methodparam> + <methodparam><type>object</type><parameter>doc</parameter></methodparam> <methodparam><type>string</type><parameter>uri</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>clone</parameter></methodparam> </methodsynopsis> </classsynopsis> &warn.experimental.func; http://cvs.php.net/diff.php/phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-xml.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-xml.xml diff -u phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-xml.xml:1.1 phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-xml.xml:1.2 --- phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-xml.xml:1.1 Wed Apr 14 03:17:18 2004 +++ phpdoc/en/reference/xsl/functions/xsl-xsltprocessor-transform-to-xml.xml Thu Aug 12 14:12:00 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - + <refentry id="function.xsl-xsltprocessor-transform-to-xml"> <refnamediv> <refname>xsl_xsltprocessor_transform_to_xml</refname> @@ -10,8 +10,7 @@ <para>Procedural style</para> <methodsynopsis> <type>bool</type><methodname>xsl_xsltprocessor_transform_to_xml</methodname> - <methodparam><type>node</type><parameter>doc</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>clone</parameter></methodparam> + <methodparam><type>object</type><parameter>doc</parameter></methodparam> </methodsynopsis> <para>Object oriented style (method)</para> <classsynopsis> @@ -19,8 +18,7 @@ <methodsynopsis> <type>bool</type> <methodname>transformToXml</methodname> - <methodparam><type>node</type><parameter>doc</parameter></methodparam> - <methodparam choice="opt"><type>bool</type><parameter>clone</parameter></methodparam> + <methodparam><type>object</type><parameter>doc</parameter></methodparam> </methodsynopsis> </classsynopsis> &warn.experimental.func; http://cvs.php.net/diff.php/phpdoc/en/reference/yaz/functions/yaz-wait.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/yaz/functions/yaz-wait.xml diff -u phpdoc/en/reference/yaz/functions/yaz-wait.xml:1.5 phpdoc/en/reference/yaz/functions/yaz-wait.xml:1.6 --- phpdoc/en/reference/yaz/functions/yaz-wait.xml:1.5 Mon Jan 26 08:42:22 2004 +++ phpdoc/en/reference/yaz/functions/yaz-wait.xml Thu Aug 12 14:12:00 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> - +  <refentry id="function.yaz-wait"> <refnamediv> @@ -10,7 +10,7 @@ <title>Description</title> <methodsynopsis> <type>int</type><methodname>yaz_wait</methodname> - <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>&options</parameter></methodparam> </methodsynopsis> <para> This function carries out networked (blocked) activity for