From c148211fa2b34707c93383ab21d31ffc02aa8b6e Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Wed, 10 Nov 2004 08:30:50 +0000
Subject: [PATCH] Replace <parameter>&amp; by <parameter role="reference">

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@172416 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/array/functions/array-pop.xml                |  4 ++--
 reference/array/functions/array-push.xml               |  4 ++--
 reference/array/functions/array-shift.xml              |  4 ++--
 reference/array/functions/array-splice.xml             |  4 ++--
 reference/array/functions/array-unshift.xml            |  4 ++--
 reference/array/functions/array-walk-recursive.xml     |  4 ++--
 reference/array/functions/array-walk.xml               |  4 ++--
 reference/array/functions/arsort.xml                   |  4 ++--
 reference/array/functions/asort.xml                    |  4 ++--
 reference/array/functions/current.xml                  |  4 ++--
 reference/array/functions/each.xml                     |  4 ++--
 reference/array/functions/end.xml                      |  4 ++--
 reference/array/functions/key.xml                      |  4 ++--
 reference/array/functions/krsort.xml                   |  4 ++--
 reference/array/functions/ksort.xml                    |  4 ++--
 reference/array/functions/natcasesort.xml              |  4 ++--
 reference/array/functions/natsort.xml                  |  4 ++--
 reference/array/functions/next.xml                     |  4 ++--
 reference/array/functions/prev.xml                     |  4 ++--
 reference/array/functions/reset.xml                    |  4 ++--
 reference/array/functions/rsort.xml                    |  4 ++--
 reference/array/functions/shuffle.xml                  |  4 ++--
 reference/array/functions/sort.xml                     |  4 ++--
 reference/array/functions/uasort.xml                   |  4 ++--
 reference/array/functions/uksort.xml                   |  4 ++--
 reference/array/functions/usort.xml                    |  4 ++--
 .../classobj/functions/call-user-method-array.xml      |  4 ++--
 reference/classobj/functions/call-user-method.xml      |  4 ++--
 reference/curl/functions/curl-multi-exec.xml           |  4 ++--
 reference/dbplus/functions/dbplus-curr.xml             |  4 ++--
 reference/dbplus/functions/dbplus-first.xml            |  4 ++--
 reference/dbplus/functions/dbplus-info.xml             |  4 ++--
 reference/dbplus/functions/dbplus-last.xml             |  4 ++--
 reference/dbplus/functions/dbplus-next.xml             |  4 ++--
 reference/dbplus/functions/dbplus-prev.xml             |  4 ++--
 reference/dbplus/functions/dbplus-tremove.xml          |  4 ++--
 reference/domxml/functions/domxml-open-file.xml        |  4 ++--
 reference/domxml/functions/domxml-open-mem.xml         |  4 ++--
 reference/exec/functions/exec.xml                      |  6 +++---
 reference/exec/functions/passthru.xml                  |  4 ++--
 reference/exec/functions/proc-open.xml                 |  4 ++--
 reference/exec/functions/system.xml                    |  4 ++--
 reference/filesystem/functions/flock.xml               |  4 ++--
 reference/filesystem/functions/fscanf.xml              |  4 ++--
 reference/ftp/functions/ftp-alloc.xml                  |  4 ++--
 reference/gmp/functions/gmp-clrbit.xml                 |  4 ++--
 reference/gmp/functions/gmp-setbit.xml                 |  4 ++--
 reference/http/functions/headers-sent.xml              |  6 +++---
 reference/image/functions/getimagesize.xml             |  4 ++--
 reference/ldap/functions/ldap-first-attribute.xml      |  4 ++--
 reference/ldap/functions/ldap-get-option.xml           |  4 ++--
 reference/ldap/functions/ldap-next-attribute.xml       |  4 ++--
 reference/ldap/functions/ldap-parse-reference.xml      |  4 ++--
 reference/ldap/functions/ldap-parse-result.xml         | 10 +++++-----
 reference/mbstring/functions/mb-convert-variables.xml  |  6 +++---
 reference/mbstring/functions/mb-parse-str.xml          |  4 ++--
 .../mcve/functions/mcve-completeauthorizations.xml     |  4 ++--
 reference/misc/functions/php-check-syntax.xml          |  4 ++--
 reference/mssql/functions/mssql-bind.xml               |  4 ++--
 reference/mysqli/functions/mysqli-stmt-bind-param.xml  | 10 +++++-----
 reference/mysqli/functions/mysqli-stmt-bind-result.xml | 10 +++++-----
 reference/ncurses/functions/ncurses-color-content.xml  |  8 ++++----
 reference/ncurses/functions/ncurses-getmaxyx.xml       | 10 +++++-----
 reference/ncurses/functions/ncurses-getmouse.xml       |  4 ++--
 reference/ncurses/functions/ncurses-getyx.xml          |  6 +++---
 reference/ncurses/functions/ncurses-instr.xml          |  4 ++--
 reference/ncurses/functions/ncurses-mouse-trafo.xml    |  6 +++---
 reference/ncurses/functions/ncurses-mousemask.xml      |  4 ++--
 reference/ncurses/functions/ncurses-pair-content.xml   |  6 +++---
 reference/ncurses/functions/ncurses-wmouse-trafo.xml   |  6 +++---
 reference/network/functions/dns-get-mx.xml             |  6 +++---
 reference/network/functions/dns-get-record.xml         |  6 +++---
 reference/network/functions/fsockopen.xml              |  6 +++---
 reference/network/functions/getmxrr.xml                |  6 +++---
 reference/network/functions/pfsockopen.xml             |  6 +++---
 reference/oci8/functions/oci-bind-by-name.xml          |  4 ++--
 reference/oci8/functions/oci-define-by-name.xml        |  4 ++--
 reference/oci8/functions/oci-fetch-all.xml             |  4 ++--
 reference/oci8/functions/ocibindbyname.xml             |  4 ++--
 reference/oci8/functions/ocidefinebyname.xml           |  4 ++--
 reference/oci8/functions/ocifetchinto.xml              |  4 ++--
 reference/oci8/functions/ocifetchstatement.xml         |  4 ++--
 reference/openssl/functions/openssl-csr-export.xml     |  4 ++--
 reference/openssl/functions/openssl-csr-new.xml        |  4 ++--
 reference/openssl/functions/openssl-open.xml           |  4 ++--
 reference/openssl/functions/openssl-pkey-export.xml    |  4 ++--
 .../openssl/functions/openssl-private-decrypt.xml      |  4 ++--
 .../openssl/functions/openssl-private-encrypt.xml      |  4 ++--
 reference/openssl/functions/openssl-public-decrypt.xml |  4 ++--
 reference/openssl/functions/openssl-public-encrypt.xml |  4 ++--
 reference/openssl/functions/openssl-seal.xml           |  6 +++---
 reference/openssl/functions/openssl-sign.xml           |  4 ++--
 reference/openssl/functions/openssl-x509-export.xml    |  4 ++--
 reference/oracle/functions/ora-fetch-into.xml          |  4 ++--
 reference/ovrimos/functions/ovrimos-fetch-into.xml     |  4 ++--
 reference/parsekit/functions/parsekit-compile-file.xml |  6 +++---
 .../parsekit/functions/parsekit-compile-string.xml     |  6 +++---
 reference/pcntl/functions/pcntl-wait.xml               |  4 ++--
 reference/pcntl/functions/pcntl-waitpid.xml            |  4 ++--
 reference/pcre/functions/preg-match-all.xml            |  4 ++--
 reference/pcre/functions/preg-match.xml                |  4 ++--
 reference/regex/functions/ereg.xml                     |  4 ++--
 reference/regex/functions/eregi.xml                    |  4 ++--
 reference/sem/functions/msg-receive.xml                |  8 ++++----
 reference/sem/functions/msg-send.xml                   |  4 ++--
 reference/sockets/functions/socket-create-pair.xml     |  6 +++---
 reference/sockets/functions/socket-getpeername.xml     |  6 +++---
 reference/sockets/functions/socket-getsockname.xml     |  6 +++---
 reference/sockets/functions/socket-recv.xml            |  4 ++--
 reference/sockets/functions/socket-recvfrom.xml        |  8 ++++----
 reference/sockets/functions/socket-select.xml          |  8 ++++----
 reference/sqlite/functions/sqlite-factory.xml          |  4 ++--
 reference/sqlite/functions/sqlite-open.xml             |  4 ++--
 reference/sqlite/functions/sqlite-popen.xml            |  4 ++--
 reference/stream/functions/stream-filter-register.xml  |  4 ++--
 reference/stream/functions/stream-select.xml           |  8 ++++----
 reference/stream/functions/stream-socket-accept.xml    |  4 ++--
 reference/stream/functions/stream-socket-client.xml    |  6 +++---
 reference/stream/functions/stream-socket-recvfrom.xml  |  4 ++--
 reference/stream/functions/stream-socket-server.xml    |  6 +++---
 reference/strings/functions/parse-str.xml              |  4 ++--
 reference/strings/functions/similar-text.xml           |  4 ++--
 reference/strings/functions/sscanf.xml                 |  4 ++--
 reference/strings/functions/str-ireplace.xml           |  4 ++--
 reference/strings/functions/str-replace.xml            |  4 ++--
 reference/uodbc/functions/odbc-fetch-into.xml          |  6 +++---
 reference/var/functions/is-callable.xml                |  4 ++--
 reference/var/functions/settype.xml                    |  4 ++--
 reference/xdiff/functions/xdiff-string-merge3.xml      |  4 ++--
 reference/xdiff/functions/xdiff-string-patch.xml       |  4 ++--
 reference/xml/functions/xml-parse-into-struct.xml      |  6 +++---
 reference/xml/functions/xml-set-object.xml             |  4 ++--
 reference/xmlrpc/functions/xmlrpc-decode-request.xml   |  4 ++--
 reference/xmlrpc/functions/xmlrpc-set-type.xml         |  4 ++--
 reference/xslt/functions/xslt-set-object.xml           |  4 ++--
 reference/yaz/functions/yaz-ccl-parse.xml              |  4 ++--
 reference/yaz/functions/yaz-scan-result.xml            |  4 ++--
 reference/yaz/functions/yaz-wait.xml                   |  4 ++--
 138 files changed, 320 insertions(+), 320 deletions(-)

diff --git a/reference/array/functions/array-pop.xml b/reference/array/functions/array-pop.xml
index 14118e00d6..c7db65eb15 100644
--- a/reference/array/functions/array-pop.xml
+++ b/reference/array/functions/array-pop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-pop">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>array_pop</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>array_pop</function> pops and returns the last value of
diff --git a/reference/array/functions/array-push.xml b/reference/array/functions/array-push.xml
index d97043f6f7..189e2d3b1b 100644
--- a/reference/array/functions/array-push.xml
+++ b/reference/array/functions/array-push.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-push">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>array_push</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
       <methodparam choice="opt"><type>mixed</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/array/functions/array-shift.xml b/reference/array/functions/array-shift.xml
index 3d209e9e3c..800d67511b 100644
--- a/reference/array/functions/array-shift.xml
+++ b/reference/array/functions/array-shift.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-shift">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>array_shift</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>array_shift</function> shifts the first value of the
diff --git a/reference/array/functions/array-splice.xml b/reference/array/functions/array-splice.xml
index a589147baa..6de52fbb86 100644
--- a/reference/array/functions/array-splice.xml
+++ b/reference/array/functions/array-splice.xml
@@ -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.14 -->
   <refentry id="function.array-splice">
    <refnamediv>
