Date: 09/17/00
- Next message: Luca Perugini: "[PHP-DOC] cvs: phpdoc /it/language control-structures.xml functions.xml operators.xml types.xml variables.xml"
- Previous message: jah <email protected>: "[PHP-DOC] Re: CVS is still not working"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
perugini Sun Sep 17 12:41:11 2000 EDT
Modified files:
/phpdoc/it/functions com.xml cpdf.xml cybercash.xml errorfunc.xml
funchand.xml http.xml ibase.xml image.xml
imap.xml info.xml math.xml misc.xml pdf.xml
posix.xml recode.xml swf.xml
Log:
Synchronized with : PHP3 -> PHP 3, PHP4 -> PHP 4
Index: phpdoc/it/functions/com.xml
diff -u phpdoc/it/functions/com.xml:1.3 phpdoc/it/functions/com.xml:1.4
--- phpdoc/it/functions/com.xml:1.3 Thu Aug 31 09:20:09 2000
+++ phpdoc/it/functions/com.xml Sun Sep 17 12:41:10 2000
@@ -5,7 +5,7 @@
<partintro>
<simpara>
These functions are only available on the Windows version of
- PHP. These functions have been added in PHP4.
+ PHP. These functions have been added in PHP 4.
</simpara>
</partintro>
Index: phpdoc/it/functions/cpdf.xml
diff -u phpdoc/it/functions/cpdf.xml:1.5 phpdoc/it/functions/cpdf.xml:1.6
--- phpdoc/it/functions/cpdf.xml:1.5 Thu Aug 31 07:39:45 2000
+++ phpdoc/it/functions/cpdf.xml Sun Sep 17 12:41:10 2000
@@ -39,7 +39,7 @@
</simpara>
<note>
<simpara>
- The function <function>cpdf_set_font</function> has changed since PHP3
+ The function <function>cpdf_set_font</function> has changed since PHP 3
to support asian fonts. The encoding parameter is no longer an integer
but a string.
</simpara>
Index: phpdoc/it/functions/cybercash.xml
diff -u phpdoc/it/functions/cybercash.xml:1.2 phpdoc/it/functions/cybercash.xml:1.3
--- phpdoc/it/functions/cybercash.xml:1.2 Sat Jun 24 00:38:44 2000
+++ phpdoc/it/functions/cybercash.xml Sun Sep 17 12:41:10 2000
@@ -7,7 +7,7 @@
These functions are only available if the interpreter has been
compiled with the <option
role="configure">--with-cybercash=[DIR]</option>. These functions
- have been added in PHP4.
+ have been added in PHP 4.
</simpara>
</partintro>
Index: phpdoc/it/functions/errorfunc.xml
diff -u phpdoc/it/functions/errorfunc.xml:1.1 phpdoc/it/functions/errorfunc.xml:1.2
--- phpdoc/it/functions/errorfunc.xml:1.1 Sun Sep 10 02:25:37 2000
+++ phpdoc/it/functions/errorfunc.xml Sun Sep 17 12:41:10 2000
@@ -255,7 +255,7 @@
/* good for code authoring to report uninitialized or (possibly mis-spelled) variables */
error_reporting (63); // Old syntax, PHP 2/3
-error_reporting (E_ALL); // New syntax for PHP3/4
+error_reporting (E_ALL); // New syntax for PHP 3/4
/* report all PHP errors */
</programlisting>
</example>
@@ -328,7 +328,7 @@
<programlisting role="php">
<?php
-// redefine the user error constants - PHP4 only
+// redefine the user error constants - PHP 4 only
define (FATAL,E_USER_ERROR);
define (ERROR,E_USER_WARNING);
define (WARNING,E_USER_NOTICE);
Index: phpdoc/it/functions/funchand.xml
diff -u phpdoc/it/functions/funchand.xml:1.2 phpdoc/it/functions/funchand.xml:1.3
--- phpdoc/it/functions/funchand.xml:1.2 Sun Sep 10 02:37:24 2000
+++ phpdoc/it/functions/funchand.xml Sun Sep 17 12:41:10 2000
@@ -157,7 +157,7 @@
<programlisting role="php">
$av = array("the ","a ","that ","this ");
array_walk($av, create_function('&$v,$k','$v = $v."mango";'));
-print_r($av); // for PHP3 use var_dump()
+print_r($av); // for PHP 3 use var_dump()
// outputs:
// Array
// (
Index: phpdoc/it/functions/http.xml
diff -u phpdoc/it/functions/http.xml:1.5 phpdoc/it/functions/http.xml:1.6
--- phpdoc/it/functions/http.xml:1.5 Thu Aug 31 09:37:14 2000
+++ phpdoc/it/functions/http.xml Sun Sep 17 12:41:10 2000
@@ -177,10 +177,10 @@
</itemizedlist>
</para>
<simpara>
- In PHP3, multiple calls to <function>setcookie</function> in the same
+ In PHP 3, multiple calls to <function>setcookie</function> in the same
script will be performed in reverse order. If you are trying to
delete one cookie before inserting another you should put the
- insert before the delete. In PHP4, multiple calls to
+ insert before the delete. In PHP 4, multiple calls to
<function>setcookie</function> are performed in the order called.
</simpara>
<para>
Index: phpdoc/it/functions/ibase.xml
diff -u phpdoc/it/functions/ibase.xml:1.4 phpdoc/it/functions/ibase.xml:1.5
--- phpdoc/it/functions/ibase.xml:1.4 Wed Aug 2 15:16:15 2000
+++ phpdoc/it/functions/ibase.xml Sun Sep 17 12:41:10 2000
@@ -504,7 +504,7 @@
<note>
<para>
<function>Ibase_num_fields</function> is currently not functional
- in PHP4.
+ in PHP 4.
</para>
</note>
</refsect1>
Index: phpdoc/it/functions/image.xml
diff -u phpdoc/it/functions/image.xml:1.7 phpdoc/it/functions/image.xml:1.8
--- phpdoc/it/functions/image.xml:1.7 Sun Sep 10 02:41:52 2000
+++ phpdoc/it/functions/image.xml Sun Sep 17 12:41:10 2000
@@ -2168,7 +2168,7 @@
<para>
<note>
<simpara>
- This function is only available in PHP4 compiled using --enable-exif
+ This function is only available in PHP 4 compiled using --enable-exif
</simpara>
<simpara>
This function does not require the GD image library.
Index: phpdoc/it/functions/imap.xml
diff -u phpdoc/it/functions/imap.xml:1.6 phpdoc/it/functions/imap.xml:1.7
--- phpdoc/it/functions/imap.xml:1.6 Thu Aug 31 09:41:50 2000
+++ phpdoc/it/functions/imap.xml Sun Sep 17 12:41:10 2000
@@ -2708,7 +2708,7 @@
</funcprototype>
</funcsynopsis>
<para>
- This function is currently only available in PHP3.
+ This function is currently only available in PHP 3.
</para>
</refsect1>
</refentry>
Index: phpdoc/it/functions/info.xml
diff -u phpdoc/it/functions/info.xml:1.9 phpdoc/it/functions/info.xml:1.10
--- phpdoc/it/functions/info.xml:1.9 Sun Sep 10 02:39:35 2000
+++ phpdoc/it/functions/info.xml Sun Sep 17 12:41:10 2000
@@ -788,7 +788,7 @@
<para>
<note>
<para>
- This funcionality was added in PHP4 Beta 4.
+ This funcionality was added in PHP 4 Beta 4.
</para>
</note>
</para>
@@ -978,7 +978,7 @@
<para>
<note>
<para>
- This funcionality was added in PHP4 Beta 4.
+ This funcionality was added in PHP 4 Beta 4.
</para>
</note>
</para>
Index: phpdoc/it/functions/math.xml
diff -u phpdoc/it/functions/math.xml:1.7 phpdoc/it/functions/math.xml:1.8
--- phpdoc/it/functions/math.xml:1.7 Sun Jul 30 16:45:58 2000
+++ phpdoc/it/functions/math.xml Sun Sep 17 12:41:10 2000
@@ -94,7 +94,7 @@
</tgroup>
</table>
Soltanto M_PI è disponibile nelle versioni precedenti alla PHP4RC1 (compresa).
- Tutte le rimanenti costanti sono disponibili a partire dalla versione PHP4.0.
+ Tutte le rimanenti costanti sono disponibili a partire dalla versione PHP 4.0.
</para>
</sect2>
</sect1>
Index: phpdoc/it/functions/misc.xml
diff -u phpdoc/it/functions/misc.xml:1.4 phpdoc/it/functions/misc.xml:1.5
--- phpdoc/it/functions/misc.xml:1.4 Sun Sep 10 02:39:35 2000
+++ phpdoc/it/functions/misc.xml Sun Sep 17 12:41:10 2000
@@ -250,9 +250,9 @@
</simpara>
<simpara>
A <literal>return</literal> statement will terminate the evaluation of
- the string immediatley. In PHP4 you may use <literal>return</literal>
+ the string immediatley. In PHP 4 you may use <literal>return</literal>
to return a value that will become the result of the
- <function>eval</function> function while in PHP3
+ <function>eval</function> function while in PHP 3
<function>eval</function> was of type <literal>void</literal> and did
never return anything.
</simpara>
@@ -783,189 +783,4 @@
<note>
<simpara>
This function is an alias for the function
- <function>highlight_file</function>
- </simpara>
- </note>
- <simpara>
- See also <function>highlight_string</function>,
- <function>highlight_file</function>.
- </simpara>
- </refsect1>
- </refentry>
-
- <refentry id="function.sleep">
- <refnamediv>
- <refname>sleep</refname>
- <refpurpose>Delay execution</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Description</title>
- <funcsynopsis>
- <funcprototype>
- <funcdef>void <function>sleep</function></funcdef>
- <paramdef>int <parameter>seconds</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- <simpara>
- The sleep function delays program execution for the given number
- of <parameter>seconds</parameter>.
- </simpara>
- <simpara>
- See also <function>usleep</function>.
- </simpara>
- </refsect1>
- </refentry>
-
- <refentry id="function.uniqid">
- <refnamediv>
- <refname>uniqid</refname>
- <refpurpose>Generate a unique id</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Description</title>
- <funcsynopsis>
- <funcprototype>
- <funcdef>int <function>uniqid</function></funcdef>
- <paramdef>string <parameter>prefix</parameter></paramdef>
- <paramdef>boolean
- <parameter><optional>lcg</optional></parameter>
- </paramdef>
- </funcprototype>
- </funcsynopsis>
- <simpara>
- <function>Uniqid</function> returns a prefixed unique identifier
- based on the current time in microseconds. The prefix can be
- useful for instance if you generate identifiers simultaneously on
- several hosts that might happen to generate the identifier at the
- same microsecond. <parameter>Prefix</parameter> can be up to 114
- characters long.
- </simpara>
- <simpara>
- If the optional <parameter>lcg</parameter> parameter is true,
- <function>uniqid</function> will add additional "combined LCG"
- entropy at the end of the return value, which should make the
- results more unique.
- </simpara>
- <simpara>
- With an empty <parameter>prefix</parameter>, the returned string
- will be 13 characters long. If <parameter>lcg</parameter> is
- true, it will be 23 characters.
- </simpara>
- <note>
- <simpara>
- The <parameter>lcg</parameter> parameter is only available in
- PHP 4 and PHP 3.0.13 and later.
- </simpara>
- </note>
- <para>
- If you need a unique identifier or token and you intend to give
- out that token to the user via the network (i.e. session cookies),
- it is recommended that you use something along the lines of
- <informalexample>
- <programlisting role="php">
-$token = md5 (uniqid ("")); // no random portion
-$better_token = md5 (uniqid (rand())); // better, difficult to guess
- </programlisting>
- </informalexample>
- </para>
- <simpara>
- This will create a 32 character identifier (a 128 bit hex number)
- that is extremely difficult to predict.
- </simpara>
- </refsect1>
- </refentry>
-
- <refentry id="function.unpack">
- <refnamediv>
- <refname>unpack</refname>
- <refpurpose>Unpack data from binary string</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Description</title>
- <funcsynopsis>
- <funcprototype>
- <funcdef>array <function>unpack</function></funcdef>
- <paramdef>string <parameter>format</parameter></paramdef>
- <paramdef>string <parameter>data</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- <para>
- <function>Unpack</function> from binary string into array
- according to <parameter>format</parameter>. Returns array
- containing unpacked elements of binary string.
- </para>
- <para>
- <function>Unpack</function> works slightly different from Perl as
- the unpacked data is stored in an associative array. To
- accomplish this you have to name the different format codes and
- separate them by a slash /.
- <example>
- <title><function>Unpack</function> format string</title>
- <programlisting role="php">
-$array = unpack ("c2chars/nint", $binarydata);
- </programlisting>
- <para>
- The resulting array will contain the entries "chars1",
- "chars2" and "int".
- </para>
- </example>
- </para>
- <para>
- For an explanation of the format codes see also:
- <function>pack</function>
- </para>
- <para>
- Note that PHP internally stores integral values as signed. If you
- unpack a large unsigned long and it is of the same size as PHP
- internally stored values the result will be a negative number
- even though unsigned unpacking was specified.
- </para>
- </refsect1>
- </refentry>
-
- <refentry id="function.usleep">
- <refnamediv>
- <refname>usleep</refname>
- <refpurpose>Delay execution in microseconds</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Description</title>
- <funcsynopsis>
- <funcprototype>
- <funcdef>void <function>usleep</function></funcdef>
- <paramdef>int <parameter>micro_seconds</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- <simpara>
- The <function>usleep</function> function delays program execution
- for the given number of <parameter>micro_seconds</parameter>.
- </simpara>
- <simpara>
- See also <function>sleep</function>.
- </simpara>
- <note>
- <simpara>
- This function does not work on Windows systems.
- </simpara>
- </note>
- </refsect1>
- </refentry>
-
- </reference>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"../../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
+ <function>highlight_file</
\ No newline at end of file
Index: phpdoc/it/functions/pdf.xml
diff -u phpdoc/it/functions/pdf.xml:1.5 phpdoc/it/functions/pdf.xml:1.6
--- phpdoc/it/functions/pdf.xml:1.5 Thu Aug 31 07:42:47 2000
+++ phpdoc/it/functions/pdf.xml Sun Sep 17 12:41:10 2000
@@ -38,8 +38,8 @@
<literal>--enable-shared-pdflib</literal>.
</simpara>
<simpara>
- Any version of PHP4 after March, 9th 2000 do not support versions
- of pdflib older than 3.0. PHP3 on the other hand should not be used
+ Any version of PHP 4 after March, 9th 2000 do not support versions
+ of pdflib older than 3.0. PHP 3 on the other hand should not be used
with version newer than 2.01.
</simpara>
<simpara>
Index: phpdoc/it/functions/posix.xml
diff -u phpdoc/it/functions/posix.xml:1.4 phpdoc/it/functions/posix.xml:1.5
--- phpdoc/it/functions/posix.xml:1.4 Thu Aug 31 08:29:09 2000
+++ phpdoc/it/functions/posix.xml Sun Sep 17 12:41:10 2000
@@ -8,7 +8,7 @@
IEEE 1003.1 (POSIX.1) standards document which are not accessible
through other means. POSIX.1 for example defined the open(), read(),
write() and close() functions, too, which traditionally have been
- part of PHP3 for a long time. Some more system specific functions
+ part of PHP 3 for a long time. Some more system specific functions
have not been available before, though, and this module tries to
remedy this by providing easy access to these functions.
</para>
Index: phpdoc/it/functions/recode.xml
diff -u phpdoc/it/functions/recode.xml:1.4 phpdoc/it/functions/recode.xml:1.5
--- phpdoc/it/functions/recode.xml:1.4 Sat Jun 24 00:38:44 2000
+++ phpdoc/it/functions/recode.xml Sun Sep 17 12:41:10 2000
@@ -64,7 +64,7 @@
<note>
<simpara>
This is an alias for <function>recode_string</function>. It has
- been added in PHP4.
+ been added in PHP 4.
</simpara>
</note>
</refsect1>
Index: phpdoc/it/functions/swf.xml
diff -u phpdoc/it/functions/swf.xml:1.3 phpdoc/it/functions/swf.xml:1.4
--- phpdoc/it/functions/swf.xml:1.3 Sat Aug 12 10:23:26 2000
+++ phpdoc/it/functions/swf.xml Sun Sep 17 12:41:10 2000
@@ -76,7 +76,7 @@
</para>
<note>
<para>
- SWF support was added in PHP4 RC2.
+ SWF support was added in PHP 4 RC2.
</para>
</note>
</partintro>
- Next message: Luca Perugini: "[PHP-DOC] cvs: phpdoc /it/language control-structures.xml functions.xml operators.xml types.xml variables.xml"
- Previous message: jah <email protected>: "[PHP-DOC] Re: CVS is still not working"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

