diff --git a/reference/com/functions/com-get.xml b/reference/com/functions/com-get.xml
index e8502e5327..f4fc42009c 100644
--- a/reference/com/functions/com-get.xml
+++ b/reference/com/functions/com-get.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/com.xml, last change in rev 1.7 -->
<refentry xml:id="function.com-get" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -36,7 +36,7 @@ $var = com_get($obj, 'property');
</example>
</para>
- &reference.com.use-oo-instead;
+ &com.use-oo-instead;
</refsect1>
</refentry>
diff --git a/reference/com/functions/com-invoke.xml b/reference/com/functions/com-invoke.xml
index 39f1b1c67d..c2193b9731 100644
--- a/reference/com/functions/com-invoke.xml
+++ b/reference/com/functions/com-invoke.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/com.xml, last change in rev 1.7 -->
<refentry xml:id="function.com-invoke" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -42,7 +42,7 @@ $val = com_invoke($obj, 'method', $one, $two);
</example>
</para>
- &reference.com.use-oo-instead;
+ &com.use-oo-instead;
</refsect1>
</refentry>
diff --git a/reference/com/functions/com-isenum.xml b/reference/com/functions/com-isenum.xml
index ede2e58210..56cc347fbd 100644
--- a/reference/com/functions/com-isenum.xml
+++ b/reference/com/functions/com-isenum.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/com.xml, last change in rev 1.27 -->
<refentry xml:id='function.com-isenum' xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -22,7 +22,7 @@
<para>
This function does not exist in PHP 5; use the more natural
<link linkend="control-structures.foreach">foreach</link> statement to iterate
- over the contents of COM objects. See <xref linkend="com.foreach"/> for
+ over the contents of COM objects. See <xref linkend="com.examples.foreach"/> for
more details.
</para>
</note>
diff --git a/reference/com/functions/com-propget.xml b/reference/com/functions/com-propget.xml
index 58b328c3c2..d931df9318 100644
--- a/reference/com/functions/com-propget.xml
+++ b/reference/com/functions/com-propget.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/com.xml, last change in rev 1.7 -->
<refentry xml:id="function.com-propget" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -13,7 +13,7 @@
&info.function.alias;
<function>com_get</function>.
</simpara>
- &reference.com.use-oo-instead;
+ &com.use-oo-instead;
</refsect1>
</refentry>
diff --git a/reference/com/functions/com-propput.xml b/reference/com/functions/com-propput.xml
index c247fee7a3..2d677b7d19 100644
--- a/reference/com/functions/com-propput.xml
+++ b/reference/com/functions/com-propput.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/com.xml, last change in rev 1.7 -->
<refentry xml:id="function.com-propput" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -13,7 +13,7 @@
&info.function.alias;
<function>com_set</function>.
</simpara>
- &reference.com.use-oo-instead;
+ &com.use-oo-instead;
</refsect1>
</refentry>
diff --git a/reference/com/functions/com-propset.xml b/reference/com/functions/com-propset.xml
index 2d3aa24f50..f0fa3a1484 100644
--- a/reference/com/functions/com-propset.xml
+++ b/reference/com/functions/com-propset.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/com.xml, last change in rev 1.7 -->
<refentry xml:id="function.com-propset" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -13,7 +13,7 @@
&info.function.alias;
<function>com_set</function>.
</simpara>
- &reference.com.use-oo-instead;
+ &com.use-oo-instead;
</refsect1>
</refentry>
diff --git a/reference/com/functions/com-set.xml b/reference/com/functions/com-set.xml
index 5286413106..c571f8aa08 100644
--- a/reference/com/functions/com-set.xml
+++ b/reference/com/functions/com-set.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/com.xml, last change in rev 1.7 -->
<refentry xml:id="function.com-set" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -39,7 +39,7 @@ com_set($obj, 'property', $value);
</para>
- &reference.com.use-oo-instead;
+ &com.use-oo-instead;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-abs.xml b/reference/com/functions/variant-abs.xml
index 52bf78fe8b..99b8dd445d 100644
--- a/reference/com/functions/variant-abs.xml
+++ b/reference/com/functions/variant-abs.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry xml:id="function.variant-abs" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>variant_abs</refname>
@@ -22,7 +22,7 @@
See also <function>abs</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-add.xml b/reference/com/functions/variant-add.xml
index 0cfa378093..621bf5451e 100644
--- a/reference/com/functions/variant-add.xml
+++ b/reference/com/functions/variant-add.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-add" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -65,7 +65,7 @@
See also <function>variant_sub</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-and.xml b/reference/com/functions/variant-and.xml
index 5e1bf97960..00879fd27f 100644
--- a/reference/com/functions/variant-and.xml
+++ b/reference/com/functions/variant-and.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-and" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -47,7 +47,7 @@
See also <function>variant_or</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-cat.xml b/reference/com/functions/variant-cat.xml
index ecce68093f..3d0daa709f 100644
--- a/reference/com/functions/variant-cat.xml
+++ b/reference/com/functions/variant-cat.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-cat" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -27,7 +27,7 @@
<parameter>$left</parameter> <literal>.</literal> <parameter>$right</parameter>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-cmp.xml b/reference/com/functions/variant-cmp.xml
index 1a721a553d..c2b287f1ef 100644
--- a/reference/com/functions/variant-cmp.xml
+++ b/reference/com/functions/variant-cmp.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-cmp" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -119,7 +119,7 @@
</table>
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-div.xml b/reference/com/functions/variant-div.xml
index 684c51bc62..982f53717d 100644
--- a/reference/com/functions/variant-div.xml
+++ b/reference/com/functions/variant-div.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-div" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -72,7 +72,7 @@
</table>
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-eqv.xml b/reference/com/functions/variant-eqv.xml
index 34708c37cc..9966726cf2 100644
--- a/reference/com/functions/variant-eqv.xml
+++ b/reference/com/functions/variant-eqv.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-eqv" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -22,7 +22,7 @@
&false; is returned.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-fix.xml b/reference/com/functions/variant-fix.xml
index 301305285e..91df0f9bd8 100644
--- a/reference/com/functions/variant-fix.xml
+++ b/reference/com/functions/variant-fix.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-fix" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -38,7 +38,7 @@
</simpara>
</warning>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-idiv.xml b/reference/com/functions/variant-idiv.xml
index 6dd5aa9ccc..0767ff2e10 100644
--- a/reference/com/functions/variant-idiv.xml
+++ b/reference/com/functions/variant-idiv.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-idiv" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -64,7 +64,7 @@
<para>
See also <function>variant_div</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-imp.xml b/reference/com/functions/variant-imp.xml
index 0567a1adc6..32bfd40145 100644
--- a/reference/com/functions/variant-imp.xml
+++ b/reference/com/functions/variant-imp.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-imp" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -43,7 +43,7 @@
</table>
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-int.xml b/reference/com/functions/variant-int.xml
index 8ee35b961b..786360d020 100644
--- a/reference/com/functions/variant-int.xml
+++ b/reference/com/functions/variant-int.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-int" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -29,7 +29,7 @@
<function>round</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-mod.xml b/reference/com/functions/variant-mod.xml
index 98c8ca4ad8..9b310aa7bf 100644
--- a/reference/com/functions/variant-mod.xml
+++ b/reference/com/functions/variant-mod.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-mod" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -26,7 +26,7 @@
<function>variant_idiv</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-mul.xml b/reference/com/functions/variant-mul.xml
index d3c6df3c52..c0b3e95957 100644
--- a/reference/com/functions/variant-mul.xml
+++ b/reference/com/functions/variant-mul.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-mul" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -69,7 +69,7 @@
<function>variant_idiv</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-neg.xml b/reference/com/functions/variant-neg.xml
index 940b05b1c2..3aea402b6d 100644
--- a/reference/com/functions/variant-neg.xml
+++ b/reference/com/functions/variant-neg.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-neg" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -20,7 +20,7 @@
the result.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-not.xml b/reference/com/functions/variant-not.xml
index ad4eb0a150..2b5017e4e8 100644
--- a/reference/com/functions/variant-not.xml
+++ b/reference/com/functions/variant-not.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-not" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -21,7 +21,7 @@
result will also be &null;.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-or.xml b/reference/com/functions/variant-or.xml
index 2223bde5bc..7ecaa3b7d1 100644
--- a/reference/com/functions/variant-or.xml
+++ b/reference/com/functions/variant-or.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-or" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -46,7 +46,7 @@
See also <function>variant_and</function>,
<function>variant_xor</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-pow.xml b/reference/com/functions/variant-pow.xml
index 7cb9330da5..07287763e9 100644
--- a/reference/com/functions/variant-pow.xml
+++ b/reference/com/functions/variant-pow.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-pow" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -25,7 +25,7 @@
See also <function>pow</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-round.xml b/reference/com/functions/variant-round.xml
index 6b15351fc3..8d843db414 100644
--- a/reference/com/functions/variant-round.xml
+++ b/reference/com/functions/variant-round.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-round" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -25,7 +25,7 @@
See also <function>round</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-sub.xml b/reference/com/functions/variant-sub.xml
index ff576e4c2c..4c0afc5647 100644
--- a/reference/com/functions/variant-sub.xml
+++ b/reference/com/functions/variant-sub.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-sub" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -64,7 +64,7 @@
See also <function>variant_add</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/functions/variant-xor.xml b/reference/com/functions/variant-xor.xml
index 490384970f..9c8d47d2b8 100644
--- a/reference/com/functions/variant-xor.xml
+++ b/reference/com/functions/variant-xor.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.variant-xor" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -42,7 +42,7 @@
See also <function>variant_and</function>,
<function>variant_or</function>.
</para>
- &reference.com.variant-arith;
+ &com.variant-arith;
</refsect1>
</refentry>
diff --git a/reference/com/use-oo-instead.xml b/reference/com/use-oo-instead.xml
deleted file mode 100644
index f1f3ddd465..0000000000
--- a/reference/com/use-oo-instead.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Revision: 1.3 $ -->
-<note xmlns="http://docbook.org/ns/docbook">
- <simpara>
- This function does not exist in PHP 5; instead, you should use the regular
- and more natural OO syntax to access properties or call methods.
- </simpara>
-</note>
diff --git a/reference/com/variant-arith.xml b/reference/com/variant-arith.xml
deleted file mode 100644
index 27316e5c72..0000000000
--- a/reference/com/variant-arith.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- $Revision: 1.3 $ -->
-<note xmlns="http://docbook.org/ns/docbook">
-<para>
- As with all the variant arithmetic functions, the parameters for this function
- can be either a PHP native type (integer, string, floating point, boolean or
- &null;), or an instance of a COM, VARIANT or DOTNET class. PHP native types
- will be converted to variants using the same rules as found in the constructor
- for the <xref linkend="class.variant"/> class. COM and DOTNET objects
- will have the value of their default property taken and used as the variant value.
-</para>
-<para>
- The variant arithmetic functions are wrappers around the similarly named
- functions in the COM library; for more information on these functions, consult
- the MSDN library. The PHP functions are named slightly differently; for example
- variant_add() in PHP corresponds to VarAdd() in the MSDN documentation.
-</para>
-</note>