@@ -13,7 +13,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>array_splice</methodname>
-      <methodparam><type>array</type><parameter>&amp;input</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">input</parameter></methodparam>
       <methodparam><type>int</type><parameter>offset</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>
diff --git a/reference/array/functions/array-unshift.xml b/reference/array/functions/array-unshift.xml
index 64d958d412..61aa835d9f 100644
--- a/reference/array/functions/array-unshift.xml
+++ b/reference/array/functions/array-unshift.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-unshift">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>array_unshift</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
       <methodparam choice="opt"><type>mixed</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/array/functions/array-walk-recursive.xml b/reference/array/functions/array-walk-recursive.xml
index 057a0b0c7c..5b484ea431 100755
--- a/reference/array/functions/array-walk-recursive.xml
+++ b/reference/array/functions/array-walk-recursive.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <refentry id="function.array-walk-recursive">
  <refnamediv>
   <refname>array_walk_recursive</refname>
@@ -11,7 +11,7 @@
   <title>Description</title>
   <methodsynopsis>
    <type>bool</type><methodname>array_walk_recursive</methodname>
-   <methodparam><type>array</type><parameter>&amp;input</parameter></methodparam>
+   <methodparam><type>array</type><parameter role="reference">input</parameter></methodparam>
    <methodparam><type>callback</type><parameter>funcname</parameter></methodparam>
    <methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/array/functions/array-walk.xml b/reference/array/functions/array-walk.xml
index 1a2eb2cf87..952f98869a 100644
--- a/reference/array/functions/array-walk.xml
+++ b/reference/array/functions/array-walk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-walk">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>bool</type><methodname>array_walk</methodname>
-     <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      <methodparam><type>callback</type><parameter>funcname</parameter></methodparam>
      <methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter></methodparam>
     </methodsynopsis>
diff --git a/reference/array/functions/arsort.xml b/reference/array/functions/arsort.xml
index 593eed21fd..964adb53d3 100644
--- a/reference/array/functions/arsort.xml
+++ b/reference/array/functions/arsort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.arsort">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>arsort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/asort.xml b/reference/array/functions/asort.xml
index 4f85ad4faa..9a0155f642 100644
--- a/reference/array/functions/asort.xml
+++ b/reference/array/functions/asort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.asort">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>asort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/current.xml b/reference/array/functions/current.xml
index d0d7071f25..f6212a61cf 100644
--- a/reference/array/functions/current.xml
+++ b/reference/array/functions/current.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.current">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>current</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      Every array has an internal pointer to its "current" element,
diff --git a/reference/array/functions/each.xml b/reference/array/functions/each.xml
index dc03fb224e..ee7966cf8f 100644
--- a/reference/array/functions/each.xml
+++ b/reference/array/functions/each.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.each">
    <refnamediv>
@@ -13,7 +13,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>each</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the current key and value pair from the array
diff --git a/reference/array/functions/end.xml b/reference/array/functions/end.xml
index 68f9898761..9d6e86b5fd 100644
--- a/reference/array/functions/end.xml
+++ b/reference/array/functions/end.xml
@@ -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.2 -->
   <refentry id="function.end">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>end</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>end</function> advances <parameter>array</parameter>'s
diff --git a/reference/array/functions/key.xml b/reference/array/functions/key.xml
index 749a85cb85..824ae76d32 100644
--- a/reference/array/functions/key.xml
+++ b/reference/array/functions/key.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.key">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>key</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>key</function> returns the index element of the
diff --git a/reference/array/functions/krsort.xml b/reference/array/functions/krsort.xml
index 4eb7c760d3..9577e9a134 100644
--- a/reference/array/functions/krsort.xml
+++ b/reference/array/functions/krsort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.krsort">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>krsort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/ksort.xml b/reference/array/functions/ksort.xml
index 2cc7c7b0b0..5b1c6aeb71 100644
--- a/reference/array/functions/ksort.xml
+++ b/reference/array/functions/ksort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.ksort">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>ksort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/natcasesort.xml b/reference/array/functions/natcasesort.xml
index 7094bd1aa7..0806a27ffb 100644
--- a/reference/array/functions/natcasesort.xml
+++ b/reference/array/functions/natcasesort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.25 -->
   <refentry id="function.natcasesort">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>void</type><methodname>natcasesort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function implements a sort algorithm that orders
diff --git a/reference/array/functions/natsort.xml b/reference/array/functions/natsort.xml
index ede1448ab4..a2dd9309a0 100644
--- a/reference/array/functions/natsort.xml
+++ b/reference/array/functions/natsort.xml
@@ -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.25 -->
   <refentry id="function.natsort">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>void</type><methodname>natsort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function implements a sort algorithm that orders
diff --git a/reference/array/functions/next.xml b/reference/array/functions/next.xml
index 961e5f628e..4e8715aeea 100644
--- a/reference/array/functions/next.xml
+++ b/reference/array/functions/next.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.next">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>next</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the array value in the next place that's pointed to by the
diff --git a/reference/array/functions/prev.xml b/reference/array/functions/prev.xml
index cacfbe4a88..91fc9abfed 100644
--- a/reference/array/functions/prev.xml
+++ b/reference/array/functions/prev.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.prev">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>prev</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the array value in the previous place that's pointed to by
diff --git a/reference/array/functions/reset.xml b/reference/array/functions/reset.xml
index f017c2889d..f3ae2e09b8 100644
--- a/reference/array/functions/reset.xml
+++ b/reference/array/functions/reset.xml
@@ -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.reset">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>reset</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>reset</function> rewinds <parameter>array</parameter>'s
diff --git a/reference/array/functions/rsort.xml b/reference/array/functions/rsort.xml
index db00008b37..73a185b4cf 100644
--- a/reference/array/functions/rsort.xml
+++ b/reference/array/functions/rsort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.rsort">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>rsort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/shuffle.xml b/reference/array/functions/shuffle.xml
index 82878d9cd9..a4b4806e44 100644
--- a/reference/array/functions/shuffle.xml
+++ b/reference/array/functions/shuffle.xml
@@ -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.2 -->
   <refentry id="function.shuffle">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>shuffle</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function shuffles (randomizes the order of the elements in)
diff --git a/reference/array/functions/sort.xml b/reference/array/functions/sort.xml
index 58c50ea60d..ef4c36ea0a 100644
--- a/reference/array/functions/sort.xml
+++ b/reference/array/functions/sort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.sort">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>sort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/uasort.xml b/reference/array/functions/uasort.xml
index 058bbe7f0c..6437ec9f12 100644
--- a/reference/array/functions/uasort.xml
+++ b/reference/array/functions/uasort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.uasort">
    <refnamediv>
@@ -13,7 +13,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>uasort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam><type>callback</type><parameter>cmp_function</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/uksort.xml b/reference/array/functions/uksort.xml
index 33c0feda2d..7de32ed52c 100644
--- a/reference/array/functions/uksort.xml
+++ b/reference/array/functions/uksort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.uksort">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>uksort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam><type>callback</type><parameter>cmp_function</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/array/functions/usort.xml b/reference/array/functions/usort.xml
index d2572d1430..ae485b3c96 100644
--- a/reference/array/functions/usort.xml
+++ b/reference/array/functions/usort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.usort">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>usort</methodname>
-      <methodparam><type>array</type><parameter>&amp;array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
       <methodparam><type>callback</type><parameter>cmp_function</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/classobj/functions/call-user-method-array.xml b/reference/classobj/functions/call-user-method-array.xml
index 42535acea0..fedc44f861 100644
--- a/reference/classobj/functions/call-user-method-array.xml
+++ b/reference/classobj/functions/call-user-method-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/classobj.xml, last change in rev 1.36 -->
   <refentry id="function.call-user-method-array">
    <refnamediv>
@@ -13,7 +13,7 @@
      <methodsynopsis>
       <type>mixed</type><methodname>call_user_method_array</methodname>
       <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-      <methodparam><type>object</type><parameter>&amp;obj</parameter></methodparam>
+      <methodparam><type>object</type><parameter role="reference">obj</parameter></methodparam>
       <methodparam><type>array</type><parameter>paramarr</parameter></methodparam>
      </methodsynopsis>
     <warning>
diff --git a/reference/classobj/functions/call-user-method.xml b/reference/classobj/functions/call-user-method.xml
index c66583215c..253a0a90aa 100644
--- a/reference/classobj/functions/call-user-method.xml
+++ b/reference/classobj/functions/call-user-method.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/classobj.xml, last change in rev 1.4 -->
   <refentry id="function.call-user-method">
    <refnamediv>
@@ -13,7 +13,7 @@
      <methodsynopsis>
       <type>mixed</type><methodname>call_user_method</methodname>
       <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-      <methodparam><type>object</type><parameter>&amp;obj</parameter></methodparam>
+      <methodparam><type>object</type><parameter role="reference">obj</parameter></methodparam>
       <methodparam choice="opt"><type>mixed</type><parameter>parameter</parameter></methodparam>
       <methodparam choice="opt"><type>mixed</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/curl/functions/curl-multi-exec.xml b/reference/curl/functions/curl-multi-exec.xml
index 26e3e08808..29b00dbc3e 100644
--- a/reference/curl/functions/curl-multi-exec.xml
+++ b/reference/curl/functions/curl-multi-exec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.curl-multi-exec">
    <refnamediv>
     <refname>curl_multi_exec</refname>
@@ -12,7 +12,7 @@
      <methodsynopsis>
       <type>int</type><methodname>curl_multi_exec</methodname>
       <methodparam><type>resource</type><parameter>mh</parameter></methodparam>
-      <methodparam><type>int</type><parameter>&amp;still_running</parameter></methodparam>
+      <methodparam><type>int</type><parameter role="reference">still_running</parameter></methodparam>
      </methodsynopsis>
     
     &warn.undocumented.func;
diff --git a/reference/dbplus/functions/dbplus-curr.xml b/reference/dbplus/functions/dbplus-curr.xml
index b94e1140b4..4ed8642ef5 100644
--- a/reference/dbplus/functions/dbplus-curr.xml
+++ b/reference/dbplus/functions/dbplus-curr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-curr">
    <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>int</type><methodname>dbplus_curr</methodname>
      <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;tuple</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/dbplus/functions/dbplus-first.xml b/reference/dbplus/functions/dbplus-first.xml
index 4749a207f0..1ec5005596 100644
--- a/reference/dbplus/functions/dbplus-first.xml
+++ b/reference/dbplus/functions/dbplus-first.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-first">
    <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>int</type><methodname>dbplus_first</methodname>
      <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;tuple</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/dbplus/functions/dbplus-info.xml b/reference/dbplus/functions/dbplus-info.xml
index 9b783b5e0b..f42acecc64 100644
--- a/reference/dbplus/functions/dbplus-info.xml
+++ b/reference/dbplus/functions/dbplus-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-info">
    <refnamediv>
@@ -12,7 +12,7 @@
      <type>int</type><methodname>dbplus_info</methodname>
      <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
      <methodparam><type>string</type><parameter>key</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;result</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">result</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     &warn.undocumented.func;
