derick          Sat Jun 21 06:28:05 2003 EDT

  Modified files:              
    /phpdoc/en/reference/misc   ini.xml reference.xml 
    /phpdoc/en/reference/misc/functions connection-aborted.xml 
                                        connection-status.xml 
                                        defined.xml eval.xml exit.xml 
                                        get-browser.xml 
                                        highlight-file.xml pack.xml 
                                        sleep.xml uniqid.xml unpack.xml 
                                        usleep.xml 
  Log:
  - Clean-up
  
  
Index: phpdoc/en/reference/misc/ini.xml
diff -u phpdoc/en/reference/misc/ini.xml:1.2 phpdoc/en/reference/misc/ini.xml:1.3
--- phpdoc/en/reference/misc/ini.xml:1.2        Thu May  1 17:52:57 2003
+++ phpdoc/en/reference/misc/ini.xml    Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <section id="misc.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -86,7 +86,23 @@
 
     <varlistentry id="ini.syntax-highlighting">
      <term>
-      <parameter>highlight.xxx</parameter>
+      <parameter>highlight.comment</parameter>
+      <type>string</type>
+     </term>
+     <term>
+      <parameter>highlight.default</parameter>
+      <type>string</type>
+     </term>
+     <term>
+      <parameter>highlight.html</parameter>
+      <type>string</type>
+     </term>
+     <term>
+      <parameter>highlight.keyword</parameter>
+      <type>string</type>
+     </term>
+     <term>
+      <parameter>highlight.string</parameter>
       <type>string</type>
      </term>
      <listitem>
Index: phpdoc/en/reference/misc/reference.xml
diff -u phpdoc/en/reference/misc/reference.xml:1.6 
phpdoc/en/reference/misc/reference.xml:1.7
--- phpdoc/en/reference/misc/reference.xml:1.6  Sun Feb 23 12:57:12 2003
+++ phpdoc/en/reference/misc/reference.xml      Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
  <reference id="ref.misc">
   <title>Miscellaneous functions</title>
   <titleabbrev>Misc.</titleabbrev>
@@ -33,11 +33,9 @@
 
    &reference.misc.constants;
 
-   </partintro>
+  </partintro>
 
-
-
-&reference.misc.functions;
+  &reference.misc.functions;
 
  </reference>
 <!-- Keep this comment at the end of the file
Index: phpdoc/en/reference/misc/functions/connection-aborted.xml
diff -u phpdoc/en/reference/misc/functions/connection-aborted.xml:1.2 
phpdoc/en/reference/misc/functions/connection-aborted.xml:1.3
--- phpdoc/en/reference/misc/functions/connection-aborted.xml:1.2       Wed Apr 17 
02:40:40 2002
+++ phpdoc/en/reference/misc/functions/connection-aborted.xml   Sat Jun 21 06:28:05 
2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.connection-aborted">
    <refnamediv>
@@ -18,6 +18,9 @@
      description in the <link linkend="features">Features</link>
      chapter for a complete explanation.
     </simpara>
+    <para>
+     See also <function>connection_status</function>.
+    </para>
    </refsect1>
   </refentry>
 
Index: phpdoc/en/reference/misc/functions/connection-status.xml
diff -u phpdoc/en/reference/misc/functions/connection-status.xml:1.2 
phpdoc/en/reference/misc/functions/connection-status.xml:1.3
--- phpdoc/en/reference/misc/functions/connection-status.xml:1.2        Wed Apr 17 
02:40:41 2002
+++ phpdoc/en/reference/misc/functions/connection-status.xml    Sat Jun 21 06:28:05 
2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.connection-status">
    <refnamediv>
@@ -18,6 +18,9 @@
      description in the <link linkend="features">Features</link>
      chapter for a complete explanation.
     </simpara>
+    <para>
+     See also <function>connection_aborted</function>.
+    </para>
    </refsect1>
   </refentry>
 
Index: phpdoc/en/reference/misc/functions/defined.xml
diff -u phpdoc/en/reference/misc/functions/defined.xml:1.4 
phpdoc/en/reference/misc/functions/defined.xml:1.5
--- phpdoc/en/reference/misc/functions/defined.xml:1.4  Tue Jun 10 00:48:56 2003
+++ phpdoc/en/reference/misc/functions/defined.xml      Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.defined">
    <refnamediv>
@@ -25,8 +25,8 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-// Note the use of quotes, this is important.  This example is checking 
-// if the string 'CONSTANT' is the name of a constant named CONSTANT 
+/* Note the use of quotes, this is important.  This example is checking 
+ * if the string 'CONSTANT' is the name of a constant named CONSTANT */
 if (defined('CONSTANT')) {
     echo CONSTANT;
 }
