From e1c5dc16c6790068b4d0c4bf971f5efe4b34f1c9 Mon Sep 17 00:00:00 2001
From: Yannick Torres <yannick@php.net>
Date: Sun, 23 Jan 2005 20:24:36 +0000
Subject: [PATCH] add missing cdata section, use more entities

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@178042 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../mcrypt-enc-get-algorithms-name.xml        | 19 ++++++++-------
 .../mysql/functions/mysql-fetch-lengths.xml   | 15 ++++++------
 reference/regex/functions/sql-regcase.xml     | 12 ++++++----
 .../functions/stream-filter-register.xml      | 24 ++++++++-----------
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/reference/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml b/reference/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml
index 4ac9544877..7d6a01884c 100644
--- a/reference/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml
+++ b/reference/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml
@@ -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.7 -->
   <refentry id="function.mcrypt-enc-get-algorithms-name">
    <refnamediv>
@@ -21,18 +21,21 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-    $td = mcrypt_module_open(MCRYPT_CAST_256, '', MCRYPT_MODE_CFB, '');
-    echo mcrypt_enc_get_algorithms_name($td). "\n";
+$td = mcrypt_module_open(MCRYPT_CAST_256, '', MCRYPT_MODE_CFB, '');
+echo mcrypt_enc_get_algorithms_name($td). "\n";
   
-    $td = mcrypt_module_open('cast-256', '', MCRYPT_MODE_CFB, '');
-    echo mcrypt_enc_get_algorithms_name($td). "\n";
+$td = mcrypt_module_open('cast-256', '', MCRYPT_MODE_CFB, '');
+echo mcrypt_enc_get_algorithms_name($td). "\n";
 ?>
-
-Prints:
+]]>
+      </programlisting>
+      &example.outputs;
+      <screen>
+<![CDATA[
 CAST-256
 CAST-256
 ]]>
-      </programlisting>
+      </screen>
      </example>
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-fetch-lengths.xml b/reference/mysql/functions/mysql-fetch-lengths.xml
index c412a4c53d..0604345da8 100644
--- a/reference/mysql/functions/mysql-fetch-lengths.xml
+++ b/reference/mysql/functions/mysql-fetch-lengths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-fetch-lengths">
    <refnamediv>
@@ -44,8 +44,12 @@ $lengths = mysql_fetch_lengths($result);
 
 print_r($row);
 print_r($lengths);
-
-/* Output will look similar to:
+?>
+]]>
+      </programlisting>
+      &example.outputs.similar;
+      <screen>
+<![CDATA[
 Array
 (
     [id] => 42
@@ -56,11 +60,8 @@ Array
     [0] => 2
     [1] => 16
 )
-
-*/
-?>
 ]]>
-      </programlisting>
+      </screen>
      </example>
     </para>
     <para>
diff --git a/reference/regex/functions/sql-regcase.xml b/reference/regex/functions/sql-regcase.xml
index 3eff1e9138..8ebd1c98e9 100644
--- a/reference/regex/functions/sql-regcase.xml
+++ b/reference/regex/functions/sql-regcase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/regex.xml, last change in rev 1.2 -->
   <refentry id="function.sql-regcase">
    <refnamediv>
@@ -31,10 +31,12 @@ echo sql_regcase("Foo - bar.");
 ?>
 ]]>
       </programlisting>
-      <para>
-       prints:
-      </para>
-      <screen>[Ff][Oo][Oo] - [Bb][Aa][Rr].</screen>
+      &example.outputs;
+      <screen>
+<![CDATA[
+[Ff][Oo][Oo] - [Bb][Aa][Rr].
+]]>
+      </screen>
      </example>
     </para>
     <para>
diff --git a/reference/stream/functions/stream-filter-register.xml b/reference/stream/functions/stream-filter-register.xml
index d0cdc69058..be3d3e9091 100644
--- a/reference/stream/functions/stream-filter-register.xml
+++ b/reference/stream/functions/stream-filter-register.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
   <refentry id="function.stream-filter-register">
    <refnamediv>
     <refname>stream_filter_register</refname>
@@ -193,9 +193,7 @@ readfile("foo-bar.txt");
 ?>
 ]]>
       </programlisting>
-      <para>
-       Output
-      </para>
+      &example.outputs;
       <screen>
 <![CDATA[
 LINE1
@@ -266,19 +264,17 @@ fclose($fp);
 /* Read the contents back out
  */
 readfile("foo-bar.txt");
-
-/* Output
- * ------
-
-LINE1
-WORD - 2
-EASY AS 123
-
- */
-
 ?>
 ]]>
       </programlisting>
+      &example.outputs;
+      <screen>
+<![CDATA[
+LINE1
+WORD - 2
+EASY AS 123
+]]>
+      </screen>
      </example>
     </para>