diff --git a/reference/dbplus/functions/dbplus-last.xml b/reference/dbplus/functions/dbplus-last.xml
index 5487fda13d..25b436b510 100644
--- a/reference/dbplus/functions/dbplus-last.xml
+++ b/reference/dbplus/functions/dbplus-last.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-last">
    <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>int</type><methodname>dbplus_last</methodname>
      <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;tuple</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/dbplus/functions/dbplus-next.xml b/reference/dbplus/functions/dbplus-next.xml
index 2d81916c62..63d191ebfe 100644
--- a/reference/dbplus/functions/dbplus-next.xml
+++ b/reference/dbplus/functions/dbplus-next.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-next">
    <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>int</type><methodname>dbplus_next</methodname>
      <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;tuple</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/dbplus/functions/dbplus-prev.xml b/reference/dbplus/functions/dbplus-prev.xml
index 77ffb08180..8f92ea0aaf 100644
--- a/reference/dbplus/functions/dbplus-prev.xml
+++ b/reference/dbplus/functions/dbplus-prev.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-prev">
    <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>int</type><methodname>dbplus_prev</methodname>
      <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;tuple</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">tuple</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/dbplus/functions/dbplus-tremove.xml b/reference/dbplus/functions/dbplus-tremove.xml
index aff704eddf..0cb74d280e 100644
--- a/reference/dbplus/functions/dbplus-tremove.xml
+++ b/reference/dbplus/functions/dbplus-tremove.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-tremove">
    <refnamediv>
@@ -12,7 +12,7 @@
      <type>int</type><methodname>dbplus_tremove</methodname>
      <methodparam><type>resource</type><parameter>relation</parameter></methodparam>
      <methodparam><type>array</type><parameter>tuple</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>&amp;current</parameter></methodparam>
+     <methodparam choice="opt"><type>array</type><parameter role="reference">current</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/domxml/functions/domxml-open-file.xml b/reference/domxml/functions/domxml-open-file.xml
index 04d6130a99..ad9d08c3ea 100644
--- a/reference/domxml/functions/domxml-open-file.xml
+++ b/reference/domxml/functions/domxml-open-file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.1 -->
   <refentry id="function.domxml-open-file">
    <refnamediv>
@@ -12,7 +12,7 @@
      <type>object</type><methodname>domxml_open_file</methodname>
      <methodparam><type>string</type><parameter>filename</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>&amp;error</parameter></methodparam>
+     <methodparam choice="opt"><type>array</type><parameter role="reference">error</parameter></methodparam>
     </methodsynopsis>
     <para>
      The function parses the XML document in the file named
diff --git a/reference/domxml/functions/domxml-open-mem.xml b/reference/domxml/functions/domxml-open-mem.xml
index c9a935bcd7..a95c3de674 100644
--- a/reference/domxml/functions/domxml-open-mem.xml
+++ b/reference/domxml/functions/domxml-open-mem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.1 -->
   <refentry id="function.domxml-open-mem">
    <refnamediv>
@@ -12,7 +12,7 @@
      <type>object</type><methodname>domxml_open_mem</methodname>
      <methodparam><type>string</type><parameter>str</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>&amp;error</parameter></methodparam>
+     <methodparam choice="opt"><type>array</type><parameter role="reference">error</parameter></methodparam>
     </methodsynopsis>
     <para>
      The function parses the XML document in
diff --git a/reference/exec/functions/exec.xml b/reference/exec/functions/exec.xml
index 69d300c8a0..c2d7145ebc 100644
--- a/reference/exec/functions/exec.xml
+++ b/reference/exec/functions/exec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <!-- splitted from ./en/functions/exec.xml, last change in rev 1.2 -->
   <refentry id="function.exec">
    <refnamediv>
@@ -11,8 +11,8 @@
      <methodsynopsis>
       <type>string</type><methodname>exec</methodname>
       <methodparam><type>string</type><parameter>command</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;output</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;return_var</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">output</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">return_var</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>exec</function> executes the given
diff --git a/reference/exec/functions/passthru.xml b/reference/exec/functions/passthru.xml
index a0b342d218..1a771f8bf4 100644
--- a/reference/exec/functions/passthru.xml
+++ b/reference/exec/functions/passthru.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/exec.xml, last change in rev 1.2 -->
   <refentry id="function.passthru">
    <refnamediv>
@@ -13,7 +13,7 @@
      <methodsynopsis>
       <type>void</type><methodname>passthru</methodname>
       <methodparam><type>string</type><parameter>command</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;return_var</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">return_var</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>passthru</function> function is similar to the
diff --git a/reference/exec/functions/proc-open.xml b/reference/exec/functions/proc-open.xml
index d06217d827..a9aeffb997 100644
--- a/reference/exec/functions/proc-open.xml
+++ b/reference/exec/functions/proc-open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/exec.xml, last change in rev 1.28 -->
   <refentry id='function.proc-open'>
    <refnamediv>
@@ -14,7 +14,7 @@
       <type>resource</type><methodname>proc_open</methodname>
       <methodparam><type>string</type><parameter>cmd</parameter></methodparam>
       <methodparam><type>array</type><parameter>descriptorspec</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;pipes</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">pipes</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>cwd</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>env</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>other_options</parameter></methodparam>
diff --git a/reference/exec/functions/system.xml b/reference/exec/functions/system.xml
index 123388f8ce..2e77140f09 100644
--- a/reference/exec/functions/system.xml
+++ b/reference/exec/functions/system.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/exec.xml, last change in rev 1.24 -->
   <refentry id="function.system">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>string</type><methodname>system</methodname>
       <methodparam><type>string</type><parameter>command</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;return_var</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">return_var</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>system</function> is just like the C version of the
diff --git a/reference/filesystem/functions/flock.xml b/reference/filesystem/functions/flock.xml
index 22c15e2774..3330cdb530 100644
--- a/reference/filesystem/functions/flock.xml
+++ b/reference/filesystem/functions/flock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.flock">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>bool</type><methodname>flock</methodname>
       <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>int</type><parameter>operation</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;wouldblock</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">wouldblock</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      PHP supports a portable way of locking complete files in an
diff --git a/reference/filesystem/functions/fscanf.xml b/reference/filesystem/functions/fscanf.xml
index 80dc18e981..22e3cb623f 100644
--- a/reference/filesystem/functions/fscanf.xml
+++ b/reference/filesystem/functions/fscanf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fscanf">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>mixed</type><methodname>fscanf</methodname>
       <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>string</type><parameter>format</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>&amp;...</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
      </methodsynopsis>
     <para>
      The function <function>fscanf</function> is similar to
diff --git a/reference/ftp/functions/ftp-alloc.xml b/reference/ftp/functions/ftp-alloc.xml
index 733d0affc9..4b5deb6c94 100644
--- a/reference/ftp/functions/ftp-alloc.xml
+++ b/reference/ftp/functions/ftp-alloc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.ftp-alloc">
    <refnamediv>
     <refname>ftp_alloc</refname>
@@ -11,7 +11,7 @@
       <type>bool</type><methodname>ftp_alloc</methodname>
       <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
       <methodparam><type>int</type><parameter>filesize</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;result</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">result</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      Sends an ALLO command to the remote FTP server to allocate <parameter>filesize</parameter>
diff --git a/reference/gmp/functions/gmp-clrbit.xml b/reference/gmp/functions/gmp-clrbit.xml
index c3dcf94f2e..7f1276990b 100644
--- a/reference/gmp/functions/gmp-clrbit.xml
+++ b/reference/gmp/functions/gmp-clrbit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/gmp.xml, last change in rev 1.1 -->
   <refentry id="function.gmp-clrbit">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>void</type><methodname>gmp_clrbit</methodname>
-      <methodparam><type>resource</type><parameter>&amp;a</parameter></methodparam>
+      <methodparam><type>resource</type><parameter role="reference">a</parameter></methodparam>
       <methodparam><type>int</type><parameter>index</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/gmp/functions/gmp-setbit.xml b/reference/gmp/functions/gmp-setbit.xml
index 7a818ee447..ef5ffe2aea 100644
--- a/reference/gmp/functions/gmp-setbit.xml
+++ b/reference/gmp/functions/gmp-setbit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/gmp.xml, last change in rev 1.1 -->
   <refentry id="function.gmp-setbit">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>void</type><methodname>gmp_setbit</methodname>
-      <methodparam><type>resource</type><parameter>&amp;a</parameter></methodparam>
+      <methodparam><type>resource</type><parameter role="reference">a</parameter></methodparam>
       <methodparam><type>int</type><parameter>index</parameter></methodparam>
       <methodparam choice="opt"><type>bool</type><parameter>set_clear</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/http/functions/headers-sent.xml b/reference/http/functions/headers-sent.xml
index d914c28f53..6878be63c4 100644
--- a/reference/http/functions/headers-sent.xml
+++ b/reference/http/functions/headers-sent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <!-- splitted from ./en/functions/http.xml, last change in rev 1.7 -->
   <refentry id="function.headers-sent">
    <refnamediv>
@@ -10,8 +10,8 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>headers_sent</methodname>      
-      <methodparam choice="opt"><type>string</type><parameter>&amp;file</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;line</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">file</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">line</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      <function>headers_sent</function> will return &false; if no HTTP headers
diff --git a/reference/image/functions/getimagesize.xml b/reference/image/functions/getimagesize.xml
index 47a2a4394d..36a759b311 100644
--- a/reference/image/functions/getimagesize.xml
+++ b/reference/image/functions/getimagesize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
  <refentry id="function.getimagesize">
   <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>array</type><methodname>getimagesize</methodname>
      <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>&amp;imageinfo</parameter></methodparam>
+     <methodparam choice="opt"><type>array</type><parameter role="reference">imageinfo</parameter></methodparam>
     </methodsynopsis>
    <para>
     The <function>getimagesize</function> function will determine the
diff --git a/reference/ldap/functions/ldap-first-attribute.xml b/reference/ldap/functions/ldap-first-attribute.xml
index a666bc5529..b6c0757305 100644
--- a/reference/ldap/functions/ldap-first-attribute.xml
+++ b/reference/ldap/functions/ldap-first-attribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/ldap.xml, last change in rev 1.2 -->
   <refentry id="function.ldap-first-attribute">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>string</type><methodname>ldap_first_attribute</methodname>
       <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
       <methodparam><type>resource</type><parameter>result_entry_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>&amp;ber_identifier</parameter></methodparam>
+      <methodparam><type>int</type><parameter role="reference">ber_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the first attribute in the entry on success and &false; on
diff --git a/reference/ldap/functions/ldap-get-option.xml b/reference/ldap/functions/ldap-get-option.xml
index f55937cb2f..83d0e4227c 100644
--- a/reference/ldap/functions/ldap-get-option.xml
+++ b/reference/ldap/functions/ldap-get-option.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/ldap.xml, last change in rev 1.17 -->
   <refentry id="function.ldap-get-option">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>bool</type><methodname>ldap_get_option</methodname>
       <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
       <methodparam><type>int</type><parameter>option</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;retval</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">retval</parameter></methodparam>
      </methodsynopsis>
     <para>
      Sets <parameter>retval</parameter> to the value of the specified option.
diff --git a/reference/ldap/functions/ldap-next-attribute.xml b/reference/ldap/functions/ldap-next-attribute.xml
index f3b4747238..5b0d938254 100644
--- a/reference/ldap/functions/ldap-next-attribute.xml
+++ b/reference/ldap/functions/ldap-next-attribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/ldap.xml, last change in rev 1.2 -->
   <refentry id="function.ldap-next-attribute">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>string</type><methodname>ldap_next_attribute</methodname>
       <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
       <methodparam><type>resource</type><parameter>result_entry_identifier</parameter></methodparam>