Index: phpdoc/en/reference/misc/functions/eval.xml
diff -u phpdoc/en/reference/misc/functions/eval.xml:1.4 
phpdoc/en/reference/misc/functions/eval.xml:1.5
--- phpdoc/en/reference/misc/functions/eval.xml:1.4     Mon Jun  9 15:18:08 2003
+++ phpdoc/en/reference/misc/functions/eval.xml Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.58 -->
   <refentry id="function.eval">
    <refnamediv>
@@ -48,22 +48,22 @@
 <?php
 $string = 'cup';
 $name = 'coffee';
-$str = 'This is a $string with my $name in it.<br>';
-echo $str;
+$str = 'This is a $string with my $name in it.';
+echo $str. "\n";
 eval ("\$str = \"$str\";");
-echo $str;
+echo $str. "\n";
 ?>
 ]]>
       </programlisting>
       <para>
        The above example will show:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 This is a $string with my $name in it.
 This is a cup with my coffee in it.
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
     </para>
     &tip.ob-capture;
Index: phpdoc/en/reference/misc/functions/exit.xml
diff -u phpdoc/en/reference/misc/functions/exit.xml:1.4 
phpdoc/en/reference/misc/functions/exit.xml:1.5
--- phpdoc/en/reference/misc/functions/exit.xml:1.4     Sun Mar 30 18:18:07 2003
+++ phpdoc/en/reference/misc/functions/exit.xml Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.exit">
    <refnamediv>
@@ -21,6 +21,12 @@
       This is not a real function, but a language construct.
      </simpara>
     </note>
+    <note>
+     <simpara>
+      PHP version &gt;= 4.2.0 does NOT print the <parameter>status</parameter>
+      if it is an <type>integer</type>.
+     </simpara>
+    </note>
     <simpara>
      The <function>exit</function> function terminates execution of
      the script. It prints <parameter>status</parameter> just before exiting.
@@ -31,18 +37,6 @@
      range 1 to 254, the exit status 255 is reserved by PHP and shall not be
      used.
     </simpara>
-    <note>
-     <simpara>
-      PHP version &gt;= 4.2.0 does NOT print the <parameter>status</parameter>
-      if it is an <type>integer</type>.
-     </simpara>
-    </note>
-    <note>
-     <simpara>
-      The <function>die</function> function is an alias for
-      <function>exit</function>.
-     </simpara>
-    </note>
     <para>
      <example>
       <title><function>exit</function> example</title>
@@ -60,6 +54,12 @@
       <!-- TODO: example with integer exit-statis -->
      </example>
     </para>
+    <note>
+     <simpara>
+      The <function>die</function> function is an alias for
+      <function>exit</function>.
+     </simpara>
+    </note>
     <para>
      See also: <function>register_shutdown_function</function>.
     </para>
Index: phpdoc/en/reference/misc/functions/get-browser.xml
diff -u phpdoc/en/reference/misc/functions/get-browser.xml:1.7 
phpdoc/en/reference/misc/functions/get-browser.xml:1.8
--- phpdoc/en/reference/misc/functions/get-browser.xml:1.7      Sat Jan 18 18:06:12 
2003
+++ phpdoc/en/reference/misc/functions/get-browser.xml  Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.get-browser">
    <refnamediv>
@@ -55,12 +55,10 @@
 ?>
 ]]>
       </programlisting>
-     </example>
-    </para>
-    <simpara>
-     The output of the above script would look something like this:
-    </simpara>
-    <programlisting>
+      <simpara>
+       The output of the above script would look something like this:
+      </simpara>
+      <screen role="html">
 <![CDATA[
 Mozilla/4.5 [en] (X11; U; Linux 2.2.9 i586)<hr />
 <b>browser_name_pattern:</b> Mozilla/4\.5.*<br />
@@ -83,7 +81,9 @@
 <b>authenticodeupdate:</b> <br />
 <b>msn:</b> <br />
 ]]>
-    </programlisting>
+      </screen>
+     </example>
+    </para>
     <simpara>
      In order for this to work, your <link
      linkend="ini.browscap">browscap</link> configuration setting in
@@ -94,15 +94,13 @@
      browscap.ini file here</ulink>.  By default, the 
      <link linkend="ini.browscap">browscap</link> directive is commented out.
     </simpara>
