dave Wed Aug 4 17:03:59 2004 EDT
Modified files:
/phpdoc/en/reference/exif/functions exif-read-data.xml
/phpdoc/en/reference/mcrypt/functions mcrypt-encrypt.xml
mcrypt-get-cipher-name.xml
/phpdoc/en/reference/network/functions gethostbynamel.xml
/phpdoc/en/reference/sockets/functions socket-strerror.xml
/phpdoc/en/reference/strings/functions ltrim.xml rtrim.xml trim.xml
Log:
- Fix up some example layouts.
http://cvs.php.net/diff.php/phpdoc/en/reference/exif/functions/exif-read-data.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/exif/functions/exif-read-data.xml
diff -u phpdoc/en/reference/exif/functions/exif-read-data.xml:1.1
phpdoc/en/reference/exif/functions/exif-read-data.xml:1.2
--- phpdoc/en/reference/exif/functions/exif-read-data.xml:1.1 Sun Jul 25 19:08:33
2004
+++ phpdoc/en/reference/exif/functions/exif-read-data.xml Wed Aug 4 17:03:58
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.78 -->
<refentry id="function.exif-read-data">
<refnamediv>
@@ -184,8 +184,9 @@
]]>
</programlisting>
<para>
- The first call fails because the image has no header information.
- <screen role="php">
+ The first call fails because the image has no header information.
+ </para>
+ <screen role="php">
<![CDATA[
test1.jpg:
No header data found.
@@ -216,8 +217,7 @@
THUMBNAIL.Thumbnail.Height: 1
THUMBNAIL.Thumbnail.Height: 1
]]>
- </screen>
- </para>
+ </screen>
</example>
</para>
</refsect1>
http://cvs.php.net/diff.php/phpdoc/en/reference/mcrypt/functions/mcrypt-encrypt.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/mcrypt/functions/mcrypt-encrypt.xml
diff -u phpdoc/en/reference/mcrypt/functions/mcrypt-encrypt.xml:1.5
phpdoc/en/reference/mcrypt/functions/mcrypt-encrypt.xml:1.6
--- phpdoc/en/reference/mcrypt/functions/mcrypt-encrypt.xml:1.5 Thu Dec 18 12:45:18
2003
+++ phpdoc/en/reference/mcrypt/functions/mcrypt-encrypt.xml Wed Aug 4 17:03:58
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/mcrypt.xml, last change in rev 1.7 -->
<refentry id="function.mcrypt-encrypt">
<refnamediv>
@@ -69,13 +69,13 @@
</programlisting>
<para>
The above example will print out:
- <screen>
+ </para>
+ <screen>
<![CDATA[
42
64
]]>
- </screen>
- </para>
+ </screen>
</example>
</para>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/mcrypt/functions/mcrypt-get-cipher-name.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/mcrypt/functions/mcrypt-get-cipher-name.xml
diff -u phpdoc/en/reference/mcrypt/functions/mcrypt-get-cipher-name.xml:1.4
phpdoc/en/reference/mcrypt/functions/mcrypt-get-cipher-name.xml:1.5
--- phpdoc/en/reference/mcrypt/functions/mcrypt-get-cipher-name.xml:1.4 Mon Dec 15
11:52:01 2003
+++ phpdoc/en/reference/mcrypt/functions/mcrypt-get-cipher-name.xml Wed Aug 4
17:03:58 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/mcrypt.xml, last change in rev 1.2 -->
<refentry id="function.mcrypt-get-cipher-name">
<refnamediv>
@@ -40,12 +40,12 @@
</programlisting>
<para>
The above example will produce:
- <screen>
+ </para>
+ <screen>
<![CDATA[
3DES
]]>
- </screen>
- </para>
+ </screen>
</example>
</para>
</refsect1>
http://cvs.php.net/diff.php/phpdoc/en/reference/network/functions/gethostbynamel.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/network/functions/gethostbynamel.xml
diff -u phpdoc/en/reference/network/functions/gethostbynamel.xml:1.4
phpdoc/en/reference/network/functions/gethostbynamel.xml:1.5
--- phpdoc/en/reference/network/functions/gethostbynamel.xml:1.4 Mon Jun 2
10:05:55 2003
+++ phpdoc/en/reference/network/functions/gethostbynamel.xml Wed Aug 4 17:03:58
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/network.xml, last change in rev 1.2 -->
<refentry id="function.gethostbynamel">
<refnamediv>
@@ -31,15 +31,15 @@
</programlisting>
<para>
The printout of the above program will be:
- <screen>
+ </para>
+ <screen>
<![CDATA[
Array
(
[0] => 192.0.34.166
)
]]>
- </screen>
- </para>
+ </screen>
</example>
<para>
See also <function>gethostbyname</function>,
http://cvs.php.net/diff.php/phpdoc/en/reference/sockets/functions/socket-strerror.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/sockets/functions/socket-strerror.xml
diff -u phpdoc/en/reference/sockets/functions/socket-strerror.xml:1.5
phpdoc/en/reference/sockets/functions/socket-strerror.xml:1.6
--- phpdoc/en/reference/sockets/functions/socket-strerror.xml:1.5 Mon Dec 15
14:41:43 2003
+++ phpdoc/en/reference/sockets/functions/socket-strerror.xml Wed Aug 4 17:03:59
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/sockets.xml, last change in rev 1.8 -->
<refentry id="function.socket-strerror">
<refnamediv>
@@ -41,10 +41,10 @@
<para>
The expected output from the above example (assuming the script
is not run with root privileges):
- <screen>
- socket_bind() failed: reason: Permission denied
- </screen>
</para>
+ <screen>
+ socket_bind() failed: reason: Permission denied
+ </screen>
</example>
</para>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/ltrim.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/strings/functions/ltrim.xml
diff -u phpdoc/en/reference/strings/functions/ltrim.xml:1.4
phpdoc/en/reference/strings/functions/ltrim.xml:1.5
--- phpdoc/en/reference/strings/functions/ltrim.xml:1.4 Fri Jul 9 03:21:53 2004
+++ phpdoc/en/reference/strings/functions/ltrim.xml Wed Aug 4 17:03:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
<refentry id="function.ltrim">
<refnamediv>
@@ -73,8 +73,7 @@
</para>
<example>
<title>Usage example of <function>ltrim</function></title>
- <para>
- <programlisting role="php">
+ <programlisting role="php">
<![CDATA[
<?php
@@ -89,8 +88,7 @@
?>
]]>
- </programlisting>
- </para>
+ </programlisting>
</example>
<para>
See also <function>trim</function> and <function>rtrim</function>.
http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/rtrim.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/strings/functions/rtrim.xml
diff -u phpdoc/en/reference/strings/functions/rtrim.xml:1.4
phpdoc/en/reference/strings/functions/rtrim.xml:1.5
--- phpdoc/en/reference/strings/functions/rtrim.xml:1.4 Fri Jul 9 03:21:53 2004
+++ phpdoc/en/reference/strings/functions/rtrim.xml Wed Aug 4 17:03:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/strings.xml, last change in rev 1.31 -->
<refentry id="function.rtrim">
<refnamediv>
@@ -73,8 +73,7 @@
</para>
<example>
<title>Usage example of <function>rtrim</function></title>
- <para>
- <programlisting role="php">
+ <programlisting role="php">
<![CDATA[
<?php
@@ -89,8 +88,7 @@
?>
]]>
- </programlisting>
- </para>
+ </programlisting>
</example>
<para>
See also <function>trim</function> and <function>ltrim</function>.
http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/trim.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/strings/functions/trim.xml
diff -u phpdoc/en/reference/strings/functions/trim.xml:1.6
phpdoc/en/reference/strings/functions/trim.xml:1.7
--- phpdoc/en/reference/strings/functions/trim.xml:1.6 Thu Apr 29 11:01:54 2004
+++ phpdoc/en/reference/strings/functions/trim.xml Wed Aug 4 17:03:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
<refentry id="function.trim">
<refnamediv>
@@ -68,8 +68,7 @@
</para>
<example>
<title>Usage example of <function>trim</function></title>
- <para>
- <programlisting role="php">
+ <programlisting role="php">
<![CDATA[
<?php
@@ -84,8 +83,7 @@
?>
]]>
- </programlisting>
- </para>
+ </programlisting>
</example>
<note>
<simpara>