-      <methodparam><type>resource</type><parameter>&amp;ber_identifier</parameter></methodparam>
+      <methodparam><type>resource</type><parameter role="reference">ber_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the next attribute in an entry on success and &false; on
diff --git a/reference/ldap/functions/ldap-parse-reference.xml b/reference/ldap/functions/ldap-parse-reference.xml
index 5256b61b58..381994d74d 100644
--- a/reference/ldap/functions/ldap-parse-reference.xml
+++ b/reference/ldap/functions/ldap-parse-reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/ldap.xml, last change in rev 1.39 -->
   <refentry id='function.ldap-parse-reference'>
    <refnamediv>
@@ -14,7 +14,7 @@
       <type>bool</type><methodname>ldap_parse_reference</methodname>
       <methodparam><type>resource</type><parameter>link</parameter></methodparam>
       <methodparam><type>resource</type><parameter>entry</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;referrals</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">referrals</parameter></methodparam>
      </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/ldap/functions/ldap-parse-result.xml b/reference/ldap/functions/ldap-parse-result.xml
index 0e99a681c1..c05295eddc 100644
--- a/reference/ldap/functions/ldap-parse-result.xml
+++ b/reference/ldap/functions/ldap-parse-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/ldap.xml, last change in rev 1.39 -->
   <refentry id='function.ldap-parse-result'>
    <refnamediv>
@@ -14,10 +14,10 @@
       <type>bool</type><methodname>ldap_parse_result</methodname>
       <methodparam><type>resource</type><parameter>link</parameter></methodparam>
       <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-      <methodparam><type>int</type><parameter>&amp;errcode</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;matcheddn</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;errmsg</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;referrals</parameter></methodparam>
+      <methodparam><type>int</type><parameter role="reference">errcode</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">matcheddn</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">errmsg</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">referrals</parameter></methodparam>
      </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/mbstring/functions/mb-convert-variables.xml b/reference/mbstring/functions/mb-convert-variables.xml
index 4aeeefd4b3..70e97f4b3f 100644
--- a/reference/mbstring/functions/mb-convert-variables.xml
+++ b/reference/mbstring/functions/mb-convert-variables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.1 -->
   <refentry id="function.mb-convert-variables">
    <refnamediv>
@@ -12,8 +12,8 @@
       <type>string</type><methodname>mb_convert_variables</methodname>
       <methodparam><type>string</type><parameter>to-encoding</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>from-encoding</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;vars</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>&amp;...</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">vars</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>mb_convert_variables</function> convert 
diff --git a/reference/mbstring/functions/mb-parse-str.xml b/reference/mbstring/functions/mb-parse-str.xml
index 7a267ef51c..f1f974698a 100644
--- a/reference/mbstring/functions/mb-parse-str.xml
+++ b/reference/mbstring/functions/mb-parse-str.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.3 -->
   <refentry id="function.mb-parse-str">
    <refnamediv>
@@ -13,7 +13,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>mb_parse_str</methodname>
       <methodparam><type>string</type><parameter>encoded_string</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;result</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">result</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>mb_parse_str</function> parses GET/POST/COOKIE data and
diff --git a/reference/mcve/functions/mcve-completeauthorizations.xml b/reference/mcve/functions/mcve-completeauthorizations.xml
index c07e465857..655f872115 100644
--- a/reference/mcve/functions/mcve-completeauthorizations.xml
+++ b/reference/mcve/functions/mcve-completeauthorizations.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.mcve-completeauthorizations">
    <refnamediv>
@@ -13,7 +13,7 @@
     <methodsynopsis>
      <type>int</type><methodname>mcve_completeauthorizations</methodname>
      <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;array</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">array</parameter></methodparam>
     </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/misc/functions/php-check-syntax.xml b/reference/misc/functions/php-check-syntax.xml
index d5eedcb0e9..d41436d74c 100644
--- a/reference/misc/functions/php-check-syntax.xml
+++ b/reference/misc/functions/php-check-syntax.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <refentry id="function.php-check-syntax">
  <refnamediv>
   <refname>php_check_syntax</refname>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>php_check_syntax</methodname>
    <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>&amp;error_message</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter role="reference">error_message</parameter></methodparam>
   </methodsynopsis>
     <simpara>
      The <function>php_check_syntax</function> function performs a syntax 
diff --git a/reference/mssql/functions/mssql-bind.xml b/reference/mssql/functions/mssql-bind.xml
index 753939c3a4..bca68d7cc7 100644
--- a/reference/mssql/functions/mssql-bind.xml
+++ b/reference/mssql/functions/mssql-bind.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mssql.xml, last change in rev 1.24 -->
   <refentry id='function.mssql-bind'>
    <refnamediv>
@@ -14,7 +14,7 @@
       <type>bool</type><methodname>mssql_bind</methodname>
       <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
       <methodparam><type>string</type><parameter>param_name</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;var</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">var</parameter></methodparam>
       <methodparam><type>int</type><parameter>type</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>is_output</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>is_null</parameter></methodparam>
diff --git a/reference/mysqli/functions/mysqli-stmt-bind-param.xml b/reference/mysqli/functions/mysqli-stmt-bind-param.xml
index 0b91bf0ee6..6f59de2eb4 100644
--- a/reference/mysqli/functions/mysqli-stmt-bind-param.xml
+++ b/reference/mysqli/functions/mysqli-stmt-bind-param.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-stmt-bind-param">
    <refnamediv>
     <refname>mysqli_stmt_bind_param</refname>
@@ -13,8 +13,8 @@
      <type>bool</type><methodname>mysqli_stmt_bind_param</methodname>
      <methodparam><type>object</type><parameter>stmt</parameter></methodparam>
      <methodparam><type>string</type><parameter>types</parameter></methodparam>
-     <methodparam><type>mixed</type><parameter>&amp;var1</parameter></methodparam>
-     <methodparam choice="opt"><type>mixed</type><parameter>&amp;...</parameter></methodparam>
+     <methodparam><type>mixed</type><parameter role="reference">var1</parameter></methodparam>
+     <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
     </methodsynopsis>
     <para>Object oriented style (method):</para>
     <classsynopsis>
@@ -23,8 +23,8 @@
       <type>bool</type>
        <methodname>bind_param</methodname>
       <methodparam><type>array</type><parameter>types</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;var1</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>&amp;...</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">var1</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
      </methodsynopsis>
     </classsynopsis>
     <para>
diff --git a/reference/mysqli/functions/mysqli-stmt-bind-result.xml b/reference/mysqli/functions/mysqli-stmt-bind-result.xml
index 4aeb655351..9aefba39f4 100644
--- a/reference/mysqli/functions/mysqli-stmt-bind-result.xml
+++ b/reference/mysqli/functions/mysqli-stmt-bind-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-stmt-bind-result">
    <refnamediv>
     <refname>mysqli_stmt_bind_result</refname>
@@ -12,8 +12,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>mysqli_stmt_bind_result</methodname>
       <methodparam><type>object</type><parameter>stmt</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;var1</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>&amp;...</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">var1</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
      </methodsynopsis>
      <para>Object oriented style (method):</para>
      <classsynopsis>
@@ -21,8 +21,8 @@
       <methodsynopsis>
        <type>bool</type>
        <methodname>bind_result</methodname>
-       <methodparam><type>mixed</type><parameter>&amp;var1</parameter></methodparam>
-       <methodparam choice="opt"><type>mixed</type><parameter>&amp;...</parameter></methodparam>
+       <methodparam><type>mixed</type><parameter role="reference">var1</parameter></methodparam>
+       <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
       </methodsynopsis>
      </classsynopsis>
      <para>
diff --git a/reference/ncurses/functions/ncurses-color-content.xml b/reference/ncurses/functions/ncurses-color-content.xml
index a962d7780f..3a25813795 100644
--- a/reference/ncurses/functions/ncurses-color-content.xml
+++ b/reference/ncurses/functions/ncurses-color-content.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.ncurses-color-content">
    <refnamediv>
@@ -13,9 +13,9 @@
     <methodsynopsis>
      <type>int</type><methodname>ncurses_color_content</methodname>
      <methodparam><type>int</type><parameter>color</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;r</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;g</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;b</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">r</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">g</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">b</parameter></methodparam>
     </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/ncurses/functions/ncurses-getmaxyx.xml b/reference/ncurses/functions/ncurses-getmaxyx.xml
index 643d671f4f..14c49e1e7d 100644
--- a/reference/ncurses/functions/ncurses-getmaxyx.xml
+++ b/reference/ncurses/functions/ncurses-getmaxyx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.ncurses-getmaxyx">
    <refnamediv>
     <refname>ncurses_getmaxyx</refname>
@@ -10,15 +10,15 @@
     <methodsynopsis>
      <type>void</type><methodname>ncurses_getmaxyx</methodname>
      <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;y</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;x</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <simpara>
      <function>ncurses_getmaxyx</function> puts the horizontal and
      vertical size of the window <parameter>window</parameter>
-     into the given variables <parameter>&amp;y</parameter> and
-     <parameter>&amp;x</parameter>. Variables must be passed
+     into the given variables <parameter>y</parameter> and
+     <parameter>x</parameter>. Variables must be passed
      as reference, so they are updated when the user changes terminal
      size.
     </simpara>
diff --git a/reference/ncurses/functions/ncurses-getmouse.xml b/reference/ncurses/functions/ncurses-getmouse.xml
index 57e67a6b28..5d62598a4e 100644
--- a/reference/ncurses/functions/ncurses-getmouse.xml
+++ b/reference/ncurses/functions/ncurses-getmouse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/ncurses.xml, last change in rev 1.5 -->
 <refentry id="function.ncurses-getmouse">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>ncurses_getmouse</methodname>
-      <methodparam><type>array</type><parameter>&amp;mevent</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">mevent</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/ncurses/functions/ncurses-getyx.xml b/reference/ncurses/functions/ncurses-getyx.xml
index 344196237a..ff5544868a 100644
--- a/reference/ncurses/functions/ncurses-getyx.xml
+++ b/reference/ncurses/functions/ncurses-getyx.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.ncurses-getyx">
    <refnamediv>
@@ -13,8 +13,8 @@
     <methodsynopsis>
      <type>void</type><methodname>ncurses_getyx</methodname>
      <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;y</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;x</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
     </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/ncurses/functions/ncurses-instr.xml b/reference/ncurses/functions/ncurses-instr.xml
index e633593563..5ff6ca1173 100644
--- a/reference/ncurses/functions/ncurses-instr.xml
+++ b/reference/ncurses/functions/ncurses-instr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/ncurses.xml, last change in rev 1.1 -->
   <refentry id="function.ncurses-instr">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>ncurses_instr</methodname>
-      <methodparam><type>string</type><parameter>&amp;buffer</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">buffer</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/ncurses/functions/ncurses-mouse-trafo.xml b/reference/ncurses/functions/ncurses-mouse-trafo.xml
index 41e2f3a2fd..f5ac66a17e 100644
--- a/reference/ncurses/functions/ncurses-mouse-trafo.xml
+++ b/reference/ncurses/functions/ncurses-mouse-trafo.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.ncurses-mouse-trafo">
    <refnamediv>
