From 3ece7b1d9ba9acb324268f062a85c761183d5310 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Thu, 13 Dec 2007 17:49:45 +0000 Subject: [PATCH] Use a real entity (s/&reference.com.variant-arith;/&com.variant-arith;/g) git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@248157 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/com/functions/com-get.xml | 4 ++-- reference/com/functions/com-invoke.xml | 4 ++-- reference/com/functions/com-isenum.xml | 4 ++-- reference/com/functions/com-propget.xml | 4 ++-- reference/com/functions/com-propput.xml | 4 ++-- reference/com/functions/com-propset.xml | 4 ++-- reference/com/functions/com-set.xml | 4 ++-- reference/com/functions/variant-abs.xml | 4 ++-- reference/com/functions/variant-add.xml | 4 ++-- reference/com/functions/variant-and.xml | 4 ++-- reference/com/functions/variant-cat.xml | 4 ++-- reference/com/functions/variant-cmp.xml | 4 ++-- reference/com/functions/variant-div.xml | 4 ++-- reference/com/functions/variant-eqv.xml | 4 ++-- reference/com/functions/variant-fix.xml | 4 ++-- reference/com/functions/variant-idiv.xml | 4 ++-- reference/com/functions/variant-imp.xml | 4 ++-- reference/com/functions/variant-int.xml | 4 ++-- reference/com/functions/variant-mod.xml | 4 ++-- reference/com/functions/variant-mul.xml | 4 ++-- reference/com/functions/variant-neg.xml | 4 ++-- reference/com/functions/variant-not.xml | 4 ++-- reference/com/functions/variant-or.xml | 4 ++-- reference/com/functions/variant-pow.xml | 4 ++-- reference/com/functions/variant-round.xml | 4 ++-- reference/com/functions/variant-sub.xml | 4 ++-- reference/com/functions/variant-xor.xml | 4 ++-- reference/com/use-oo-instead.xml | 7 ------- reference/com/variant-arith.xml | 17 ----------------- 29 files changed, 54 insertions(+), 78 deletions(-) delete mode 100644 reference/com/use-oo-instead.xml delete mode 100644 reference/com/variant-arith.xml 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 @@ - + @@ -36,7 +36,7 @@ $var = com_get($obj, 'property'); - &reference.com.use-oo-instead; + &com.use-oo-instead; 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 @@ - + @@ -42,7 +42,7 @@ $val = com_invoke($obj, 'method', $one, $two); - &reference.com.use-oo-instead; + &com.use-oo-instead; 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 @@ - + @@ -22,7 +22,7 @@ This function does not exist in PHP 5; use the more natural foreach statement to iterate - over the contents of COM objects. See for + over the contents of COM objects. See for more details. 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 @@ - + @@ -13,7 +13,7 @@ &info.function.alias; com_get. - &reference.com.use-oo-instead; + &com.use-oo-instead; 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 @@ - + @@ -13,7 +13,7 @@ &info.function.alias; com_set. - &reference.com.use-oo-instead; + &com.use-oo-instead; 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 @@ - + @@ -13,7 +13,7 @@ &info.function.alias; com_set. - &reference.com.use-oo-instead; + &com.use-oo-instead; 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 @@ - + @@ -39,7 +39,7 @@ com_set($obj, 'property', $value); - &reference.com.use-oo-instead; + &com.use-oo-instead; 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 @@ - + variant_abs @@ -22,7 +22,7 @@ See also abs. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -65,7 +65,7 @@ See also variant_sub. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -47,7 +47,7 @@ See also variant_or. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -27,7 +27,7 @@ $left . $right. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -119,7 +119,7 @@ - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -72,7 +72,7 @@ - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -22,7 +22,7 @@ &false; is returned. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -38,7 +38,7 @@ - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -64,7 +64,7 @@ See also variant_div. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -43,7 +43,7 @@ - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -29,7 +29,7 @@ round. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -26,7 +26,7 @@ variant_idiv. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -69,7 +69,7 @@ variant_idiv. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -20,7 +20,7 @@ the result. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -21,7 +21,7 @@ result will also be &null;. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -46,7 +46,7 @@ See also variant_and, variant_xor. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -25,7 +25,7 @@ See also pow. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -25,7 +25,7 @@ See also round. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -64,7 +64,7 @@ See also variant_add. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - + @@ -42,7 +42,7 @@ See also variant_and, variant_or. - &reference.com.variant-arith; + &com.variant-arith; 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 @@ - - - - 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. - - 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 @@ - - - - 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 class. COM and DOTNET objects - will have the value of their default property taken and used as the variant value. - - - 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. - -