bjori Tue Jan 30 09:06:51 2007 UTC
Modified files:
/phpdoc/en/reference/array/functions compact.xml array-unshift.xml
array-push.xml
array-intersect-assoc.xml
array-intersect-ukey.xml
array-intersect.xml
array-merge-recursive.xml
Log:
Fix examples to print the output and fix output
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/compact.xml?r1=1.9&r2=1.10&diff_format=u
Index: phpdoc/en/reference/array/functions/compact.xml
diff -u phpdoc/en/reference/array/functions/compact.xml:1.9
phpdoc/en/reference/array/functions/compact.xml:1.10
--- phpdoc/en/reference/array/functions/compact.xml:1.9 Tue Oct 31 11:24:01 2006
+++ phpdoc/en/reference/array/functions/compact.xml Tue Jan 30 09:06:51 2007
@@ -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.compact">
<refnamediv>
@@ -54,12 +54,11 @@
$location_vars = array("city", "state");
$result = compact("event", "nothing_here", $location_vars);
+print_r($result);
?>
]]>
</programlisting>
- <para>
- After this, <varname>$result</varname> will be:
- </para>
+ &example.ouputs;
<screen role="php">
<![CDATA[
Array
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-unshift.xml?r1=1.12&r2=1.13&diff_format=u
Index: phpdoc/en/reference/array/functions/array-unshift.xml
diff -u phpdoc/en/reference/array/functions/array-unshift.xml:1.12
phpdoc/en/reference/array/functions/array-unshift.xml:1.13
--- phpdoc/en/reference/array/functions/array-unshift.xml:1.12 Tue Oct 31
11:24:01 2006
+++ phpdoc/en/reference/array/functions/array-unshift.xml Tue Jan 30
09:06:51 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.array-unshift">
<refnamediv>
@@ -33,13 +33,11 @@
<?php
$queue = array("orange", "banana");
array_unshift($queue, "apple", "raspberry");
+print_r($queue);
?>
]]>
</programlisting>
- <para>
- This would result in <varname>$queue</varname> having the
- following elements:
- </para>
+ &example.ouputs;
<screen role="php">
<![CDATA[
Array
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-push.xml?r1=1.13&r2=1.14&diff_format=u
Index: phpdoc/en/reference/array/functions/array-push.xml
diff -u phpdoc/en/reference/array/functions/array-push.xml:1.13
phpdoc/en/reference/array/functions/array-push.xml:1.14
--- phpdoc/en/reference/array/functions/array-push.xml:1.13 Tue Oct 31
11:24:01 2006
+++ phpdoc/en/reference/array/functions/array-push.xml Tue Jan 30 09:06:51 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.array-push">
<refnamediv>
@@ -44,10 +44,7 @@
?>
]]>
</programlisting>
- <para>
- This example would result in <varname>$stack</varname> having
- the following elements:
- </para>
+ &example.outputs;
<screen role="php">
<![CDATA[
Array
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-intersect-assoc.xml?r1=1.9&r2=1.10&diff_format=u
Index: phpdoc/en/reference/array/functions/array-intersect-assoc.xml
diff -u phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.9
phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.10
--- phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.9 Tue Oct
31 11:24:01 2006
+++ phpdoc/en/reference/array/functions/array-intersect-assoc.xml Tue Jan
30 09:06:51 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<refentry id="function.array-intersect-assoc">
<refnamediv>
<refname>array_intersect_assoc</refname>
@@ -28,12 +28,11 @@
$array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
$array2 = array("a" => "green", "yellow", "red");
$result_array = array_intersect_assoc($array1, $array2);
+print_r($result_array);
?>
]]>
</programlisting>
- <para>
- $result_array will look like:
- </para>
+ &example.outputs;
<screen>
<![CDATA[
Array
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-intersect-ukey.xml?r1=1.4&r2=1.5&diff_format=u
Index: phpdoc/en/reference/array/functions/array-intersect-ukey.xml
diff -u phpdoc/en/reference/array/functions/array-intersect-ukey.xml:1.4
phpdoc/en/reference/array/functions/array-intersect-ukey.xml:1.5
--- phpdoc/en/reference/array/functions/array-intersect-ukey.xml:1.4 Tue Oct
31 11:24:01 2006
+++ phpdoc/en/reference/array/functions/array-intersect-ukey.xml Tue Jan
30 09:06:51 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<refentry id="function.array-intersect-ukey">
<refnamediv>
<refname>array_intersect_ukey</refname>
@@ -56,7 +56,7 @@
int(1)
["green"]=>
int(3)
-})
+}
]]>
</screen>
</example>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-intersect.xml?r1=1.11&r2=1.12&diff_format=u
Index: phpdoc/en/reference/array/functions/array-intersect.xml
diff -u phpdoc/en/reference/array/functions/array-intersect.xml:1.11
phpdoc/en/reference/array/functions/array-intersect.xml:1.12
--- phpdoc/en/reference/array/functions/array-intersect.xml:1.11 Tue Oct
31 11:24:01 2006
+++ phpdoc/en/reference/array/functions/array-intersect.xml Tue Jan 30
09:06:51 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.14 -->
<refentry id="function.array-intersect">
<refnamediv>
@@ -29,12 +29,11 @@
$array1 = array("a" => "green", "red", "blue");
$array2 = array("b" => "green", "yellow", "red");
$result = array_intersect($array1, $array2);
+print_r($result);
?>
]]>
</programlisting>
- <para>
- This makes <varname>$result</varname> have
- </para>
+ &example.outputs;
<screen role="php">
<![CDATA[
Array
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-merge-recursive.xml?r1=1.9&r2=1.10&diff_format=u
Index: phpdoc/en/reference/array/functions/array-merge-recursive.xml
diff -u phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.9
phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.10
--- phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.9 Tue Oct
31 11:24:01 2006
+++ phpdoc/en/reference/array/functions/array-merge-recursive.xml Tue Jan
30 09:06:51 2007
@@ -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.12 -->
<refentry id="function.array-merge-recursive">
<refnamediv>
@@ -35,12 +35,11 @@
$ar1 = array("color" => array("favorite" => "red"), 5);
$ar2 = array(10, "color" => array("favorite" => "green", "blue"));
$result = array_merge_recursive($ar1, $ar2);
+print_r($result);
?>
]]>
</programlisting>
- <para>
- The <literal>$result</literal> will be:
- </para>
+ &example.outputs;
<screen role="php">
<