-    <note>
-     <simpara>
-      The <literal>cookies</literal> value simply means that the browser
-      itself is capable of accepting cookies and does not mean the user has 
-      enabled the browser to accept cookies or not.  The only way to test if
-      cookies are accepted is to set one with <function>setcookie</function>,
-      reload, and check for the value.
-     </simpara>
-    </note>
+    <simpara>
+     The <literal>cookies</literal> value simply means that the browser
+     itself is capable of accepting cookies and does not mean the user has 
+     enabled the browser to accept cookies or not.  The only way to test if
+     cookies are accepted is to set one with <function>setcookie</function>,
+     reload, and check for the value.
+    </simpara>
     <note>
      <simpara>
       On versions older than PHP 4.0.6, you will have to pass the
Index: phpdoc/en/reference/misc/functions/highlight-file.xml
diff -u phpdoc/en/reference/misc/functions/highlight-file.xml:1.6 
phpdoc/en/reference/misc/functions/highlight-file.xml:1.7
--- phpdoc/en/reference/misc/functions/highlight-file.xml:1.6   Tue Jun 10 02:56:16 
2003
+++ phpdoc/en/reference/misc/functions/highlight-file.xml       Sat Jun 21 06:28:05 
2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.22 -->
   <refentry id="function.highlight-file">
    <refnamediv>
@@ -32,7 +32,7 @@
       4.2.0.  Before this time it behaved like the default, which is &false;
      </simpara>
     </note>
-    <note>
+    <caution>
      <simpara>
       Care should be taken when using the
       <function>show_source</function> and
@@ -41,7 +41,7 @@
       passwords or any other type of information that might create a
       potential security risk.
      </simpara>
-    </note>
+    </caution>
     <note>
      <simpara>
       Since PHP 4.2.1 this function is also affected by <link
@@ -49,75 +49,65 @@
       linkend="ini.open-basedir">open_basedir</link>.
      </simpara>
     </note>
+    <simpara>
+     To setup a URL that can code hightlight any script that you pass to
+     it, we will make use of the "ForceType" directive in
+     Apache to generate a nice URL pattern, and use the 
+     function <function>highlight_file</function> to show a nice looking
+     code list.
+    </simpara>
+    <simpara>
+     In your &httpd.conf; you can add the following:
+    </simpara>
     <para>
      <example>
       <title>Creating a source highlighting URL</title>
-      <simpara>
-       To setup a URL that can code hightlight any script that you pass to
-       it, we will make use of the "ForceType" directive in
-       Apache to generate a nice URL pattern, and use the 
-       function <function>highlight_file</function> to show a nice looking
-       code list.
-      </simpara>
-      <simpara>
-       In your &httpd.conf; you can add the following:
-      </simpara>
-      <para>
-       <informalexample>
-        <programlisting>
+      <programlisting>
 <![CDATA[
 <Location /source>
     ForceType application/x-httpd-php
 </Location>
 ]]>
-        </programlisting>
-       </informalexample>
-      </para>
+      </programlisting>
       <simpara>
        And then make a file named "source" and put it in your
        web root directory.
       </simpara>