@@ -12,8 +12,8 @@
     <title>Description</title>
     <methodsynopsis>
      <type>bool</type><methodname>ncurses_mouse_trafo</methodname>
-     <methodparam><type>int</type><parameter>&amp;y</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;x</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
      <methodparam><type>bool</type><parameter>toscreen</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/ncurses/functions/ncurses-mousemask.xml b/reference/ncurses/functions/ncurses-mousemask.xml
index fdfa250c26..14321715f1 100644
--- a/reference/ncurses/functions/ncurses-mousemask.xml
+++ b/reference/ncurses/functions/ncurses-mousemask.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/ncurses.xml, last change in rev 1.5 -->
 <refentry id="function.ncurses-mousemask">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>int</type><methodname>ncurses_mousemask</methodname>
       <methodparam><type>int</type><parameter>newmask</parameter></methodparam>
-      <methodparam><type>int</type><parameter>&amp;oldmask</parameter></methodparam>
+      <methodparam><type>int</type><parameter role="reference">oldmask</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/ncurses/functions/ncurses-pair-content.xml b/reference/ncurses/functions/ncurses-pair-content.xml
index 922528e64a..07d3e37525 100644
--- a/reference/ncurses/functions/ncurses-pair-content.xml
+++ b/reference/ncurses/functions/ncurses-pair-content.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.ncurses-pair-content">
    <refnamediv>
@@ -13,8 +13,8 @@
     <methodsynopsis>
      <type>int</type><methodname>ncurses_pair_content</methodname>
      <methodparam><type>int</type><parameter>pair</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;f</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;b</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">f</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">b</parameter></methodparam>
     </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/ncurses/functions/ncurses-wmouse-trafo.xml b/reference/ncurses/functions/ncurses-wmouse-trafo.xml
index 672eceed79..1600b35516 100644
--- a/reference/ncurses/functions/ncurses-wmouse-trafo.xml
+++ b/reference/ncurses/functions/ncurses-wmouse-trafo.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.ncurses-wmouse-trafo">
    <refnamediv>
@@ -13,8 +13,8 @@
     <methodsynopsis>
      <type>bool</type><methodname>ncurses_wmouse_trafo</methodname>
      <methodparam><type>resource</type><parameter>window</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;y</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;x</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">y</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">x</parameter></methodparam>
      <methodparam><type>bool</type><parameter>toscreen</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/network/functions/dns-get-mx.xml b/reference/network/functions/dns-get-mx.xml
index ed16422571..3cdd3a0136 100644
--- a/reference/network/functions/dns-get-mx.xml
+++ b/reference/network/functions/dns-get-mx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.dns-get-mx">
    <refnamediv>
     <refname>dns_get_mx</refname>
@@ -10,8 +10,8 @@
      <methodsynopsis>
       <type>int</type><methodname>dns_get_mx</methodname>
       <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;mxhosts</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;weight</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">mxhosts</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">weight</parameter></methodparam>
      </methodsynopsis>    
     <para>
       Get MX records corresponding to a given Internet host name.
diff --git a/reference/network/functions/dns-get-record.xml b/reference/network/functions/dns-get-record.xml
index bd7ffc595b..f7c76c59db 100644
--- a/reference/network/functions/dns-get-record.xml
+++ b/reference/network/functions/dns-get-record.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
   <refentry id="function.dns-get-record">
     <refnamediv>
      <refname>dns_get_record</refname>
@@ -13,8 +13,8 @@
        <type>array</type><methodname>dns_get_record</methodname>
        <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
        <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
-       <methodparam choice="opt"><type>array</type><parameter>&amp;authns</parameter></methodparam>
-       <methodparam><type>array</type><parameter>&amp;addtl</parameter></methodparam>
+       <methodparam choice="opt"><type>array</type><parameter role="reference">authns</parameter></methodparam>
+       <methodparam><type>array</type><parameter role="reference">addtl</parameter></methodparam>
       </methodsynopsis>
      <para>
       <note>
diff --git a/reference/network/functions/fsockopen.xml b/reference/network/functions/fsockopen.xml
index d9181bb1da..1853571532 100644
--- a/reference/network/functions/fsockopen.xml
+++ b/reference/network/functions/fsockopen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
 <!-- splitted from ./en/functions/network.xml, last change in rev 1.2 -->
   <refentry id="function.fsockopen">
    <refnamediv>
@@ -14,8 +14,8 @@
       <type>resource</type><methodname>fsockopen</methodname>
       <methodparam><type>string</type><parameter>target</parameter></methodparam>
       <methodparam><type>int</type><parameter>port</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;errno</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;errstr</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">errno</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">errstr</parameter></methodparam>
       <methodparam choice="opt"><type>float</type><parameter>timeout</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/network/functions/getmxrr.xml b/reference/network/functions/getmxrr.xml
index 69df08a82f..15e139462c 100644
--- a/reference/network/functions/getmxrr.xml
+++ b/reference/network/functions/getmxrr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/network.xml, last change in rev 1.2 -->
   <refentry id="function.getmxrr">
    <refnamediv>
@@ -13,8 +13,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>getmxrr</methodname>
       <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;mxhosts</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;weight</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">mxhosts</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">weight</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      Searches DNS for MX records corresponding to
diff --git a/reference/network/functions/pfsockopen.xml b/reference/network/functions/pfsockopen.xml
index d4c4c5132f..b99689d047 100644
--- a/reference/network/functions/pfsockopen.xml
+++ b/reference/network/functions/pfsockopen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/network.xml, last change in rev 1.2 -->
   <refentry id="function.pfsockopen">
    <refnamediv>
@@ -14,8 +14,8 @@
       <type>resource</type><methodname>pfsockopen</methodname>
       <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
       <methodparam><type>int</type><parameter>port</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;errno</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;errstr</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">errno</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">errstr</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/oci8/functions/oci-bind-by-name.xml b/reference/oci8/functions/oci-bind-by-name.xml
index 3e3be24122..680482ceb6 100644
--- a/reference/oci8/functions/oci-bind-by-name.xml
+++ b/reference/oci8/functions/oci-bind-by-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.oci-bind-by-name">
    <refnamediv>
     <refname>oci_bind_by_name</refname>
@@ -13,7 +13,7 @@
       <type>bool</type><methodname>oci_bind_by_name</methodname>
       <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
       <methodparam><type>string</type><parameter>ph_name</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;variable</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>maxlength</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/oci8/functions/oci-define-by-name.xml b/reference/oci8/functions/oci-define-by-name.xml
index 258caac4b1..78f7103300 100644
--- a/reference/oci8/functions/oci-define-by-name.xml
+++ b/reference/oci8/functions/oci-define-by-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.oci-define-by-name">
    <refnamediv>
     <refname>oci_define_by_name</refname>
@@ -13,7 +13,7 @@
       <type>bool</type><methodname>oci_define_by_name</methodname>
       <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
       <methodparam><type>string</type><parameter>column_name</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;variable</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/oci8/functions/oci-fetch-all.xml b/reference/oci8/functions/oci-fetch-all.xml
index 5131e1e1e5..ae1387e2ba 100644
--- a/reference/oci8/functions/oci-fetch-all.xml
+++ b/reference/oci8/functions/oci-fetch-all.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.oci-fetch-all">
    <refnamediv>
     <refname>oci_fetch_all</refname>
@@ -10,7 +10,7 @@
      <methodsynopsis>
       <type>int</type><methodname>oci_fetch_all</methodname>
       <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;output</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">output</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>skip</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>maxrows</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
diff --git a/reference/oci8/functions/ocibindbyname.xml b/reference/oci8/functions/ocibindbyname.xml
index 3fe9947463..3d0c57baa9 100644
--- a/reference/oci8/functions/ocibindbyname.xml
+++ b/reference/oci8/functions/ocibindbyname.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <!--
 
 DO NOT TRANSLATE THIS FILE.
@@ -21,7 +21,7 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
       <type>bool</type><methodname>ocibindbyname</methodname>
       <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
       <methodparam><type>string</type><parameter>ph_name</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;variable</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>maxlength</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/oci8/functions/ocidefinebyname.xml b/reference/oci8/functions/ocidefinebyname.xml
index 1fda6b3390..57776feea9 100644
--- a/reference/oci8/functions/ocidefinebyname.xml
+++ b/reference/oci8/functions/ocidefinebyname.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!--
 
 DO NOT TRANSLATE THIS FILE.
@@ -21,7 +21,7 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
       <type>bool</type><methodname>ocidefinebyname</methodname>
       <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
       <methodparam><type>string</type><parameter>column_name</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>&amp;variable</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/oci8/functions/ocifetchinto.xml b/reference/oci8/functions/ocifetchinto.xml
index 9a361275b0..c909f86db7 100644
--- a/reference/oci8/functions/ocifetchinto.xml
+++ b/reference/oci8/functions/ocifetchinto.xml
@@ -5,7 +5,7 @@ DO NOT TRANSLATE THIS FILE.
 THE FUNCTION IT DESCRIBES WAS DEPRECATED.
 
 -->
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
   <refentry id="function.ocifetchinto">
    <refnamediv>
     <refname>ocifetchinto</refname>
@@ -16,7 +16,7 @@ THE FUNCTION IT DESCRIBES WAS DEPRECATED.
      <methodsynopsis>
       <type>int</type><methodname>ocifetchinto</methodname>
       <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;result</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">result</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <note>
diff --git a/reference/oci8/functions/ocifetchstatement.xml b/reference/oci8/functions/ocifetchstatement.xml
index c08ab05ca2..75c9922c17 100644
--- a/reference/oci8/functions/ocifetchstatement.xml
+++ b/reference/oci8/functions/ocifetchstatement.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <!--
 
 DO NOT TRANSLATE THIS FILE.
@@ -17,7 +17,7 @@ THE FUNCTION IT DESCRIBES WAS DEPRECATED.
      <methodsynopsis>
       <type>int</type><methodname>ocifetchstatement</methodname>
       <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;output</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">output</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>skip</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>maxrows</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
diff --git a/reference/openssl/functions/openssl-csr-export.xml b/reference/openssl/functions/openssl-csr-export.xml
index d042227b3e..e206d437f0 100644
--- a/reference/openssl/functions/openssl-csr-export.xml
+++ b/reference/openssl/functions/openssl-csr-export.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-csr-export">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_csr_export</methodname>
       <methodparam><type>resource</type><parameter>csr</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;out</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">out</parameter></methodparam>
       <methodparam choice="opt"><type>bool</type><parameter>notext</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/openssl/functions/openssl-csr-new.xml b/reference/openssl/functions/openssl-csr-new.xml
index 7f1e0f5841..4a74b2cc94 100644
--- a/reference/openssl/functions/openssl-csr-new.xml
+++ b/reference/openssl/functions/openssl-csr-new.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-csr-new">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_csr_new</methodname>
       <methodparam><type>array</type><parameter>dn</parameter></methodparam>
-      <methodparam><type>resource</type><parameter>&amp;privkey</parameter></methodparam>
+      <methodparam><type>resource</type><parameter role="reference">privkey</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>configargs</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>extraattribs</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-open.xml b/reference/openssl/functions/openssl-open.xml
index 2cb766b2b4..34e0e7a2b3 100644
--- a/reference/openssl/functions/openssl-open.xml
+++ b/reference/openssl/functions/openssl-open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.1 -->
   <refentry id="function.openssl-open">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_open</methodname>
       <methodparam><type>string</type><parameter>sealed_data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;open_data</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">open_data</parameter></methodparam>
       <methodparam><type>string</type><parameter>env_key</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>priv_key_id</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-pkey-export.xml b/reference/openssl/functions/openssl-pkey-export.xml
