From 4fcd32a39abfa4a8106e48ccbb2152aeb543a0ae Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Wed, 13 Jan 2010 02:17:49 +0000
Subject: [PATCH] Fixed output boxes, reported by Yawk @ #php.doc on EFNet

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@293480 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language/functions.xml | 46 +++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/language/functions.xml b/language/functions.xml
index dd3b1a9ade..b6b4434381 100644
--- a/language/functions.xml
+++ b/language/functions.xml
@@ -255,18 +255,15 @@ echo makecoffee("espresso");
 ?>
 ]]>
       </programlisting>
-     </example>
-    </para>
- 
-    <para>
-     The output from the above snippet is:
-    </para>
-    <para>
-     <screen>
+      &example.outputs;
+      <screen>
+<![CDATA[
 Making a cup of cappuccino.
 Making a cup of .
 Making a cup of espresso.
-     </screen>
+]]>
+      </screen>
+     </example>
     </para>
     <para>
      PHP also allows the use of <type>array</type>s and the special type &null;
@@ -315,18 +312,15 @@ echo makeyogurt("raspberry");   // won't work as expected
 ?>
 ]]>
       </programlisting>
-     </example>
-    </para>
- 
-    <para>
-     The output of the above example is:
-    </para>
-    <para>
-     <screen>
+      &example.outputs;
+      <screen>
+<![CDATA[
 Warning: Missing argument 2 in call to makeyogurt() in 
 /usr/local/etc/httpd/htdocs/phptest/functest.html on line 41
 Making a bowl of raspberry .
-     </screen>
+]]>
+      </screen>
+     </example>
     </para>
     <para>
      Now, compare the above with this:
@@ -346,18 +340,14 @@ echo makeyogurt("raspberry");   // works as expected
 ?>
 ]]>
       </programlisting>
+      &example.outputs;
+      <screen>
+<![CDATA[
+Making a bowl of acidophilus raspberry.
+]]>
+      </screen>
      </example>
     </para>
- 
-    <para>
-     The output of this example is:
-    </para>
-    <para>
-     <screen>
-Making a bowl of acidophilus raspberry.
-     </screen>
-    </para>
-    
     <note>
      <simpara>
       As of PHP 5, default values may be passed by reference.