didou Sat Aug 16 14:59:12 2003 EDT
Modified files:
/phpdoc/en/reference/array/functions extract.xml
/phpdoc/en/reference/aspell/functions aspell-check.xml
/phpdoc/en/reference/classobj reference.xml
/phpdoc/en/reference/classobj/functions get-class-methods.xml
/phpdoc/en/reference/dbx/functions dbx-query.xml
/phpdoc/en/reference/errorfunc/functions set-error-handler.xml
trigger-error.xml
/phpdoc/en/reference/gettext/functions gettext.xml
/phpdoc/en/reference/http/functions header.xml
/phpdoc/en/reference/image/functions getimagesize.xml
/phpdoc/en/reference/imap/functions imap-createmailbox.xml
/phpdoc/en/reference/mhash/functions mhash-get-hash-name.xml
/phpdoc/en/reference/pcre/functions preg-replace.xml
/phpdoc/en/reference/regex/functions ereg-replace.xml
/phpdoc/en/reference/sockets reference.xml
/phpdoc/en/reference/uodbc/functions odbc-result.xml
/phpdoc/en/reference/var/functions is-callable.xml
/phpdoc/en/reference/wddx/functions wddx-serialize-vars.xml
Log:
adding role attribute and php tags
Index: phpdoc/en/reference/array/functions/extract.xml
diff -u phpdoc/en/reference/array/functions/extract.xml:1.9
phpdoc/en/reference/array/functions/extract.xml:1.10
--- phpdoc/en/reference/array/functions/extract.xml:1.9 Mon Jun 16 08:03:39 2003
+++ phpdoc/en/reference/array/functions/extract.xml Sat Aug 16 14:59:10 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.extract">
<refnamediv>
@@ -176,11 +176,11 @@
<para>
The above example will produce:
</para>
- <programlisting>
+ <screen>
<![CDATA[
blue, large, sphere, medium
]]>
- </programlisting>
+ </screen>
</example>
</para>
<para>
Index: phpdoc/en/reference/aspell/functions/aspell-check.xml
diff -u phpdoc/en/reference/aspell/functions/aspell-check.xml:1.2
phpdoc/en/reference/aspell/functions/aspell-check.xml:1.3
--- phpdoc/en/reference/aspell/functions/aspell-check.xml:1.2 Wed Apr 17 02:36:32
2002
+++ phpdoc/en/reference/aspell/functions/aspell-check.xml Sat Aug 16 14:59:11
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/aspell.xml, last change in rev 1.2 -->
<refentry id="function.aspell-check">
<refnamediv>
@@ -20,8 +20,10 @@
<para>
<example>
<title><function>aspell_check</function></title>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
+<?php
+
$aspell_link = aspell_new("english");
if (aspell_check($aspell_link, "testt")) {
@@ -29,6 +31,8 @@
} else {
echo "Sorry, wrong spelling";
}
+
+?>
]]>
</programlisting>
</example>
Index: phpdoc/en/reference/classobj/reference.xml
diff -u phpdoc/en/reference/classobj/reference.xml:1.7
phpdoc/en/reference/classobj/reference.xml:1.8
--- phpdoc/en/reference/classobj/reference.xml:1.7 Sun Jun 15 06:13:50 2003
+++ phpdoc/en/reference/classobj/reference.xml Sat Aug 16 14:59:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<reference id="ref.classobj">
<title>Class/Object Functions</title>
<titleabbrev>Classes/Objects</titleabbrev>
@@ -168,26 +168,22 @@
</pre>
]]>
</programlisting>
- </example>
- </para>
- <para>
- One important thing to note in the example above is that
- the object <varname>$leafy</varname> is an instance of the class
- <classname>Spinach</classname> which is a subclass of
- <classname>Vegetable</classname>,
- therefore the last part of the script above will output:
- </para>
- <para>
- <informalexample>
- <programlisting>
+ <para>
+ One important thing to note in the example above is that
+ the object <varname>$leafy</varname> is an instance of the class
+ <classname>Spinach</classname> which is a subclass of
+ <classname>Vegetable</classname>,
+ therefore the last part of the script above will output:
+ </para>
+ <screen>
<![CDATA[
[...]
Parentage:
Object leafy does not belong to a subclass of Spinach
Object leafy belongs to class spinach a subclass of Vegetable
]]>
- </programlisting>
- </informalexample>
+ </screen>
+ </example>
</para>
</section>
</partintro>
Index: phpdoc/en/reference/classobj/functions/get-class-methods.xml
diff -u phpdoc/en/reference/classobj/functions/get-class-methods.xml:1.4
phpdoc/en/reference/classobj/functions/get-class-methods.xml:1.5
--- phpdoc/en/reference/classobj/functions/get-class-methods.xml:1.4 Mon Jun 16
08:12:08 2003
+++ phpdoc/en/reference/classobj/functions/get-class-methods.xml Sat Aug 16
14:59:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/classobj.xml, last change in rev 1.2 -->
<refentry id="function.get-class-methods">
<refnamediv>
@@ -21,9 +21,11 @@
As of PHP 4.0.6, you can specify the object itself instead of
<parameter>class_name</parameter>. For example:
<informalexample>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
+<?php
$class_methods = get_class_methods($my_class); // see below the full example
+?>
]]>
</programlisting>
</informalexample>
Index: phpdoc/en/reference/dbx/functions/dbx-query.xml
diff -u phpdoc/en/reference/dbx/functions/dbx-query.xml:1.9
phpdoc/en/reference/dbx/functions/dbx-query.xml:1.10
--- phpdoc/en/reference/dbx/functions/dbx-query.xml:1.9 Wed Jul 16 13:09:51 2003
+++ phpdoc/en/reference/dbx/functions/dbx-query.xml Sat Aug 16 14:59:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/dbx.xml, last change in rev 1.3 -->
<refentry id="function.dbx-query">
<refnamediv>
@@ -172,8 +172,8 @@
<para>
It is a valid handle for the connected database, and as such it can be
used in module specific functions (if required).
- <informalexample role="php">
- <programlisting>
+ <informalexample>
+ <programlisting role="php">
<![CDATA[
<?php
$result = dbx_query ($link, "SELECT id FROM table");
Index: phpdoc/en/reference/errorfunc/functions/set-error-handler.xml
diff -u phpdoc/en/reference/errorfunc/functions/set-error-handler.xml:1.13
phpdoc/en/reference/errorfunc/functions/set-error-handler.xml:1.14
--- phpdoc/en/reference/errorfunc/functions/set-error-handler.xml:1.13 Sun Jun 15
06:11:32 2003
+++ phpdoc/en/reference/errorfunc/functions/set-error-handler.xml Sat Aug 16
14:59:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<!-- splitted from ./en/functions/errorfunc.xml, last change in rev 1.1 -->
<refentry id="function.set-error-handler">
<refnamediv>
@@ -136,10 +136,10 @@
?>
]]>
</programlisting>
- </example>
- And when you run this sample script, the output will be
- <informalexample>
- <programlisting>
+ <para>
+ And when you run this sample script, the output will be :
+ </para>
+ <screen>
<![CDATA[
vector a
Array
@@ -173,8 +173,8 @@
Fatal error in line 36 of file trigger_error.php, PHP 4.0.2 (Linux)<br />
Aborting...<br />
]]>
- </programlisting>
- </informalexample>
+ </screen>
+ </example>
</para>
<para>
It is important to remember that the standard PHP error handler is completely
Index: phpdoc/en/reference/errorfunc/functions/trigger-error.xml
diff -u phpdoc/en/reference/errorfunc/functions/trigger-error.xml:1.5
phpdoc/en/reference/errorfunc/functions/trigger-error.xml:1.6
--- phpdoc/en/reference/errorfunc/functions/trigger-error.xml:1.5 Mon Jun 9
15:30:56 2003
+++ phpdoc/en/reference/errorfunc/functions/trigger-error.xml Sat Aug 16 14:59:11
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/errorfunc.xml, last change in rev 1.1 -->
<refentry id="function.trigger-error">
<refnamediv>
@@ -27,11 +27,13 @@
you need to generate a particular response to an exception at runtime.
For example:
<informalexample>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
+<?php
if (assert ($divisor == 0)) {
trigger_error ("Cannot divide by zero", E_USER_ERROR);
}
+?>
]]>
</programlisting>
</informalexample>
Index: phpdoc/en/reference/gettext/functions/gettext.xml
diff -u phpdoc/en/reference/gettext/functions/gettext.xml:1.4
phpdoc/en/reference/gettext/functions/gettext.xml:1.5
--- phpdoc/en/reference/gettext/functions/gettext.xml:1.4 Fri May 24 14:55:24
2002
+++ phpdoc/en/reference/gettext/functions/gettext.xml Sat Aug 16 14:59:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/gettext.xml, last change in rev 1.2 -->
<refentry id="function.gettext">
<refnamediv>
@@ -19,7 +19,7 @@
</para>
<example>
<title><function>gettext</function>-check</title>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<?php
// Set language to German
Index: phpdoc/en/reference/http/functions/header.xml
diff -u phpdoc/en/reference/http/functions/header.xml:1.18
phpdoc/en/reference/http/functions/header.xml:1.19
--- phpdoc/en/reference/http/functions/header.xml:1.18 Fri Jun 20 11:11:47 2003
+++ phpdoc/en/reference/http/functions/header.xml Sat Aug 16 14:59:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
<!-- splitted from ./en/functions/http.xml, last change in rev 1.2 -->
<refentry id="function.header">
<refnamediv>
@@ -119,7 +119,7 @@
and <function>dirname</function> to make an absolute URI from a
relative one yourself:
<informalexample>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<?php
header("Location: http://".$_SERVER['HTTP_HOST']
Index: phpdoc/en/reference/image/functions/getimagesize.xml
diff -u phpdoc/en/reference/image/functions/getimagesize.xml:1.19
phpdoc/en/reference/image/functions/getimagesize.xml:1.20
--- phpdoc/en/reference/image/functions/getimagesize.xml:1.19 Fri Aug 15 18:50:50
2003
+++ phpdoc/en/reference/image/functions/getimagesize.xml Sat Aug 16 14:59:11
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
<refentry id="function.getimagesize">
<refnamediv>
@@ -134,7 +134,7 @@
readable.
<example>
<title>getimagesize() returning IPTC</title>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<?php
$size = getimagesize ("testimg.jpg",&$info);
Index: phpdoc/en/reference/imap/functions/imap-createmailbox.xml
diff -u phpdoc/en/reference/imap/functions/imap-createmailbox.xml:1.3
phpdoc/en/reference/imap/functions/imap-createmailbox.xml:1.4
--- phpdoc/en/reference/imap/functions/imap-createmailbox.xml:1.3 Wed Oct 9
10:55:05 2002
+++ phpdoc/en/reference/imap/functions/imap-createmailbox.xml Sat Aug 16 14:59:11
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/imap.xml, last change in rev 1.2 -->
<refentry id="function.imap-createmailbox">
<refnamediv>
@@ -30,8 +30,9 @@
<para>
<example>
<title><function>imap_createmailbox</function> example</title>
- <programlisting>
+ <programlisting role"php">
<![CDATA[
+<?php
$mbox = imap_open("{your.imap.host}","username","password",OP_HALFOPEN)
or die("can't connect: ".imap_last_error());
@@ -75,6 +76,7 @@
}
imap_close($mbox);
+?>
]]>
</programlisting>
</example>
Index: phpdoc/en/reference/mhash/functions/mhash-get-hash-name.xml
diff -u phpdoc/en/reference/mhash/functions/mhash-get-hash-name.xml:1.2
phpdoc/en/reference/mhash/functions/mhash-get-hash-name.xml:1.3
--- phpdoc/en/reference/mhash/functions/mhash-get-hash-name.xml:1.2 Wed Apr 17
02:40:23 2002
+++ phpdoc/en/reference/mhash/functions/mhash-get-hash-name.xml Sat Aug 16 14:59:12
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/mhash.xml, last change in rev 1.2 -->
<refentry id="function.mhash-get-hash-name">
<refnamediv>
@@ -24,7 +24,7 @@
<para>
<example>
<title><function>mhash_get_hash_name</function> example</title>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<?php
$hash = MHASH_MD5;
Index: phpdoc/en/reference/pcre/functions/preg-replace.xml
diff -u phpdoc/en/reference/pcre/functions/preg-replace.xml:1.8
phpdoc/en/reference/pcre/functions/preg-replace.xml:1.9
--- phpdoc/en/reference/pcre/functions/preg-replace.xml:1.8 Mon Jun 16 16:03:02
2003
+++ phpdoc/en/reference/pcre/functions/preg-replace.xml Sat Aug 16 14:59:12 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 -->
<refentry id="function.preg-replace">
<refnamediv>
@@ -160,7 +160,7 @@
<para>
<example>
<title>Replacing several values</title>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<?php
$patterns = array ("/(19|20)(\d{2})-(\d{1,2})-(\d{1,2})/",
Index: phpdoc/en/reference/regex/functions/ereg-replace.xml
diff -u phpdoc/en/reference/regex/functions/ereg-replace.xml:1.4
phpdoc/en/reference/regex/functions/ereg-replace.xml:1.5
--- phpdoc/en/reference/regex/functions/ereg-replace.xml:1.4 Fri Jun 20 17:31:15
2003
+++ phpdoc/en/reference/regex/functions/ereg-replace.xml Sat Aug 16 14:59:12
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/regex.xml, last change in rev 1.2 -->
<refentry id="function.ereg-replace">
<refnamediv>
@@ -46,12 +46,16 @@
<para>
<example>
<title><function>ereg_replace</function> example</title>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
+<?php
+
$string = "This is a test";
echo ereg_replace (" is", " was", $string);
echo ereg_replace ("( )is", "\\1was", $string);
echo ereg_replace ("(( )is)", "\\2was", $string);
+
+?>
]]>
</programlisting>
</example>
@@ -66,7 +70,7 @@
<para>
<example>
<title><function>ereg_replace</function> example</title>
- <programlisting>
+ <programlisting role="php">
<