index 50fd20a994..f0371b6fc4 100644
--- a/reference/openssl/functions/openssl-pkey-export.xml
+++ b/reference/openssl/functions/openssl-pkey-export.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-pkey-export">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_pkey_export</methodname>
       <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;out</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">out</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>passphrase</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>configargs</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-private-decrypt.xml b/reference/openssl/functions/openssl-private-decrypt.xml
index dacb5091da..2775e9a8b0 100644
--- a/reference/openssl/functions/openssl-private-decrypt.xml
+++ b/reference/openssl/functions/openssl-private-decrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-private-decrypt">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_private_decrypt</methodname>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;decrypted</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">decrypted</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>padding</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-private-encrypt.xml b/reference/openssl/functions/openssl-private-encrypt.xml
index 6af9e71758..e7e28a4bb0 100644
--- a/reference/openssl/functions/openssl-private-encrypt.xml
+++ b/reference/openssl/functions/openssl-private-encrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-private-encrypt">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_private_encrypt</methodname>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;crypted</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">crypted</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>padding</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-public-decrypt.xml b/reference/openssl/functions/openssl-public-decrypt.xml
index e4c70660b8..c09a3491c1 100644
--- a/reference/openssl/functions/openssl-public-decrypt.xml
+++ b/reference/openssl/functions/openssl-public-decrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-public-decrypt">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_public_decrypt</methodname>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;decrypted</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">decrypted</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>padding</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-public-encrypt.xml b/reference/openssl/functions/openssl-public-encrypt.xml
index aa403239a2..ef31026aa2 100644
--- a/reference/openssl/functions/openssl-public-encrypt.xml
+++ b/reference/openssl/functions/openssl-public-encrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-public-encrypt">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_public_encrypt</methodname>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;crypted</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">crypted</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>padding</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-seal.xml b/reference/openssl/functions/openssl-seal.xml
index cf8dfe7a6f..918edbef6f 100644
--- a/reference/openssl/functions/openssl-seal.xml
+++ b/reference/openssl/functions/openssl-seal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.1 -->
   <refentry id="function.openssl-seal">
    <refnamediv>
@@ -11,8 +11,8 @@
      <methodsynopsis>
       <type>int</type><methodname>openssl_seal</methodname>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;sealed_data</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;env_keys</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">sealed_data</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">env_keys</parameter></methodparam>
       <methodparam><type>array</type><parameter>pub_key_ids</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/openssl/functions/openssl-sign.xml b/reference/openssl/functions/openssl-sign.xml
index ec3fb54b08..fd7fa9fcc0 100644
--- a/reference/openssl/functions/openssl-sign.xml
+++ b/reference/openssl/functions/openssl-sign.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.1 -->
   <refentry id="function.openssl-sign">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_sign</methodname>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;signature</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">signature</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>priv_key_id</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>signature_alg</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/openssl/functions/openssl-x509-export.xml b/reference/openssl/functions/openssl-x509-export.xml
index 7b4568964b..7103c1c951 100644
--- a/reference/openssl/functions/openssl-x509-export.xml
+++ b/reference/openssl/functions/openssl-x509-export.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/openssl.xml, last change in rev 1.19 -->
   <refentry id="function.openssl-x509-export">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>openssl_x509_export</methodname>
       <methodparam><type>mixed</type><parameter>x509</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;output</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">output</parameter></methodparam>
       <methodparam choice="opt"><type>bool</type><parameter>notext</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/oracle/functions/ora-fetch-into.xml b/reference/oracle/functions/ora-fetch-into.xml
index 624086e881..50af166352 100644
--- a/reference/oracle/functions/ora-fetch-into.xml
+++ b/reference/oracle/functions/ora-fetch-into.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/oracle.xml, last change in rev 1.2 -->
   <refentry id="function.ora-fetch-into">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>int</type><methodname>ora_fetch_into</methodname>
       <methodparam><type>resource</type><parameter>cursor</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;result</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">result</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/ovrimos/functions/ovrimos-fetch-into.xml b/reference/ovrimos/functions/ovrimos-fetch-into.xml
index 4684cfbc15..f5fbc31336 100644
--- a/reference/ovrimos/functions/ovrimos-fetch-into.xml
+++ b/reference/ovrimos/functions/ovrimos-fetch-into.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/ovrimos.xml, last change in rev 1.1 -->
   <refentry id="function.ovrimos-fetch-into">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>bool</type><methodname>ovrimos_fetch_into</methodname>
       <methodparam><type>int</type><parameter>result_id</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;result_array</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">result_array</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>how</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>rownumber</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/parsekit/functions/parsekit-compile-file.xml b/reference/parsekit/functions/parsekit-compile-file.xml
index 70c6ef0e21..b7680026c2 100644
--- a/reference/parsekit/functions/parsekit-compile-file.xml
+++ b/reference/parsekit/functions/parsekit-compile-file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <refentry id="function.parsekit-compile-file">
  <refnamediv>
   <refname>parsekit_compile_file</refname>
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <type>array</type><methodname>parsekit_compile_file</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>&amp;errors</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter role="reference">errors</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   &warn.experimental.func;
@@ -29,7 +29,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>&amp;errors</parameter></term>
+     <term><parameter>errors</parameter></term>
      <listitem>
       <para>
        A 2D hash of errors (including fatal errors) encountered during compilation.
diff --git a/reference/parsekit/functions/parsekit-compile-string.xml b/reference/parsekit/functions/parsekit-compile-string.xml
index 0402b1fd75..da269b026d 100644
--- a/reference/parsekit/functions/parsekit-compile-string.xml
+++ b/reference/parsekit/functions/parsekit-compile-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <refentry id="function.parsekit-compile-string">
  <refnamediv>
   <refname>parsekit_compile_string</refname>
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <type>array</type><methodname>parsekit_compile_string</methodname>
    <methodparam><type>string</type><parameter>phpcode</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>&amp;errors</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter role="reference">errors</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   &warn.experimental.func;
@@ -28,7 +28,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>&amp;errors</parameter></term>
+     <term><parameter>errors</parameter></term>
      <listitem>
       <para>
        A 2D hash of errors (including fatal errors) encountered during compilation.
diff --git a/reference/pcntl/functions/pcntl-wait.xml b/reference/pcntl/functions/pcntl-wait.xml
index 349b34733d..ee0c0851e2 100644
--- a/reference/pcntl/functions/pcntl-wait.xml
+++ b/reference/pcntl/functions/pcntl-wait.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id='function.pcntl-wait'>
    <refnamediv>
     <refname>pcntl_wait</refname>
@@ -11,7 +11,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>pcntl_wait</methodname>
-      <methodparam><type>int</type><parameter>&amp;status</parameter></methodparam>
+      <methodparam><type>int</type><parameter role="reference">status</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/pcntl/functions/pcntl-waitpid.xml b/reference/pcntl/functions/pcntl-waitpid.xml
index 6449a5fb48..0f6aab1430 100644
--- a/reference/pcntl/functions/pcntl-waitpid.xml
+++ b/reference/pcntl/functions/pcntl-waitpid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/pcntl.xml, last change in rev 1.1 -->
  <refentry id="function.pcntl-waitpid">
   <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>int</type><methodname>pcntl_waitpid</methodname>
      <methodparam><type>int</type><parameter>pid</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;status</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">status</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
     </methodsynopsis>
    <para>
diff --git a/reference/pcre/functions/preg-match-all.xml b/reference/pcre/functions/preg-match-all.xml
index bb3971a711..058f9673ce 100644
--- a/reference/pcre/functions/preg-match-all.xml
+++ b/reference/pcre/functions/preg-match-all.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
 <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 -->
   <refentry id="function.preg-match-all">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>int</type><methodname>preg_match_all</methodname>
       <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
       <methodparam><type>string</type><parameter>subject</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;matches</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">matches</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/pcre/functions/preg-match.xml b/reference/pcre/functions/preg-match.xml
index 3be0b9cf7f..79a4f01498 100644
--- a/reference/pcre/functions/preg-match.xml
+++ b/reference/pcre/functions/preg-match.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
 <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 -->
   <refentry id="function.preg-match">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>mixed</type><methodname>preg_match</methodname>
       <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
       <methodparam><type>string</type><parameter>subject</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;matches</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">matches</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/regex/functions/ereg.xml b/reference/regex/functions/ereg.xml
index 8e44539ea9..efa83ad3d1 100644
--- a/reference/regex/functions/ereg.xml
+++ b/reference/regex/functions/ereg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/regex.xml, last change in rev 1.2 -->
   <refentry id="function.ereg">
    <refnamediv>
@@ -12,7 +12,7 @@
      <type>int</type><methodname>ereg</methodname>
      <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
      <methodparam><type>string</type><parameter>string</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>&amp;regs</parameter></methodparam>
+     <methodparam choice="opt"><type>array</type><parameter role="reference">regs</parameter></methodparam>
     </methodsynopsis>
     <note>
      <para>
diff --git a/reference/regex/functions/eregi.xml b/reference/regex/functions/eregi.xml
index aaa3d35754..db288e69f0 100644
--- a/reference/regex/functions/eregi.xml
+++ b/reference/regex/functions/eregi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/regex.xml, last change in rev 1.2 -->
   <refentry id="function.eregi">
    <refnamediv>
@@ -12,7 +12,7 @@
      <type>int</type><methodname>eregi</methodname>
      <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
      <methodparam><type>string</type><parameter>string</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>&amp;regs</parameter></methodparam>
+     <methodparam choice="opt"><type>array</type><parameter role="reference">regs</parameter></methodparam>
     </methodsynopsis>
     <para>
      This function is identical to <function>ereg</function> except
diff --git a/reference/sem/functions/msg-receive.xml b/reference/sem/functions/msg-receive.xml
index f6fb28b18e..f2b146d20c 100644
--- a/reference/sem/functions/msg-receive.xml
+++ b/reference/sem/functions/msg-receive.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.msg-receive">
    <refnamediv>
     <refname>msg_receive</refname>
@@ -13,12 +13,12 @@
      <type>bool</type><methodname>msg_receive</methodname>
      <methodparam><type>resource</type><parameter>queue</parameter></methodparam>
      <methodparam><type>int</type><parameter>desiredmsgtype</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;msgtype</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">msgtype</parameter></methodparam>
      <methodparam><type>int</type><parameter>maxsize</parameter></methodparam>
-     <methodparam><type>mixed</type><parameter>&amp;message</parameter></methodparam>
+     <methodparam><type>mixed</type><parameter role="reference">message</parameter></methodparam>
      <methodparam choice="opt"><type>bool</type><parameter>unserialize</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-     <methodparam choice="opt"><type>int</type><parameter>&amp;errorcode</parameter></methodparam>
+     <methodparam choice="opt"><type>int</type><parameter role="reference">errorcode</parameter></methodparam>
     </methodsynopsis>
     <para>
      <function>msg_receive</function> will receive the first message from the