-      <para>
-       <programlisting role="php">
+      <programlisting role="php">
 <![CDATA[
-<HTML>
-<HEAD>
-<TITLE>Source Display</TITLE>
-</HEAD>
-<BODY BGCOLOR="white">
+<html>
+<head>
+<title>Source Display</title>
+</head>
+<body bgcolor="white">
 <?php
-    $script = getenv ("PATH_TRANSLATED");
-    if(!$script) {
-    echo "<BR><B>ERROR: Script Name needed</B><BR>";
-    } else {
-    if (ereg("(\.php|\.inc)$",$script)) {
-    echo "<H1>Source of: $PATH_INFO</H1>\n<HR>\n";
-    highlight_file($script);
+    $script = getenv("PATH_TRANSLATED");
+    if (!$script) {
+        echo "<br /><b>ERROR: Script Name needed</b><br />";
     } else {
-    echo "<H1>ERROR: Only PHP or include script names are allowed</H1>"; 
-    }
+        if (ereg("(\.php|\.inc)$",$script)) {
+            echo "<h1>Source of: $PATH_INFO</h1>\n<hr />\n";
+            highlight_file($script);
+        } else {
+            echo "<h1>ERROR: Only PHP or include script names are allowed</h1>"; 
+        }
     }
-    echo "<HR>Processed: ".date("Y/M/d H:i:s",time());
+    echo "<hr />Processed: ". date("Y/M/d H:i:s", time());
 ?>
 </BODY>
 </HTML>
 ]]>
-       </programlisting>
-      </para>
+      </programlisting>
       <simpara>
        Then you can use an URL like the one below to display a colorized
        version of a script located in "/path/to/script.php" 
        in your web site.
       </simpara>
-      <para>
-       <informalexample>
-    <programlisting>
+      <screen>
 <![CDATA[
 http://your.server.com/source/path/to/script.php
 ]]>
-    </programlisting>
-       </informalexample>
-      </para>
+      </screen>
      </example>
     </para>
     <simpara>
Index: phpdoc/en/reference/misc/functions/pack.xml
diff -u phpdoc/en/reference/misc/functions/pack.xml:1.2 
phpdoc/en/reference/misc/functions/pack.xml:1.3
--- phpdoc/en/reference/misc/functions/pack.xml:1.2     Wed Apr 17 02:40:43 2002
+++ phpdoc/en/reference/misc/functions/pack.xml Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.4 -->
   <refentry id="function.pack">
    <refnamediv>
@@ -30,118 +30,51 @@
      next data, for everything else the repeat count specifies how
      many data arguments are consumed and packed into the resulting
      binary string. Currently implemented are
-     <itemizedlist>
-      <listitem>
-       <simpara>
-    a NUL-padded string
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    A SPACE-padded string
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    h Hex string, low nibble first
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    H Hex string, high nibble first
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    c signed char
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    C unsigned char
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    s signed short (always 16 bit, machine byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    S unsigned short (always 16 bit, machine byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    n unsigned short (always 16 bit, big endian byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    v unsigned short (always 16 bit, little endian byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    i signed integer (machine dependent size and byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    I unsigned integer (machine dependent size and byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    l signed long (always 32 bit, machine byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    L unsigned long (always 32 bit, machine byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    N unsigned long (always 32 bit, big endian byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    V unsigned long (always 32 bit, little endian byte order)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    f float (machine dependent size and representation)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    d double (machine dependent size and representation)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    x NUL byte
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    X Back up one byte
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-    @ NUL-fill to absolute position
-       </simpara>
-      </listitem>
-     </itemizedlist>
+    </para>
+    <para>
+     <table>
+      <title><function>pack</function> format characters</title>
+      <tgroup cols="2">
+       <thead>
+        <row>
+         <entry>Code</entry>
+         <entry>Description</entry>
+        </row>
+       </thead>
+       <tbody>
+        <row><entry>a</entry><entry>NUL-padded string</entry></row>
+        <row><entry>A</entry><entry>SPACE-padded string</entry></row>
+        <row><entry>h</entry><entry>Hex string, low nibble first</entry></row>
+        <row><entry>H</entry><entry>Hex string, high nibble first</entry></row>
+        <row><entry>c</entry><entry>signed char</entry></row>
+        <row><entry>C</entry><entry>unsigned char</entry></row>
+        <row><entry>s</entry><entry>signed short (always 16 bit, machine byte 
order)</entry></row>
+        <row><entry>S</entry><entry>unsigned short (always 16 bit, machine byte 
order)</entry></row>
+        <row><entry>n</entry><entry>unsigned short (always 16 bit, big endian byte 
order)</entry></row>
+        <row><entry>v</entry><entry>unsigned short (always 16 bit, little endian byte 
order)</entry></row>
+        <row><entry>i</entry><entry>signed integer (machine dependent size and byte 
order)</entry></row>
+        <row><entry>I</entry><entry>unsigned integer (machine dependent size and byte 
order)</entry></row>
+        <row><entry>l</entry><entry>signed long (always 32 bit, machine byte 
order)</entry></row>
+        <row><entry>L</entry><entry>unsigned long (always 32 bit, machine byte 
order)</entry></row>
+        <row><entry>N</entry><entry>unsigned long (always 32 bit, big endian byte 
order)</entry></row>
+        <row><entry>V</entry><entry>unsigned long (always 32 bit, little endian byte 
order)</entry></row>
+        <row><entry>f</entry><entry>float (machine dependent size and 
representation)</entry></row>
+        <row><entry>d</entry><entry>double (machine dependent size and 
representation)</entry></row>
+        <row><entry>x</entry><entry>NUL byte</entry></row>
+        <row><entry>X</entry><entry>Back up one byte</entry></row>
+        <row><entry>@</entry><entry>NUL-fill to absolute position</entry></row>
+       </tbody>
+      </tgroup>
+     </table>
+    </para>
+    <para>
      <example>
-      <title><function>pack</function> format string</title>
+      <title><function>pack</function> example</title>
       <programlisting role="php">
 <![CDATA[
-$binarydata = pack ("nvc*", 0x1234, 0x5678, 65, 66);
+<?php
+$binarydata = pack("nvc*", 0x1234, 0x5678, 65, 66);
+?>
 ]]>
       </programlisting>
       <para>
@@ -164,7 +97,6 @@
     </para>
    </refsect1>
   </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
Index: phpdoc/en/reference/misc/functions/sleep.xml
diff -u phpdoc/en/reference/misc/functions/sleep.xml:1.4 
phpdoc/en/reference/misc/functions/sleep.xml:1.5
--- phpdoc/en/reference/misc/functions/sleep.xml:1.4    Sun Nov 10 10:00:54 2002
+++ phpdoc/en/reference/misc/functions/sleep.xml        Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.sleep">
    <refnamediv>
@@ -13,8 +13,8 @@
       <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
      </methodsynopsis>
     <simpara>
-     The <function>sleep</function> function delays program execution for the given 
number
-     of <parameter>seconds</parameter>.
+     The <function>sleep</function> function delays program execution for the
+     given number of <parameter>seconds</parameter>.
     </simpara>
     <simpara>
      See also <function>usleep</function> and
Index: phpdoc/en/reference/misc/functions/uniqid.xml
diff -u phpdoc/en/reference/misc/functions/uniqid.xml:1.4 
phpdoc/en/reference/misc/functions/uniqid.xml:1.5
--- phpdoc/en/reference/misc/functions/uniqid.xml:1.4   Fri Jun  6 12:15:41 2003
+++ phpdoc/en/reference/misc/functions/uniqid.xml       Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.uniqid">
    <refnamediv>
@@ -41,12 +41,19 @@
     <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
+     it is recommended that you use something along these lines:
+    </para>
+    <para>
      <informalexample>
       <programlisting role="php">
 <![CDATA[
-$token = md5(uniqid("")); // no prefix
-$better_token = md5(uniqid(rand(), true)); // better, difficult to guess
+<?php
+// no prefix
+$token = md5(uniqid(""));
+
+// better, difficult to guess
+$better_token = md5(uniqid(rand(), true));
+?>
 ]]>
       </programlisting>
      </informalexample>
Index: phpdoc/en/reference/misc/functions/unpack.xml
diff -u phpdoc/en/reference/misc/functions/unpack.xml:1.2 
phpdoc/en/reference/misc/functions/unpack.xml:1.3
--- phpdoc/en/reference/misc/functions/unpack.xml:1.2   Wed Apr 17 02:40:43 2002
+++ phpdoc/en/reference/misc/functions/unpack.xml       Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.22 -->
   <refentry id="function.unpack">
    <refnamediv>
@@ -24,10 +24,10 @@
      accomplish this you have to name the different format codes and
      separate them by a slash /.
      <example>
-      <title><function>unpack</function> format string</title>
+      <title><function>unpack</function> example</title>
       <programlisting role="php">
 <![CDATA[
-$array = unpack ("c2chars/nint", $binarydata);
+$array = unpack("c2chars/nint", $binarydata);
 ]]>
       </programlisting>
       <para>
@@ -36,15 +36,17 @@
       </para>
      </example>
     </para>
+    <caution>
+     <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>
+    </caution>
     <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.
+     See also <function>pack</function> for an explanation of the format
+     codes.
     </para>
    </refsect1>
   </refentry>
Index: phpdoc/en/reference/misc/functions/usleep.xml
diff -u phpdoc/en/reference/misc/functions/usleep.xml:1.3 
phpdoc/en/reference/misc/functions/usleep.xml:1.4
--- phpdoc/en/reference/misc/functions/usleep.xml:1.3   Mon May 13 15:29:40 2002
+++ phpdoc/en/reference/misc/functions/usleep.xml       Sat Jun 21 06:28:05 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.14 -->
   <refentry id="function.usleep">
    <refnamediv>
@@ -17,15 +17,15 @@
      for the given number of <parameter>micro_seconds</parameter>.  A 
      microsecond is one millionth of a second.
     </simpara>
-    <simpara>
-     See also <function>sleep</function> and 
-     <function>set_time_limit</function>.
-    </simpara>
     <note>
      <simpara>
       This function does not work on Windows systems.
      </simpara>
     </note>
+    <simpara>
+     See also <function>sleep</function> and 
+     <function>set_time_limit</function>.
+    </simpara>
    </refsect1>
   </refentry>
 

-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to