diff --git a/reference/sem/functions/msg-send.xml b/reference/sem/functions/msg-send.xml
index 4caa889028..d9ec9a6457 100644
--- a/reference/sem/functions/msg-send.xml
+++ b/reference/sem/functions/msg-send.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.msg-send">
    <refnamediv>
     <refname>msg_send</refname>
@@ -16,7 +16,7 @@
      <methodparam><type>mixed</type><parameter>message</parameter></methodparam>
      <methodparam choice="opt"><type>bool</type><parameter>serialize</parameter></methodparam>
      <methodparam choice="opt"><type>bool</type><parameter>blocking</parameter></methodparam>
-     <methodparam choice="opt"><type>int</type><parameter>&amp;errorcode</parameter></methodparam>
+     <methodparam choice="opt"><type>int</type><parameter role="reference">errorcode</parameter></methodparam>
     </methodsynopsis>
     <para>
      <function>msg_send</function> sends a <parameter>message</parameter> of type
diff --git a/reference/sockets/functions/socket-create-pair.xml b/reference/sockets/functions/socket-create-pair.xml
index 182f09e9e3..9082c48d8a 100644
--- a/reference/sockets/functions/socket-create-pair.xml
+++ b/reference/sockets/functions/socket-create-pair.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
   <refentry id="function.socket-create-pair">
    <refnamediv>
@@ -13,12 +13,12 @@
       <methodparam><type>int</type><parameter>domain</parameter></methodparam>
       <methodparam><type>int</type><parameter>type</parameter></methodparam>
       <methodparam><type>int</type><parameter>protocol</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;fd</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">fd</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
      <function>socket_create_pair</function> creates two connected and indistinguishable sockets, and stores
-     them in <parameter>&amp;fd</parameter>. This function is commonly used in IPC (InterProcess Communication).
+     them in <parameter>fd</parameter>. This function is commonly used in IPC (InterProcess Communication).
     </para>
     <para>
      The <parameter>domain</parameter> parameter specifies the protocol
diff --git a/reference/sockets/functions/socket-getpeername.xml b/reference/sockets/functions/socket-getpeername.xml
index c94cdde025..3d85253797 100644
--- a/reference/sockets/functions/socket-getpeername.xml
+++ b/reference/sockets/functions/socket-getpeername.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
   <refentry id="function.socket-getpeername">
    <refnamediv>
@@ -14,8 +14,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>socket_getpeername</methodname>
       <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;addr</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;port</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">addr</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">port</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/sockets/functions/socket-getsockname.xml b/reference/sockets/functions/socket-getsockname.xml
index e49de7e787..181585efa9 100644
--- a/reference/sockets/functions/socket-getsockname.xml
+++ b/reference/sockets/functions/socket-getsockname.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
   <refentry id="function.socket-getsockname">
    <refnamediv>
@@ -14,8 +14,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>socket_getsockname</methodname>
       <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;addr</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;port</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">addr</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">port</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/sockets/functions/socket-recv.xml b/reference/sockets/functions/socket-recv.xml
index ae9e14803a..3ef09685e8 100644
--- a/reference/sockets/functions/socket-recv.xml
+++ b/reference/sockets/functions/socket-recv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
   <refentry id="function.socket-recv">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>int</type><methodname>socket_recv</methodname>
       <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;buf</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">buf</parameter></methodparam>
       <methodparam><type>int</type><parameter>len</parameter></methodparam>
       <methodparam><type>int</type><parameter>flags</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/sockets/functions/socket-recvfrom.xml b/reference/sockets/functions/socket-recvfrom.xml
index 6520667ec8..ad04a19cda 100644
--- a/reference/sockets/functions/socket-recvfrom.xml
+++ b/reference/sockets/functions/socket-recvfrom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
   <refentry id="function.socket-recvfrom">
    <refnamediv>
@@ -11,11 +11,11 @@
      <methodsynopsis>
       <type>int</type><methodname>socket_recvfrom</methodname>
       <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;buf</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">buf</parameter></methodparam>
       <methodparam><type>int</type><parameter>len</parameter></methodparam>
       <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;name</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;port</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">name</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">port</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/sockets/functions/socket-select.xml b/reference/sockets/functions/socket-select.xml
index 250d367026..052fee240d 100644
--- a/reference/sockets/functions/socket-select.xml
+++ b/reference/sockets/functions/socket-select.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
   <refentry id="function.socket-select">
    <refnamediv>
@@ -13,9 +13,9 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>socket_select</methodname>
-      <methodparam><type>array</type><parameter>&amp;read</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;write</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;except</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">read</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">write</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">except</parameter></methodparam>
       <methodparam><type>int</type><parameter>tv_sec</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>tv_usec</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/sqlite/functions/sqlite-factory.xml b/reference/sqlite/functions/sqlite-factory.xml
index 9bdeb29803..7735ccc12e 100755
--- a/reference/sqlite/functions/sqlite-factory.xml
+++ b/reference/sqlite/functions/sqlite-factory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="function.sqlite-factory">
  <refnamediv>
   <refname>sqlite_factory</refname>
@@ -13,7 +13,7 @@
    <type>object</type><methodname>sqlite_factory</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>&amp;error_message</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter role="reference">error_message</parameter></methodparam>
   </methodsynopsis>
   
   &warn.undocumented.func;
diff --git a/reference/sqlite/functions/sqlite-open.xml b/reference/sqlite/functions/sqlite-open.xml
index c2e426fa87..1417523905 100644
--- a/reference/sqlite/functions/sqlite-open.xml
+++ b/reference/sqlite/functions/sqlite-open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <refentry id="function.sqlite-open">
  <refnamediv>
   <refname>sqlite_open</refname>
@@ -11,7 +11,7 @@
    <type>resource</type><methodname>sqlite_open</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>&amp;error_message</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter role="reference">error_message</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns a resource (database handle) on success, &false; on error.
diff --git a/reference/sqlite/functions/sqlite-popen.xml b/reference/sqlite/functions/sqlite-popen.xml
index 59740cb8da..1c6a236062 100644
--- a/reference/sqlite/functions/sqlite-popen.xml
+++ b/reference/sqlite/functions/sqlite-popen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <refentry id="function.sqlite-popen">
  <refnamediv>
   <refname>sqlite_popen</refname>
@@ -13,7 +13,7 @@
    <type>resource</type><methodname>sqlite_popen</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>&amp;error_message</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter role="reference">error_message</parameter></methodparam>
   </methodsynopsis>
   <simpara>
    This function behaves identically to <function>sqlite_open</function>
diff --git a/reference/stream/functions/stream-filter-register.xml b/reference/stream/functions/stream-filter-register.xml
index c3ed8da8cb..d0cdc69058 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.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <refentry id="function.stream-filter-register">
    <refnamediv>
     <refname>stream_filter_register</refname>
@@ -40,7 +40,7 @@
      <type>int</type><methodname>filter</methodname>
      <methodparam><type>resource</type><parameter>in</parameter></methodparam>
      <methodparam><type>resource</type><parameter>out</parameter></methodparam>
-     <methodparam><type>int</type><parameter>&amp;consumed</parameter></methodparam>
+     <methodparam><type>int</type><parameter role="reference">consumed</parameter></methodparam>
      <methodparam><type>bool</type><parameter>closing</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/stream/functions/stream-select.xml b/reference/stream/functions/stream-select.xml
index 86df96521e..e4ea4aa849 100644
--- a/reference/stream/functions/stream-select.xml
+++ b/reference/stream/functions/stream-select.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
   <refentry id="function.stream-select">
    <refnamediv>
     <refname>stream_select</refname>
@@ -10,9 +10,9 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>stream_select</methodname>
-      <methodparam><type>array</type><parameter>&amp;read</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;write</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;except</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">read</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">write</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">except</parameter></methodparam>
       <methodparam><type>int</type><parameter>tv_sec</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>tv_usec</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/stream/functions/stream-socket-accept.xml b/reference/stream/functions/stream-socket-accept.xml
index 74a3513733..283bc61c06 100644
--- a/reference/stream/functions/stream-socket-accept.xml
+++ b/reference/stream/functions/stream-socket-accept.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.stream-socket-accept">
    <refnamediv>
     <refname>stream_socket_accept</refname>
@@ -13,7 +13,7 @@
       <type>resource</type><methodname>stream_socket_accept</methodname>
       <methodparam><type>resource</type><parameter>server_socket</parameter></methodparam>
       <methodparam choice="opt"><type>float</type><parameter>timeout</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;peername</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">peername</parameter></methodparam>
      </methodsynopsis>
     <para>
      Accept a connection on a socket previously created by
diff --git a/reference/stream/functions/stream-socket-client.xml b/reference/stream/functions/stream-socket-client.xml
index 680b44f4a4..8b6d45e199 100644
--- a/reference/stream/functions/stream-socket-client.xml
+++ b/reference/stream/functions/stream-socket-client.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
   <refentry id="function.stream-socket-client">
    <refnamediv>
     <refname>stream_socket_client</refname>
@@ -12,8 +12,8 @@
      <methodsynopsis>
       <type>resource</type><methodname>stream_socket_client</methodname>
       <methodparam><type>string</type><parameter>remote_socket</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;errno</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;errstr</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">errno</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">errstr</parameter></methodparam>
       <methodparam choice="opt"><type>float</type><parameter>timeout</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
       <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
diff --git a/reference/stream/functions/stream-socket-recvfrom.xml b/reference/stream/functions/stream-socket-recvfrom.xml
index 08a3ed8363..10cfebda27 100644
--- a/reference/stream/functions/stream-socket-recvfrom.xml
+++ b/reference/stream/functions/stream-socket-recvfrom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.stream-socket-recvfrom">
    <refnamediv>
     <refname>stream_socket_recvfrom</refname>
@@ -12,7 +12,7 @@
       <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
       <methodparam><type>int</type><parameter>length</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;address</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">address</parameter></methodparam>
      </methodsynopsis>
     <para>
      The function <function>stream_socket_recvfrom</function> accepts
diff --git a/reference/stream/functions/stream-socket-server.xml b/reference/stream/functions/stream-socket-server.xml
index 556fe03908..197ffe4e10 100644
--- a/reference/stream/functions/stream-socket-server.xml
+++ b/reference/stream/functions/stream-socket-server.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
   <refentry id="function.stream-socket-server">
    <refnamediv>
     <refname>stream_socket_server</refname>
@@ -12,8 +12,8 @@
      <methodsynopsis>
       <type>resource</type><methodname>stream_socket_server</methodname>
       <methodparam><type>string</type><parameter>local_socket</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;errno</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;errstr</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">errno</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">errstr</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
       <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/strings/functions/parse-str.xml b/reference/strings/functions/parse-str.xml
index 20d76d1151..7370b99b93 100644
--- a/reference/strings/functions/parse-str.xml
+++ b/reference/strings/functions/parse-str.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.parse-str">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>void</type><methodname>parse_str</methodname>
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;arr</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">arr</parameter></methodparam>
      </methodsynopsis>
     <para>
      Parses <parameter>str</parameter> as if it were the query string
diff --git a/reference/strings/functions/similar-text.xml b/reference/strings/functions/similar-text.xml
index f31819c7bf..d52cacd742 100644
--- a/reference/strings/functions/similar-text.xml
+++ b/reference/strings/functions/similar-text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.similar-text">
    <refnamediv>
@@ -14,7 +14,7 @@
       <type>int</type><methodname>similar_text</methodname>
       <methodparam><type>string</type><parameter>first</parameter></methodparam>
       <methodparam><type>string</type><parameter>second</parameter></methodparam>
-      <methodparam choice="opt"><type>float</type><parameter>&amp;percent</parameter></methodparam>
+      <methodparam choice="opt"><type>float</type><parameter role="reference">percent</parameter></methodparam>
      </methodsynopsis>
     <para>
      This calculates the similarity between two strings as described
diff --git a/reference/strings/functions/sscanf.xml b/reference/strings/functions/sscanf.xml
index 5127293e4c..1b1171be3c 100644
--- a/reference/strings/functions/sscanf.xml
+++ b/reference/strings/functions/sscanf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.33 -->
   <refentry id="function.sscanf">
    <refnamediv>
@@ -14,7 +14,7 @@
       <type>mixed</type><methodname>sscanf</methodname>
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
       <methodparam><type>string</type><parameter>format</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>&amp;...</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
      </methodsynopsis>
     <para>
      The function <function>sscanf</function> is the input analog of
diff --git a/reference/strings/functions/str-ireplace.xml b/reference/strings/functions/str-ireplace.xml
index 92cc1084ec..82bf2c64c8 100644
--- a/reference/strings/functions/str-ireplace.xml
+++ b/reference/strings/functions/str-ireplace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.str-ireplace">
    <refnamediv>
@@ -15,7 +15,7 @@
       <methodparam><type>mixed</type><parameter>search</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>replace</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>subject</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;count</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function returns a string or an array with all occurrences of
diff --git a/reference/strings/functions/str-replace.xml b/reference/strings/functions/str-replace.xml
index c633285317..c91baab62f 100644
--- a/reference/strings/functions/str-replace.xml
+++ b/reference/strings/functions/str-replace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.str-replace">
    <refnamediv>
@@ -15,7 +15,7 @@
       <methodparam><type>mixed</type><parameter>search</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>replace</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>subject</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>&amp;count</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function returns a string or an array with all occurrences of
diff --git a/reference/uodbc/functions/odbc-fetch-into.xml b/reference/uodbc/functions/odbc-fetch-into.xml
index f1b4b66678..e8d9534a2e 100644
--- a/reference/uodbc/functions/odbc-fetch-into.xml
+++ b/reference/uodbc/functions/odbc-fetch-into.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.34 -->
   <refentry id="function.odbc-fetch-into">
    <refnamediv>
@@ -11,14 +11,14 @@
     <methodsynopsis>
      <type>resource</type><methodname>odbc_fetch_into</methodname>
      <methodparam><type>resource</type><parameter>result_id</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;result_array</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">result_array</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>rownumber</parameter></methodparam>
     </methodsynopsis>
     <methodsynopsis>
      <type>bool</type><methodname>odbc_fetch_into</methodname>
      <methodparam><type>resource</type><parameter>result_id</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>rownumber</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;result_array</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">result_array</parameter></methodparam>
     </methodsynopsis>
     <para>
      Returns the number of columns in the result;
diff --git a/reference/var/functions/is-callable.xml b/reference/var/functions/is-callable.xml
index 382d5e19e2..7cda4c409d 100644
--- a/reference/var/functions/is-callable.xml
+++ b/reference/var/functions/is-callable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/var.xml, last change in rev 1.87 -->
   <refentry id="function.is-callable">
    <refnamediv>
@@ -14,7 +14,7 @@
       <type>bool</type><methodname>is_callable</methodname>
       <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
       <methodparam choice="opt"><type>bool</type><parameter>syntax_only</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>&amp;callable_name</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter role="reference">callable_name</parameter></methodparam>
      </methodsynopsis>
     <para>
      Verify that the contents of a variable can be called as a function.
diff --git a/reference/var/functions/settype.xml b/reference/var/functions/settype.xml
index 152fd01e1d..15c12cf197 100644
--- a/reference/var/functions/settype.xml
+++ b/reference/var/functions/settype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/var.xml, last change in rev 1.2 -->
   <refentry id="function.settype">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>settype</methodname>
-      <methodparam><type>mixed</type><parameter>&amp;var</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter role="reference">var</parameter></methodparam>
       <methodparam><type>string</type><parameter>type</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/xdiff/functions/xdiff-string-merge3.xml b/reference/xdiff/functions/xdiff-string-merge3.xml
index 635a3c0f43..cf352f28f1 100644
--- a/reference/xdiff/functions/xdiff-string-merge3.xml
+++ b/reference/xdiff/functions/xdiff-string-merge3.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.xdiff-string-merge3">
    <refnamediv>
@@ -15,7 +15,7 @@
      <methodparam><type>string</type><parameter>str1</parameter></methodparam>
      <methodparam><type>string</type><parameter>str2</parameter></methodparam>
      <methodparam><type>string</type><parameter>str3</parameter></methodparam>
-     <methodparam choice="opt"><type>string</type><parameter>&amp;error</parameter></methodparam>
+     <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam>
     </methodsynopsis>
     <para>
      <function>xdiff_string_merge3</function> merges strings 
diff --git a/reference/xdiff/functions/xdiff-string-patch.xml b/reference/xdiff/functions/xdiff-string-patch.xml
index 3b58c0b7d8..c963409642 100644
--- a/reference/xdiff/functions/xdiff-string-patch.xml
+++ b/reference/xdiff/functions/xdiff-string-patch.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.xdiff-string-patch">
    <refnamediv>
@@ -15,7 +15,7 @@
      <methodparam><type>string</type><parameter>str</parameter></methodparam>
      <methodparam><type>string</type><parameter>patch</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-     <methodparam choice="opt"><type>string</type><parameter>&amp;error</parameter></methodparam>
+     <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam>
     </methodsynopsis>
     <para>
      <function>xdiff_string_patch</function> patches string
diff --git a/reference/xml/functions/xml-parse-into-struct.xml b/reference/xml/functions/xml-parse-into-struct.xml
index eac54acb21..445bcbffc5 100644
--- a/reference/xml/functions/xml-parse-into-struct.xml
+++ b/reference/xml/functions/xml-parse-into-struct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/xml.xml, last change in rev 1.11 -->
   <refentry id="function.xml-parse-into-struct">
    <refnamediv>
@@ -12,8 +12,8 @@
      <type>int</type><methodname>xml_parse_into_struct</methodname>
      <methodparam><type>resource</type><parameter>parser</parameter></methodparam>
      <methodparam><type>string</type><parameter>data</parameter></methodparam>
-     <methodparam><type>array</type><parameter>&amp;values</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>&amp;index</parameter></methodparam>
+     <methodparam><type>array</type><parameter role="reference">values</parameter></methodparam>
+     <methodparam choice="opt"><type>array</type><parameter role="reference">index</parameter></methodparam>
     </methodsynopsis>
     <para>
      This function parses an XML file into 2 parallel array
diff --git a/reference/xml/functions/xml-set-object.xml b/reference/xml/functions/xml-set-object.xml
index 9063b860e3..a758390f4e 100644
--- a/reference/xml/functions/xml-set-object.xml
+++ b/reference/xml/functions/xml-set-object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/xml.xml, last change in rev 1.2 -->
   <refentry id="function.xml-set-object">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>void</type><methodname>xml_set_object</methodname>
       <methodparam><type>resource</type><parameter>parser</parameter></methodparam>
-      <methodparam><type>object</type><parameter>&amp;object</parameter></methodparam>
+      <methodparam><type>object</type><parameter role="reference">object</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function allows to use <parameter>parser</parameter> inside
diff --git a/reference/xmlrpc/functions/xmlrpc-decode-request.xml b/reference/xmlrpc/functions/xmlrpc-decode-request.xml
index 69951ed181..c917c2b8af 100644
--- a/reference/xmlrpc/functions/xmlrpc-decode-request.xml
+++ b/reference/xmlrpc/functions/xmlrpc-decode-request.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
   <refentry id="function.xmlrpc-decode-request">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>array</type><methodname>xmlrpc_decode_request</methodname>
       <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;method</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">method</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
diff --git a/reference/xmlrpc/functions/xmlrpc-set-type.xml b/reference/xmlrpc/functions/xmlrpc-set-type.xml
index 4f06ad4a18..b88b5b04c8 100644
--- a/reference/xmlrpc/functions/xmlrpc-set-type.xml
+++ b/reference/xmlrpc/functions/xmlrpc-set-type.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
   <refentry id="function.xmlrpc-set-type">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>xmlrpc_set_type</methodname>
-      <methodparam><type>string</type><parameter>&amp;value</parameter></methodparam>
+      <methodparam><type>string</type><parameter role="reference">value</parameter></methodparam>
       <methodparam><type>string</type><parameter>type</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
diff --git a/reference/xslt/functions/xslt-set-object.xml b/reference/xslt/functions/xslt-set-object.xml
index ae5dc8e65a..eaa5932c35 100755
--- a/reference/xslt/functions/xslt-set-object.xml
+++ b/reference/xslt/functions/xslt-set-object.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.xslt-set-object">
    <refnamediv>
     <refname>xslt_set_object</refname>
@@ -12,7 +12,7 @@
     <methodsynopsis>
      <type>int</type><methodname>xslt_set_object</methodname>
      <methodparam><type>resource</type><parameter>processor</parameter></methodparam>
-     <methodparam><type>object</type><parameter>&amp;obj</parameter></methodparam>
+     <methodparam><type>object</type><parameter role="reference">obj</parameter></methodparam>
     </methodsynopsis>
     <para>
      This function allows to use the <parameter>processor</parameter> inside
diff --git a/reference/yaz/functions/yaz-ccl-parse.xml b/reference/yaz/functions/yaz-ccl-parse.xml
index d34f7ef37c..b7615e6e6d 100644
--- a/reference/yaz/functions/yaz-ccl-parse.xml
+++ b/reference/yaz/functions/yaz-ccl-parse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/yaz.xml, last change in rev 1.1 -->
   <refentry id="function.yaz-ccl-parse">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>bool</type><methodname>yaz_ccl_parse</methodname>
       <methodparam><type>resource</type><parameter>id</parameter></methodparam>
       <methodparam><type>string</type><parameter>query</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;result</parameter></methodparam>
+      <methodparam><type>array</type><parameter role="reference">result</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function invokes a CCL parser. It converts a given
diff --git a/reference/yaz/functions/yaz-scan-result.xml b/reference/yaz/functions/yaz-scan-result.xml
index c01cdb1053..6e37d3deef 100644
--- a/reference/yaz/functions/yaz-scan-result.xml
+++ b/reference/yaz/functions/yaz-scan-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/yaz.xml, last change in rev 1.8 -->
   <refentry id="function.yaz-scan-result">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>array</type><methodname>yaz_scan_result</methodname>
       <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;result</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">result</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>yaz_scan_result</function> returns terms and associated
diff --git a/reference/yaz/functions/yaz-wait.xml b/reference/yaz/functions/yaz-wait.xml
index 0cfa2de3cc..dd2d5c00b4 100644
--- a/reference/yaz/functions/yaz-wait.xml
+++ b/reference/yaz/functions/yaz-wait.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/yaz.xml, last change in rev 1.15 -->
   <refentry id="function.yaz-wait">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>yaz_wait</methodname>
-      <methodparam choice="opt"><type>array</type><parameter>&amp;options</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter role="reference">options</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function carries out networked (blocked) activity for