diff --git a/entities/entities.inherited.ent b/entities/entities.inherited.ent
new file mode 100644
index 000000000..b45fa7b47
--- /dev/null
+++ b/entities/entities.inherited.ent
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+<!--
+
+Members inherited from core classes and interfaces.
+
+Extension classes that extend Exception or Error, or implement core
+interfaces, used to pull the inherited synopses into their class
+synopsis with xi:include xpointers targeting ids such as
+class.exception. Those ids live in doc-en, not in this repository,
+so the includes cannot resolve here.
+
+Each entity below replaces one such include group with a copy of the
+synopses it used to pull in. Sources (doc-en):
+
+  language/predefined/exception.xml, exception/*.xml
+  language/predefined/error.xml, error/*.xml
+  language/predefined/arrayaccess/*.xml
+  language/predefined/countable/count.xml
+  language/predefined/iteratoraggregate/getiterator.xml
+  reference/json/jsonserializable/jsonserialize.xml
+
+Two things differ from the originals, because the copies are expanded
+into many pages of a manual that does not contain the core classes:
+
+  - linkend attributes on varname (and any xml:id on a synopsis) are
+    dropped: their targets do not exist here, and ids would be
+    duplicated on every page using the entity.
+  - methodname and varname carry an xlink:href to the corresponding
+    page of the core manual instead, using the url.php.manual.*
+    entities from entities.manual.ent.
+
+If cross-manual inclusion ever becomes available, only the bodies in
+this file need to change; the referencing files stay as they are.
+
+See doc-base/scripts/text-entities.php for details.
+
+-->
+
+<entities xmlns       = "http://docbook.org/ns/docbook"
+          xmlns:xlink = "http://www.w3.org/1999/xlink"
+          translate   = "yes">
+
+<!-- Exception -->
+
+<entity name="class.exception.properties">
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>string</type>
+     <varname xlink:href="&url.php.manual.class.exception;#exception.props.message">message</varname>
+     <initializer>""</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>private</modifier>
+     <type>string</type>
+     <varname xlink:href="&url.php.manual.class.exception;#exception.props.string">string</varname>
+     <initializer>""</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>int</type>
+     <varname xlink:href="&url.php.manual.class.exception;#exception.props.code">code</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>string</type>
+     <varname xlink:href="&url.php.manual.class.exception;#exception.props.file">file</varname>
+     <initializer>""</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>int</type>
+     <varname xlink:href="&url.php.manual.class.exception;#exception.props.line">line</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>private</modifier>
+     <type>array</type>
+     <varname xlink:href="&url.php.manual.class.exception;#exception.props.trace">trace</varname>
+     <initializer>[]</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>private</modifier>
+     <type class="union"><type xlink:href="&url.php.manual.class.throwable;">Throwable</type><type>null</type></type>
+     <varname xlink:href="&url.php.manual.class.exception;#exception.props.previous">previous</varname>
+     <initializer>null</initializer>
+    </fieldsynopsis>
+</entity>
+
+<entity name="class.exception.methods">
+    <constructorsynopsis role="Exception">
+     <modifier>public</modifier> <methodname xlink:href="&url.php.manual.exception.construct;">Exception::__construct</methodname>
+     <methodparam choice="opt"><type>string</type><parameter>message</parameter><initializer>""</initializer></methodparam>
+     <methodparam choice="opt"><type>int</type><parameter>code</parameter><initializer>0</initializer></methodparam>
+     <methodparam choice="opt"><type class="union"><type xlink:href="&url.php.manual.class.throwable;">Throwable</type><type>null</type></type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
+    </constructorsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.exception.getmessage;">Exception::getMessage</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type xlink:href="&url.php.manual.class.throwable;">Throwable</type><type>null</type></type><methodname xlink:href="&url.php.manual.exception.getprevious;">Exception::getPrevious</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname xlink:href="&url.php.manual.exception.getcode;">Exception::getCode</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.exception.getfile;">Exception::getFile</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname xlink:href="&url.php.manual.exception.getline;">Exception::getLine</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname xlink:href="&url.php.manual.exception.gettrace;">Exception::getTrace</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.exception.gettraceasstring;">Exception::getTraceAsString</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.exception.tostring;">Exception::__toString</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Exception">
+     <modifier>private</modifier> <type>void</type><methodname xlink:href="&url.php.manual.exception.clone;">Exception::__clone</methodname>
+     <void/>
+    </methodsynopsis>
+</entity>
+
+<!-- Error -->
+
+<entity name="class.error.properties">
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>string</type>
+     <varname xlink:href="&url.php.manual.class.error;#error.props.message">message</varname>
+     <initializer>""</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>private</modifier>
+     <type>string</type>
+     <varname xlink:href="&url.php.manual.class.error;#error.props.string">string</varname>
+     <initializer>""</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>int</type>
+     <varname xlink:href="&url.php.manual.class.error;#error.props.code">code</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>string</type>
+     <varname xlink:href="&url.php.manual.class.error;#error.props.file">file</varname>
+     <initializer>""</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>protected</modifier>
+     <type>int</type>
+     <varname xlink:href="&url.php.manual.class.error;#error.props.line">line</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>private</modifier>
+     <type>array</type>
+     <varname xlink:href="&url.php.manual.class.error;#error.props.trace">trace</varname>
+     <initializer>[]</initializer>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>private</modifier>
+     <type class="union"><type xlink:href="&url.php.manual.class.throwable;">Throwable</type><type>null</type></type>
+     <varname xlink:href="&url.php.manual.class.error;#error.props.previous">previous</varname>
+     <initializer>null</initializer>
+    </fieldsynopsis>
+</entity>
+
+<entity name="class.error.methods">
+    <constructorsynopsis role="Error">
+     <modifier>public</modifier> <methodname xlink:href="&url.php.manual.error.construct;">Error::__construct</methodname>
+     <methodparam choice="opt"><type>string</type><parameter>message</parameter><initializer>""</initializer></methodparam>
+     <methodparam choice="opt"><type>int</type><parameter>code</parameter><initializer>0</initializer></methodparam>
+     <methodparam choice="opt"><type class="union"><type xlink:href="&url.php.manual.class.throwable;">Throwable</type><type>null</type></type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
+    </constructorsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.error.getmessage;">Error::getMessage</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type xlink:href="&url.php.manual.class.throwable;">Throwable</type><type>null</type></type><methodname xlink:href="&url.php.manual.error.getprevious;">Error::getPrevious</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname xlink:href="&url.php.manual.error.getcode;">Error::getCode</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.error.getfile;">Error::getFile</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname xlink:href="&url.php.manual.error.getline;">Error::getLine</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname xlink:href="&url.php.manual.error.gettrace;">Error::getTrace</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.error.gettraceasstring;">Error::getTraceAsString</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>public</modifier> <type>string</type><methodname xlink:href="&url.php.manual.error.tostring;">Error::__toString</methodname>
+     <void/>
+    </methodsynopsis>
+    <methodsynopsis role="Error">
+     <modifier>private</modifier> <type>void</type><methodname xlink:href="&url.php.manual.error.clone;">Error::__clone</methodname>
+     <void/>
+    </methodsynopsis>
+</entity>
+
+<!-- Interfaces -->
+
+<entity name="class.arrayaccess.methods">
+    <methodsynopsis role="ArrayAccess">
+     <modifier>public</modifier> <type>bool</type><methodname xlink:href="&url.php.manual.arrayaccess.offsetexists;">ArrayAccess::offsetExists</methodname>
+     <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
+    </methodsynopsis>
+    <methodsynopsis role="ArrayAccess">
+     <modifier>public</modifier> <type>mixed</type><methodname xlink:href="&url.php.manual.arrayaccess.offsetget;">ArrayAccess::offsetGet</methodname>
+     <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
+    </methodsynopsis>
+    <methodsynopsis role="ArrayAccess">
+     <modifier>public</modifier> <type>void</type><methodname xlink:href="&url.php.manual.arrayaccess.offsetset;">ArrayAccess::offsetSet</methodname>
+     <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
+     <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+    </methodsynopsis>
+    <methodsynopsis role="ArrayAccess">
+     <modifier>public</modifier> <type>void</type><methodname xlink:href="&url.php.manual.arrayaccess.offsetunset;">ArrayAccess::offsetUnset</methodname>
+     <methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
+    </methodsynopsis>
+</entity>
+
+<entity name="class.countable.methods">
+    <methodsynopsis role="Countable">
+     <modifier>public</modifier> <type>int</type><methodname xlink:href="&url.php.manual.countable.count;">Countable::count</methodname>
+     <void/>
+    </methodsynopsis>
+</entity>
+
+<entity name="class.iteratoraggregate.methods">
+    <methodsynopsis role="IteratorAggregate">
+     <modifier>public</modifier> <type xlink:href="&url.php.manual.class.traversable;">Traversable</type><methodname xlink:href="&url.php.manual.iteratoraggregate.getiterator;">IteratorAggregate::getIterator</methodname>
+     <void/>
+    </methodsynopsis>
+</entity>
+
+<entity name="class.jsonserializable.methods">
+    <methodsynopsis role="JsonSerializable">
+     <modifier>public</modifier> <type>mixed</type><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname>
+     <void/>
+    </methodsynopsis>
+</entity>
+
+</entities>
diff --git a/entities/entities.manual.ent b/entities/entities.manual.ent
index a08e72eb0..dcf9e569e 100644
--- a/entities/entities.manual.ent
+++ b/entities/entities.manual.ent
@@ -12,7 +12,10 @@ URLs rather than linkends. Any links to other manual books should live here.
 <entities xmlns       = "http://docbook.org/ns/docbook"
           xmlns:xlink = "http://www.w3.org/1999/xlink"
           translate   = "yes">
-
+<entity name="url.php.manual.arrayaccess.offsetexists">&url.php.manual;arrayaccess.offsetexists.php</entity>
+<entity name="url.php.manual.arrayaccess.offsetget">&url.php.manual;arrayaccess.offsetget.php</entity>
+<entity name="url.php.manual.arrayaccess.offsetset">&url.php.manual;arrayaccess.offsetset.php</entity>
+<entity name="url.php.manual.arrayaccess.offsetunset">&url.php.manual;arrayaccess.offsetunset.php</entity>
 <entity name="url.php.manual.book.curl">&url.php.manual;book.curl.php</entity>
 <entity name="url.php.manual.book.filesystem">&url.php.manual;book.filesystem.php</entity>
 <entity name="url.php.manual.book.iconv">&url.php.manual;book.iconv.php</entity>
@@ -26,26 +29,232 @@ URLs rather than linkends. Any links to other manual books should live here.
 <entity name="url.php.manual.book.pcre">&url.php.manual;book.pcre.php</entity>
 <entity name="url.php.manual.book.sodium">&url.php.manual;book.sodium.php</entity>
 <entity name="url.php.manual.book.stream">&url.php.manual;book.stream.php</entity>
+<entity name="url.php.manual.class.arrayaccess">&url.php.manual;class.arrayaccess.php</entity>
+<entity name="url.php.manual.class.arrayiterator">&url.php.manual;class.arrayiterator.php</entity>
+<entity name="url.php.manual.class.arrayobject">&url.php.manual;class.arrayobject.php</entity>
+<entity name="url.php.manual.class.closure">&url.php.manual;class.closure.php</entity>
+<entity name="url.php.manual.class.countable">&url.php.manual;class.countable.php</entity>
+<entity name="url.php.manual.class.datetime">&url.php.manual;class.datetime.php</entity>
+<entity name="url.php.manual.class.datetimeimmutable">&url.php.manual;class.datetimeimmutable.php</entity>
+<entity name="url.php.manual.class.datetimeinterface">&url.php.manual;class.datetimeinterface.php</entity>
+<entity name="url.php.manual.class.domdocument">&url.php.manual;class.domdocument.php</entity>
+<entity name="url.php.manual.class.error">&url.php.manual;class.error.php</entity>
+<entity name="url.php.manual.class.exception">&url.php.manual;class.exception.php</entity>
+<entity name="url.php.manual.class.invalidargumentexception">&url.php.manual;class.invalidargumentexception.php</entity>
+<entity name="url.php.manual.class.iterator">&url.php.manual;class.iterator.php</entity>
+<entity name="url.php.manual.class.iteratoraggregate">&url.php.manual;class.iteratoraggregate.php</entity>
+<entity name="url.php.manual.class.iteratoriterator">&url.php.manual;class.iteratoriterator.php</entity>
+<entity name="url.php.manual.class.jsonserializable">&url.php.manual;class.jsonserializable.php</entity>
+<entity name="url.php.manual.class.logicexception">&url.php.manual;class.logicexception.php</entity>
+<entity name="url.php.manual.class.outofboundsexception">&url.php.manual;class.outofboundsexception.php</entity>
+<entity name="url.php.manual.class.outofrangeexception">&url.php.manual;class.outofrangeexception.php</entity>
+<entity name="url.php.manual.class.reflectionclass">&url.php.manual;class.reflectionclass.php</entity>
+<entity name="url.php.manual.class.reflectionmethod">&url.php.manual;class.reflectionmethod.php</entity>
+<entity name="url.php.manual.class.runtimeexception">&url.php.manual;class.runtimeexception.php</entity>
+<entity name="url.php.manual.class.serializable">&url.php.manual;class.serializable.php</entity>
+<entity name="url.php.manual.class.socket">&url.php.manual;class.socket.php</entity>
+<entity name="url.php.manual.class.spldoublylinkedlist">&url.php.manual;class.spldoublylinkedlist.php</entity>
+<entity name="url.php.manual.class.splfixedarray">&url.php.manual;class.splfixedarray.php</entity>
+<entity name="url.php.manual.class.stdclass">&url.php.manual;class.stdclass.php</entity>
+<entity name="url.php.manual.class.stringable">&url.php.manual;class.stringable.php</entity>
+<entity name="url.php.manual.class.throwable">&url.php.manual;class.throwable.php</entity>
+<entity name="url.php.manual.class.traversable">&url.php.manual;class.traversable.php</entity>
+<entity name="url.php.manual.class.typeerror">&url.php.manual;class.typeerror.php</entity>
+<entity name="url.php.manual.class.underflowexception">&url.php.manual;class.underflowexception.php</entity>
+<entity name="url.php.manual.class.unexpectedvalueexception">&url.php.manual;class.unexpectedvalueexception.php</entity>
+<entity name="url.php.manual.class.valueerror">&url.php.manual;class.valueerror.php</entity>
 <entity name="url.php.manual.configuration.changes.modes">&url.php.manual;configuration.changes.modes.php</entity>
 <entity name="url.php.manual.configuration.file">&url.php.manual;configuration.file.php</entity>
+<entity name="url.php.manual.constant.curlopt-resolve">&url.php.manual;constant.curlopt-abstract-unix-socket.php#constant.curlopt-resolve</entity>
+<entity name="url.php.manual.constant.curlopt-ssl-verifyhost">&url.php.manual;constant.curlopt-abstract-unix-socket.php#constant.curlopt-ssl-verifyhost</entity>
+<entity name="url.php.manual.constant.curlopt-ssl-verifypeer">&url.php.manual;constant.curlopt-abstract-unix-socket.php#constant.curlopt-ssl-verifypeer</entity>
+<entity name="url.php.manual.constant.e-error">&url.php.manual;errorfunc.constants.php#constant.e-error</entity>
+<entity name="url.php.manual.constant.e-notice">&url.php.manual;errorfunc.constants.php#constant.e-notice</entity>
+<entity name="url.php.manual.constant.e-user-warning">&url.php.manual;errorfunc.constants.php#constant.e-user-warning</entity>
+<entity name="url.php.manual.constant.e-warning">&url.php.manual;errorfunc.constants.php#constant.e-warning</entity>
+<entity name="url.php.manual.constant.inf">&url.php.manual;math.constants.php#constant.inf</entity>
+<entity name="url.php.manual.constant.ini-all">&url.php.manual;info.constants.php#constant.ini-all</entity>
+<entity name="url.php.manual.constant.ini-perdir">&url.php.manual;info.constants.php#constant.ini-perdir</entity>
+<entity name="url.php.manual.constant.ini-system">&url.php.manual;info.constants.php#constant.ini-system</entity>
+<entity name="url.php.manual.constant.lc-ctype">&url.php.manual;string.constants.php#constant.lc-ctype</entity>
+<entity name="url.php.manual.constant.nan">&url.php.manual;math.constants.php#constant.nan</entity>
+<entity name="url.php.manual.constant.null">&url.php.manual;reserved.constants.core.php#constant.null</entity>
+<entity name="url.php.manual.constant.php-int-max">&url.php.manual;reserved.constants.core.php#constant.php-int-max</entity>
+<entity name="url.php.manual.constant.php-int-min">&url.php.manual;reserved.constants.core.php#constant.php-int-min</entity>
+<entity name="url.php.manual.constant.php-int-size">&url.php.manual;reserved.constants.core.php#constant.php-int-size</entity>
+<entity name="url.php.manual.constant.php-version">&url.php.manual;reserved.constants.core.php#constant.php-version</entity>
+<entity name="url.php.manual.constant.php-zts">&url.php.manual;reserved.constants.core.php#constant.php-zts</entity>
+<entity name="url.php.manual.constant.seek-cur">&url.php.manual;filesystem.constants.php#constant.seek-cur</entity>
+<entity name="url.php.manual.constant.seek-end">&url.php.manual;filesystem.constants.php#constant.seek-end</entity>
+<entity name="url.php.manual.constant.seek-set">&url.php.manual;filesystem.constants.php#constant.seek-set</entity>
+<entity name="url.php.manual.constant.sigalrm">&url.php.manual;pcntl.constants.php#constant.sigalrm</entity>
+<entity name="url.php.manual.constant.sigchld">&url.php.manual;pcntl.constants.php#constant.sigchld</entity>
+<entity name="url.php.manual.constant.sighup">&url.php.manual;pcntl.constants.php#constant.sighup</entity>
+<entity name="url.php.manual.constant.sigint">&url.php.manual;pcntl.constants.php#constant.sigint</entity>
+<entity name="url.php.manual.constant.sigio">&url.php.manual;pcntl.constants.php#constant.sigio</entity>
+<entity name="url.php.manual.constant.sigterm">&url.php.manual;pcntl.constants.php#constant.sigterm</entity>
+<entity name="url.php.manual.constant.stdin">&url.php.manual;reserved.constants.core.php#constant.stdin</entity>
 <entity name="url.php.manual.context.ssl">&url.php.manual;context.ssl.php</entity>
 <entity name="url.php.manual.control-structures.foreach">&url.php.manual;control-structures.foreach.php</entity>
+<entity name="url.php.manual.countable.count">&url.php.manual;countable.count.php</entity>
+<entity name="url.php.manual.error.clone">&url.php.manual;error.clone.php</entity>
+<entity name="url.php.manual.error.construct">&url.php.manual;error.construct.php</entity>
+<entity name="url.php.manual.error.getcode">&url.php.manual;error.getcode.php</entity>
+<entity name="url.php.manual.error.getfile">&url.php.manual;error.getfile.php</entity>
+<entity name="url.php.manual.error.getline">&url.php.manual;error.getline.php</entity>
+<entity name="url.php.manual.error.getmessage">&url.php.manual;error.getmessage.php</entity>
+<entity name="url.php.manual.error.getprevious">&url.php.manual;error.getprevious.php</entity>
+<entity name="url.php.manual.error.gettrace">&url.php.manual;error.gettrace.php</entity>
+<entity name="url.php.manual.error.gettraceasstring">&url.php.manual;error.gettraceasstring.php</entity>
+<entity name="url.php.manual.error.tostring">&url.php.manual;error.tostring.php</entity>
+<entity name="url.php.manual.exception.clone">&url.php.manual;exception.clone.php</entity>
+<entity name="url.php.manual.exception.construct">&url.php.manual;exception.construct.php</entity>
+<entity name="url.php.manual.exception.getcode">&url.php.manual;exception.getcode.php</entity>
+<entity name="url.php.manual.exception.getfile">&url.php.manual;exception.getfile.php</entity>
+<entity name="url.php.manual.exception.getline">&url.php.manual;exception.getline.php</entity>
+<entity name="url.php.manual.exception.getmessage">&url.php.manual;exception.getmessage.php</entity>
+<entity name="url.php.manual.exception.getprevious">&url.php.manual;exception.getprevious.php</entity>
+<entity name="url.php.manual.exception.gettrace">&url.php.manual;exception.gettrace.php</entity>
+<entity name="url.php.manual.exception.gettraceasstring">&url.php.manual;exception.gettraceasstring.php</entity>
+<entity name="url.php.manual.exception.tostring">&url.php.manual;exception.tostring.php</entity>
 <entity name="url.php.manual.faq.installation.addtopath">&url.php.manual;faq.installation.php#faq.installation.addtopath</entity>
 <entity name="url.php.manual.faq.using.shorthandbytes">&url.php.manual;faq.using.php#faq.using.shorthandbytes</entity>
 <entity name="url.php.manual.features.commandline">&url.php.manual;features.commandline.php</entity>
 <entity name="url.php.manual.features.persistent-connections">&url.php.manual;features.persistent-connections.php</entity>
+<entity name="url.php.manual.function.basename">&url.php.manual;function.basename.php</entity>
+<entity name="url.php.manual.function.call-user-func">&url.php.manual;function.call-user-func.php</entity>
+<entity name="url.php.manual.function.chmod">&url.php.manual;function.chmod.php</entity>
+<entity name="url.php.manual.function.copy">&url.php.manual;function.copy.php</entity>
+<entity name="url.php.manual.function.create-function">&url.php.manual;function.create-function.php</entity>
+<entity name="url.php.manual.function.crypt">&url.php.manual;function.crypt.php</entity>
+<entity name="url.php.manual.function.curl-getinfo">&url.php.manual;function.curl-getinfo.php</entity>
+<entity name="url.php.manual.function.date">&url.php.manual;function.date.php</entity>
+<entity name="url.php.manual.function.date-create">&url.php.manual;function.date-create.php</entity>
+<entity name="url.php.manual.function.define">&url.php.manual;function.define.php</entity>
+<entity name="url.php.manual.function.dirname">&url.php.manual;function.dirname.php</entity>
+<entity name="url.php.manual.function.dl">&url.php.manual;function.dl.php</entity>
+<entity name="url.php.manual.function.exec">&url.php.manual;function.exec.php</entity>
+<entity name="url.php.manual.function.exit">&url.php.manual;function.exit.php</entity>
+<entity name="url.php.manual.function.explode">&url.php.manual;function.explode.php</entity>
+<entity name="url.php.manual.function.fclose">&url.php.manual;function.fclose.php</entity>
+<entity name="url.php.manual.function.file">&url.php.manual;function.file.php</entity>
 <entity name="url.php.manual.function.file-exists">&url.php.manual;function.file-exists.php</entity>
 <entity name="url.php.manual.function.file-get-contents">&url.php.manual;function.file-get-contents.php</entity>
+<entity name="url.php.manual.function.file-put-contents">&url.php.manual;function.file-put-contents.php</entity>
 <entity name="url.php.manual.function.filesize">&url.php.manual;function.filesize.php</entity>
+<entity name="url.php.manual.function.filter-var">&url.php.manual;function.filter-var.php</entity>
+<entity name="url.php.manual.function.flock">&url.php.manual;function.flock.php</entity>
+<entity name="url.php.manual.function.fopen">&url.php.manual;function.fopen.php</entity>
+<entity name="url.php.manual.function.fputs">&url.php.manual;function.fputs.php</entity>
+<entity name="url.php.manual.function.fread">&url.php.manual;function.fread.php</entity>
+<entity name="url.php.manual.function.fsockopen">&url.php.manual;function.fsockopen.php</entity>
+<entity name="url.php.manual.function.fwrite">&url.php.manual;function.fwrite.php</entity>
+<entity name="url.php.manual.function.getprotobyname">&url.php.manual;function.getprotobyname.php</entity>
+<entity name="url.php.manual.function.getrusage">&url.php.manual;function.getrusage.php</entity>
+<entity name="url.php.manual.function.hash">&url.php.manual;function.hash.php</entity>
+<entity name="url.php.manual.function.hash-equals">&url.php.manual;function.hash-equals.php</entity>
+<entity name="url.php.manual.function.hash-hmac">&url.php.manual;function.hash-hmac.php</entity>
+<entity name="url.php.manual.function.header">&url.php.manual;function.header.php</entity>
+<entity name="url.php.manual.function.highlight-file">&url.php.manual;function.highlight-file.php</entity>
+<entity name="url.php.manual.function.hrtime">&url.php.manual;function.hrtime.php</entity>
+<entity name="url.php.manual.function.htmlentities">&url.php.manual;function.htmlentities.php</entity>
+<entity name="url.php.manual.function.htmlspecialchars">&url.php.manual;function.htmlspecialchars.php</entity>
+<entity name="url.php.manual.function.iconv">&url.php.manual;function.iconv.php</entity>
+<entity name="url.php.manual.function.imagecropauto">&url.php.manual;function.imagecropauto.php</entity>
+<entity name="url.php.manual.function.implode">&url.php.manual;function.implode.php</entity>
+<entity name="url.php.manual.function.include">&url.php.manual;function.include.php</entity>
 <entity name="url.php.manual.function.is-dir">&url.php.manual;function.is-dir.php</entity>
 <entity name="url.php.manual.function.is-infinite">&url.php.manual;function.is-infinite.php</entity>
 <entity name="url.php.manual.function.is-readable">&url.php.manual;function.is-readable.php</entity>
+<entity name="url.php.manual.function.is-resource">&url.php.manual;function.is-resource.php</entity>
 <entity name="url.php.manual.function.is-writable">&url.php.manual;function.is-writable.php</entity>
+<entity name="url.php.manual.function.join">&url.php.manual;function.join.php</entity>
+<entity name="url.php.manual.function.json-decode">&url.php.manual;function.json-decode.php</entity>
+<entity name="url.php.manual.function.json-encode">&url.php.manual;function.json-encode.php</entity>
+<entity name="url.php.manual.function.lstat">&url.php.manual;function.lstat.php</entity>
+<entity name="url.php.manual.function.ltrim">&url.php.manual;function.ltrim.php</entity>
+<entity name="url.php.manual.function.mail">&url.php.manual;function.mail.php</entity>
+<entity name="url.php.manual.function.mb-convert-encoding">&url.php.manual;function.mb-convert-encoding.php</entity>
+<entity name="url.php.manual.function.memory-get-usage">&url.php.manual;function.memory-get-usage.php</entity>
+<entity name="url.php.manual.function.mkdir">&url.php.manual;function.mkdir.php</entity>
+<entity name="url.php.manual.function.move-uploaded-file">&url.php.manual;function.move-uploaded-file.php</entity>
+<entity name="url.php.manual.function.oci-parse">&url.php.manual;function.oci-parse.php</entity>
+<entity name="url.php.manual.function.opendir">&url.php.manual;function.opendir.php</entity>
+<entity name="url.php.manual.function.openssl-random-pseudo-bytes">&url.php.manual;function.openssl-random-pseudo-bytes.php</entity>
+<entity name="url.php.manual.function.parse-ini-file">&url.php.manual;function.parse-ini-file.php</entity>
+<entity name="url.php.manual.function.passthru">&url.php.manual;function.passthru.php</entity>
+<entity name="url.php.manual.function.password-hash">&url.php.manual;function.password-hash.php</entity>
+<entity name="url.php.manual.function.pathinfo">&url.php.manual;function.pathinfo.php</entity>
+<entity name="url.php.manual.function.pg-query">&url.php.manual;function.pg-query.php</entity>
+<entity name="url.php.manual.function.pg-send-query">&url.php.manual;function.pg-send-query.php</entity>
 <entity name="url.php.manual.function.phpinfo">&url.php.manual;function.phpinfo.php</entity>
+<entity name="url.php.manual.function.phpversion">&url.php.manual;function.phpversion.php</entity>
+<entity name="url.php.manual.function.popen">&url.php.manual;function.popen.php</entity>
+<entity name="url.php.manual.function.preg-grep">&url.php.manual;function.preg-grep.php</entity>
+<entity name="url.php.manual.function.preg-match">&url.php.manual;function.preg-match.php</entity>
+<entity name="url.php.manual.function.preg-match-all">&url.php.manual;function.preg-match-all.php</entity>
+<entity name="url.php.manual.function.preg-replace">&url.php.manual;function.preg-replace.php</entity>
+<entity name="url.php.manual.function.preg-replace-callback">&url.php.manual;function.preg-replace-callback.php</entity>
+<entity name="url.php.manual.function.preg-split">&url.php.manual;function.preg-split.php</entity>
+<entity name="url.php.manual.function.print-r">&url.php.manual;function.print-r.php</entity>
+<entity name="url.php.manual.function.printf">&url.php.manual;function.printf.php</entity>
+<entity name="url.php.manual.function.proc-open">&url.php.manual;function.proc-open.php</entity>
 <entity name="url.php.manual.function.putenv">&url.php.manual;function.putenv.php</entity>
+<entity name="url.php.manual.function.rand">&url.php.manual;function.rand.php</entity>
+<entity name="url.php.manual.function.random-bytes">&url.php.manual;function.random-bytes.php</entity>
+<entity name="url.php.manual.function.rawurlencode">&url.php.manual;function.rawurlencode.php</entity>
 <entity name="url.php.manual.function.readfile">&url.php.manual;function.readfile.php</entity>
+<entity name="url.php.manual.function.readlink">&url.php.manual;function.readlink.php</entity>
 <entity name="url.php.manual.function.realpath">&url.php.manual;function.realpath.php</entity>
+<entity name="url.php.manual.function.rename">&url.php.manual;function.rename.php</entity>
+<entity name="url.php.manual.function.rmdir">&url.php.manual;function.rmdir.php</entity>
 <entity name="url.php.manual.function.round">&url.php.manual;function.round.php</entity>
+<entity name="url.php.manual.function.rtrim">&url.php.manual;function.rtrim.php</entity>
+<entity name="url.php.manual.function.serialize">&url.php.manual;function.serialize.php</entity>
+<entity name="url.php.manual.function.set-error-handler">&url.php.manual;function.set-error-handler.php</entity>
+<entity name="url.php.manual.function.setcookie">&url.php.manual;function.setcookie.php</entity>
+<entity name="url.php.manual.function.setrawcookie">&url.php.manual;function.setrawcookie.php</entity>
+<entity name="url.php.manual.function.shell-exec">&url.php.manual;function.shell-exec.php</entity>
+<entity name="url.php.manual.function.show-source">&url.php.manual;function.show-source.php</entity>
+<entity name="url.php.manual.function.sleep">&url.php.manual;function.sleep.php</entity>
+<entity name="url.php.manual.function.socket-get-option">&url.php.manual;function.socket-get-option.php</entity>
+<entity name="url.php.manual.function.socket-set-option">&url.php.manual;function.socket-set-option.php</entity>
+<entity name="url.php.manual.function.spl-object-hash">&url.php.manual;function.spl-object-hash.php</entity>
+<entity name="url.php.manual.function.spl-object-id">&url.php.manual;function.spl-object-id.php</entity>
+<entity name="url.php.manual.function.sprintf">&url.php.manual;function.sprintf.php</entity>
+<entity name="url.php.manual.function.stat">&url.php.manual;function.stat.php</entity>
+<entity name="url.php.manual.function.str-ireplace">&url.php.manual;function.str-ireplace.php</entity>
+<entity name="url.php.manual.function.str-pad">&url.php.manual;function.str-pad.php</entity>
+<entity name="url.php.manual.function.str-replace">&url.php.manual;function.str-replace.php</entity>
+<entity name="url.php.manual.function.stream-context-create">&url.php.manual;function.stream-context-create.php</entity>
+<entity name="url.php.manual.function.stream-select">&url.php.manual;function.stream-select.php</entity>
+<entity name="url.php.manual.function.stream-set-blocking">&url.php.manual;function.stream-set-blocking.php</entity>
+<entity name="url.php.manual.function.stream-set-timeout">&url.php.manual;function.stream-set-timeout.php</entity>
+<entity name="url.php.manual.function.strlen">&url.php.manual;function.strlen.php</entity>
+<entity name="url.php.manual.function.strstr">&url.php.manual;function.strstr.php</entity>
+<entity name="url.php.manual.function.strtolower">&url.php.manual;function.strtolower.php</entity>
+<entity name="url.php.manual.function.strtotime">&url.php.manual;function.strtotime.php</entity>
+<entity name="url.php.manual.function.strtoupper">&url.php.manual;function.strtoupper.php</entity>
+<entity name="url.php.manual.function.strval">&url.php.manual;function.strval.php</entity>
+<entity name="url.php.manual.function.substr">&url.php.manual;function.substr.php</entity>
+<entity name="url.php.manual.function.symlink">&url.php.manual;function.symlink.php</entity>
+<entity name="url.php.manual.function.sys-get-temp-dir">&url.php.manual;function.sys-get-temp-dir.php</entity>
+<entity name="url.php.manual.function.system">&url.php.manual;function.system.php</entity>
+<entity name="url.php.manual.function.touch">&url.php.manual;function.touch.php</entity>
+<entity name="url.php.manual.function.trim">&url.php.manual;function.trim.php</entity>
+<entity name="url.php.manual.function.unlink">&url.php.manual;function.unlink.php</entity>
+<entity name="url.php.manual.function.unserialize">&url.php.manual;function.unserialize.php</entity>
+<entity name="url.php.manual.function.unset">&url.php.manual;function.unset.php</entity>
+<entity name="url.php.manual.function.var-dump">&url.php.manual;function.var-dump.php</entity>
+<entity name="url.php.manual.function.var-export">&url.php.manual;function.var-export.php</entity>
+<entity name="url.php.manual.function.vprintf">&url.php.manual;function.vprintf.php</entity>
+<entity name="url.php.manual.function.vsprintf">&url.php.manual;function.vsprintf.php</entity>
+<entity name="url.php.manual.gender-gender.connect">&url.php.manual;gender-gender.connect.php</entity>
+<entity name="url.php.manual.gender-gender.construct">&url.php.manual;gender-gender.construct.php</entity>
+<entity name="url.php.manual.gender-gender.country">&url.php.manual;gender-gender.country.php</entity>
+<entity name="url.php.manual.gender-gender.get">&url.php.manual;gender-gender.get.php</entity>
+<entity name="url.php.manual.gender-gender.isnick">&url.php.manual;gender-gender.isnick.php</entity>
+<entity name="url.php.manual.gender-gender.similarnames">&url.php.manual;gender-gender.similarnames.php</entity>
 <entity name="url.php.manual.ini.default-socket-timeout">&url.php.manual;filesystem.configuration.php#ini.default-socket-timeout</entity>
 <entity name="url.php.manual.ini.error-reporting">&url.php.manual;errorfunc.configuration.php#ini.error-reporting</entity>
 <entity name="url.php.manual.ini.extension">&url.php.manual;ini.core.php#ini.extension</entity>
@@ -65,6 +274,13 @@ URLs rather than linkends. Any links to other manual books should live here.
 <entity name="url.php.manual.install.windows.building">&url.php.manual;install.windows.building.php</entity>
 <entity name="url.php.manual.install.windows.manual">&url.php.manual;install.windows.manual.php</entity>
 <entity name="url.php.manual.intro.pdo">&url.php.manual;book.pdo.php#intro.pdo</entity>
+<entity name="url.php.manual.iterator.current">&url.php.manual;iterator.current.php</entity>
+<entity name="url.php.manual.iterator.key">&url.php.manual;iterator.key.php</entity>
+<entity name="url.php.manual.iterator.next">&url.php.manual;iterator.next.php</entity>
+<entity name="url.php.manual.iterator.rewind">&url.php.manual;iterator.rewind.php</entity>
+<entity name="url.php.manual.iterator.valid">&url.php.manual;iterator.valid.php</entity>
+<entity name="url.php.manual.iteratoraggregate.getiterator">&url.php.manual;iteratoraggregate.getiterator.php</entity>
+<entity name="url.php.manual.jsonserializable.jsonserialize">&url.php.manual;jsonserializable.jsonserialize.php</entity>
 <entity name="url.php.manual.language.exceptions">&url.php.manual;language.exceptions.php</entity>
 <entity name="url.php.manual.language.oop5.autoload">&url.php.manual;language.oop5.autoload.php</entity>
 <entity name="url.php.manual.language.oop5.cloning">&url.php.manual;language.oop5.cloning.php</entity>
@@ -82,6 +298,11 @@ URLs rather than linkends. Any links to other manual books should live here.
 <entity name="url.php.manual.language.types.resource.self-destruct">&url.php.manual;language.types.resource.php#language.types.resource.self-destruct</entity>
 <entity name="url.php.manual.language.types.type-juggling">&url.php.manual;language.types.type-juggling.php</entity>
 <entity name="url.php.manual.language.variables.scope">&url.php.manual;language.variables.scope.php</entity>
+<entity name="url.php.manual.mysqli-result.fetch-field">&url.php.manual;mysqli-result.fetch-field.php</entity>
+<entity name="url.php.manual.mysqli.multi-query">&url.php.manual;mysqli.multi-query.php</entity>
+<entity name="url.php.manual.mysqli.prepare">&url.php.manual;mysqli.prepare.php</entity>
+<entity name="url.php.manual.mysqli.query">&url.php.manual;mysqli.query.php</entity>
+<entity name="url.php.manual.mysqli.real-query">&url.php.manual;mysqli.real-query.php</entity>
 <entity name="url.php.manual.mysqlinfo.api.choosing">&url.php.manual;mysqlinfo.api.choosing.php</entity>
 <entity name="url.php.manual.mysqlinfo.concepts.buffering">&url.php.manual;mysqlinfo.concepts.buffering.php</entity>
 <entity name="url.php.manual.mysqlinfo.concepts.charset">&url.php.manual;mysqlinfo.concepts.charset.php</entity>
@@ -93,6 +314,37 @@ URLs rather than linkends. Any links to other manual books should live here.
 <entity name="url.php.manual.object.sleep">&url.php.manual;language.oop5.magic.php#object.sleep</entity>
 <entity name="url.php.manual.object.unserialize">&url.php.manual;language.oop5.magic.php#object.unserialize</entity>
 <entity name="url.php.manual.object.wakeup">&url.php.manual;language.oop5.magic.php#object.wakeup</entity>
+<entity name="url.php.manual.pdo.begintransaction">&url.php.manual;pdo.begintransaction.php</entity>
+<entity name="url.php.manual.pdo.commit">&url.php.manual;pdo.commit.php</entity>
+<entity name="url.php.manual.pdo.constants.attr-client-version">&url.php.manual;pdo.constants.php#pdo.constants.attr-client-version</entity>
+<entity name="url.php.manual.pdo.constants.attr-connection-status">&url.php.manual;pdo.constants.php#pdo.constants.attr-connection-status</entity>
+<entity name="url.php.manual.pdo.constants.attr-driver-name">&url.php.manual;pdo.constants.php#pdo.constants.attr-driver-name</entity>
+<entity name="url.php.manual.pdo.constants.attr-persistent">&url.php.manual;pdo.constants.php#pdo.constants.attr-persistent</entity>
+<entity name="url.php.manual.pdo.constants.attr-server-info">&url.php.manual;pdo.constants.php#pdo.constants.attr-server-info</entity>
+<entity name="url.php.manual.pdo.constants.attr-server-version">&url.php.manual;pdo.constants.php#pdo.constants.attr-server-version</entity>
+<entity name="url.php.manual.pdo.constants.fetch-assoc">&url.php.manual;pdo.constants.fetch-modes.php#pdo.constants.fetch-assoc</entity>
+<entity name="url.php.manual.pdo.constants.fetch-num">&url.php.manual;pdo.constants.fetch-modes.php#pdo.constants.fetch-num</entity>
+<entity name="url.php.manual.pdo.constants.fetch-obj">&url.php.manual;pdo.constants.fetch-modes.php#pdo.constants.fetch-obj</entity>
+<entity name="url.php.manual.pdo.constants.fetch-ori-abs">&url.php.manual;pdo.constants.php#pdo.constants.fetch-ori-abs</entity>
+<entity name="url.php.manual.pdo.construct">&url.php.manual;pdo.construct.php</entity>
+<entity name="url.php.manual.pdo.cubrid-schema">&url.php.manual;pdo.cubrid-schema.php</entity>
+<entity name="url.php.manual.pdo.errorcode">&url.php.manual;pdo.errorcode.php</entity>
+<entity name="url.php.manual.pdo.errorinfo">&url.php.manual;pdo.errorinfo.php</entity>
+<entity name="url.php.manual.pdo.exec">&url.php.manual;pdo.exec.php</entity>
+<entity name="url.php.manual.pdo.getattribute">&url.php.manual;pdo.getattribute.php</entity>
+<entity name="url.php.manual.pdo.lastinsertid">&url.php.manual;pdo.lastinsertid.php</entity>
+<entity name="url.php.manual.pdo.prepare">&url.php.manual;pdo.prepare.php</entity>
+<entity name="url.php.manual.pdo.query">&url.php.manual;pdo.query.php</entity>
+<entity name="url.php.manual.pdo.quote">&url.php.manual;pdo.quote.php</entity>
+<entity name="url.php.manual.pdo.rollback">&url.php.manual;pdo.rollback.php</entity>
+<entity name="url.php.manual.pdo.setattribute">&url.php.manual;pdo.setattribute.php</entity>
+<entity name="url.php.manual.pdostatement.bindparam">&url.php.manual;pdostatement.bindparam.php</entity>
+<entity name="url.php.manual.pdostatement.closecursor">&url.php.manual;pdostatement.closecursor.php</entity>
+<entity name="url.php.manual.pdostatement.columncount">&url.php.manual;pdostatement.columncount.php</entity>
+<entity name="url.php.manual.pdostatement.fetch">&url.php.manual;pdostatement.fetch.php</entity>
+<entity name="url.php.manual.pdostatement.fetchcolumn">&url.php.manual;pdostatement.fetchcolumn.php</entity>
+<entity name="url.php.manual.pdostatement.getcolumnmeta">&url.php.manual;pdostatement.getcolumnmeta.php</entity>
+<entity name="url.php.manual.pdostatement.rowcount">&url.php.manual;pdostatement.rowcount.php</entity>
 <entity name="url.php.manual.ref.filesystem">&url.php.manual;ref.filesystem.php</entity>
 <entity name="url.php.manual.ref.iconv">&url.php.manual;ref.iconv.php</entity>
 <entity name="url.php.manual.ref.imap">&url.php.manual;ref.imap.php</entity>
@@ -101,12 +353,17 @@ URLs rather than linkends. Any links to other manual books should live here.
 <entity name="url.php.manual.ref.pcntl">&url.php.manual;ref.pcntl.php</entity>
 <entity name="url.php.manual.ref.pdo-mysql">&url.php.manual;ref.pdo-mysql.php</entity>
 <entity name="url.php.manual.ref.session">&url.php.manual;ref.session.php</entity>
+<entity name="url.php.manual.reflectionfunctionabstract.getstaticvariables">&url.php.manual;reflectionfunctionabstract.getstaticvariables.php</entity>
 <entity name="url.php.manual.reserved.variables.cookies">&url.php.manual;reserved.variables.cookies.php</entity>
 <entity name="url.php.manual.reserved.variables.get">&url.php.manual;reserved.variables.get.php</entity>
 <entity name="url.php.manual.reserved.variables.post">&url.php.manual;reserved.variables.post.php</entity>
 <entity name="url.php.manual.security.database.sql-injection">&url.php.manual;security.database.sql-injection.php</entity>
 <entity name="url.php.manual.spl.exceptions">&url.php.manual;spl.exceptions.php</entity>
+<entity name="url.php.manual.sqlite3.exec">&url.php.manual;sqlite3.exec.php</entity>
+<entity name="url.php.manual.sqlite3.prepare">&url.php.manual;sqlite3.prepare.php</entity>
+<entity name="url.php.manual.sqlite3.query">&url.php.manual;sqlite3.query.php</entity>
 <entity name="url.php.manual.types.comparisons">&url.php.manual;types.comparisons.php</entity>
+<entity name="url.php.manual.uconverter.transcode">&url.php.manual;uconverter.transcode.php</entity>
 <entity name="url.php.manual.wrappers.expect">&url.php.manual;wrappers.expect.php</entity>
 <entity name="url.php.manual.wrappers.rar">&url.php.manual;wrappers.rar.php</entity>
 <entity name="url.php.manual.wrappers.ssh2">&url.php.manual;wrappers.ssh2.php</entity>
diff --git a/entities/entities.snippets.ent b/entities/entities.snippets.ent
index 561ab1449..a1d6226a2 100644
--- a/entities/entities.snippets.ent
+++ b/entities/entities.snippets.ent
@@ -121,7 +121,7 @@ compiled into PHP or dynamically loaded at runtime. In addition, these
 driver-specific constants should only be used if you are using this driver.
 Using driver-specific attributes with another driver may result in
 unexpected behaviour. <function>PDO::getAttribute</function> may be used to
-obtain the <constant>PDO::ATTR_DRIVER_NAME</constant> attribute to check the
+obtain the <constant xlink:href="&url.php.manual.pdo.constants.attr-driver-name;">PDO::ATTR_DRIVER_NAME</constant> attribute to check the
 driver, if your code can run against multiple drivers.</simpara></entity>
 
 <!-- PECL entities -->
diff --git a/reference/apcu/apcuiterator.xml b/reference/apcu/apcuiterator.xml
index 924907b12..fe2d3b764 100644
--- a/reference/apcu/apcuiterator.xml
+++ b/reference/apcu/apcuiterator.xml
@@ -35,7 +35,7 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
 
     </classsynopsisinfo>
diff --git a/reference/apcu/apcuiterator/current.xml b/reference/apcu/apcuiterator/current.xml
index 5cce4dd5f..99eadd8e3 100644
--- a/reference/apcu/apcuiterator/current.xml
+++ b/reference/apcu/apcuiterator/current.xml
@@ -34,7 +34,7 @@
   &reftitle.seealso;
   <simplelist>
    <member><methodname>APCUIterator::next</methodname></member>
-   <member><methodname>Iterator::current</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.current;">Iterator::current</methodname></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/apcu/apcuiterator/key.xml b/reference/apcu/apcuiterator/key.xml
index d48684001..75c40a91b 100644
--- a/reference/apcu/apcuiterator/key.xml
+++ b/reference/apcu/apcuiterator/key.xml
@@ -33,7 +33,7 @@
   &reftitle.seealso;
   <simplelist>
    <member><methodname>APCUIterator::current</methodname></member>
-   <member><methodname>Iterator::key</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.key;">Iterator::key</methodname></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/apcu/apcuiterator/next.xml b/reference/apcu/apcuiterator/next.xml
index f24b7fd7c..1c6ceace7 100644
--- a/reference/apcu/apcuiterator/next.xml
+++ b/reference/apcu/apcuiterator/next.xml
@@ -34,7 +34,7 @@
   <simplelist>
    <member><methodname>APCUIterator::current</methodname></member>
    <member><methodname>APCUIterator::rewind</methodname></member>
-   <member><methodname>Iterator::next</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.next;">Iterator::next</methodname></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/apcu/apcuiterator/rewind.xml b/reference/apcu/apcuiterator/rewind.xml
index 1204b4a97..57bc1b0f1 100644
--- a/reference/apcu/apcuiterator/rewind.xml
+++ b/reference/apcu/apcuiterator/rewind.xml
@@ -33,7 +33,7 @@
   &reftitle.seealso;
   <simplelist>
    <member><methodname>APCUIterator::next</methodname></member>
-   <member><methodname>Iterator::next</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.next;">Iterator::next</methodname></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/apcu/apcuiterator/valid.xml b/reference/apcu/apcuiterator/valid.xml
index 9a5c27755..4c820fc7a 100644
--- a/reference/apcu/apcuiterator/valid.xml
+++ b/reference/apcu/apcuiterator/valid.xml
@@ -33,7 +33,7 @@
   &reftitle.seealso;
   <simplelist>
    <member><methodname>APCUIterator::current</methodname></member>
-   <member><methodname>Iterator::valid</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.valid;">Iterator::valid</methodname></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/apcu/ini.xml b/reference/apcu/ini.xml
index e2eb1ef01..638105186 100644
--- a/reference/apcu/ini.xml
+++ b/reference/apcu/ini.xml
@@ -60,79 +60,79 @@
      <row>
       <entry><link linkend="ini.apcu.enabled">apc.enabled</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.shm-segments">apc.shm_segments</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.shm-size">apc.shm_size</link></entry>
       <entry>"32M"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.entries-hint">apc.entries_hint</link></entry>
       <entry>512 * apc.shm_size</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Prior to APCu 5.1.25, the default was 4096</entry>
      </row>
      <row>
       <entry><link linkend="ini.apcu.ttl">apc.ttl</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.gc-ttl">apc.gc_ttl</link></entry>
       <entry>3600</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.mmap-file-mask">apc.mmap_file_mask</link></entry>
       <entry>NULL</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.slam-defense">apc.slam_defense</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.enable-cli">apc.enable_cli</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.use-request-time">apc.use_request_time</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Prior to APCu 5.1.19, the default was <literal>1</literal>.</entry>
      </row>
      <row>
       <entry><link linkend="ini.apcu.serializer">apc.serializer</link></entry>
       <entry>"php"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Prior to APCu 5.1.15, the default was <literal>"default"</literal>.</entry>
      </row>
      <row>
       <entry><link linkend="ini.apcu.coredump-unmap">apc.coredump_unmap</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.apcu.preload-path">apc.preload_path</link></entry>
       <entry>NULL</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
     </tbody>
diff --git a/reference/cmark/commonmark.node.blockquote.xml b/reference/cmark/commonmark.node.blockquote.xml
index cdc4f3492..e9520d1b3 100644
--- a/reference/cmark/commonmark.node.blockquote.xml
+++ b/reference/cmark/commonmark.node.blockquote.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.bulletlist.xml b/reference/cmark/commonmark.node.bulletlist.xml
index cc64e15a8..db906c0e6 100644
--- a/reference/cmark/commonmark.node.bulletlist.xml
+++ b/reference/cmark/commonmark.node.bulletlist.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.code.xml b/reference/cmark/commonmark.node.code.xml
index d484612f4..d6c3f9c6e 100644
--- a/reference/cmark/commonmark.node.code.xml
+++ b/reference/cmark/commonmark.node.code.xml
@@ -32,7 +32,7 @@
      </oointerface>
  
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.codeblock.xml b/reference/cmark/commonmark.node.codeblock.xml
index 19b66f9cd..cab0e5749 100644
--- a/reference/cmark/commonmark.node.codeblock.xml
+++ b/reference/cmark/commonmark.node.codeblock.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.customblock.xml b/reference/cmark/commonmark.node.customblock.xml
index 660080400..e711387e6 100644
--- a/reference/cmark/commonmark.node.customblock.xml
+++ b/reference/cmark/commonmark.node.customblock.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.custominline.xml b/reference/cmark/commonmark.node.custominline.xml
index c84074bd7..9a3812061 100644
--- a/reference/cmark/commonmark.node.custominline.xml
+++ b/reference/cmark/commonmark.node.custominline.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.document.xml b/reference/cmark/commonmark.node.document.xml
index 8ec1ce8e3..b48308f9e 100644
--- a/reference/cmark/commonmark.node.document.xml
+++ b/reference/cmark/commonmark.node.document.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.heading.xml b/reference/cmark/commonmark.node.heading.xml
index 9d9bcc0cd..f24f8a698 100644
--- a/reference/cmark/commonmark.node.heading.xml
+++ b/reference/cmark/commonmark.node.heading.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.htmlblock.xml b/reference/cmark/commonmark.node.htmlblock.xml
index a12622f73..35ff112ef 100644
--- a/reference/cmark/commonmark.node.htmlblock.xml
+++ b/reference/cmark/commonmark.node.htmlblock.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.htmlinline.xml b/reference/cmark/commonmark.node.htmlinline.xml
index cdca6b31f..bc9d5bc0d 100644
--- a/reference/cmark/commonmark.node.htmlinline.xml
+++ b/reference/cmark/commonmark.node.htmlinline.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.image.xml b/reference/cmark/commonmark.node.image.xml
index 60369de68..a14200698 100644
--- a/reference/cmark/commonmark.node.image.xml
+++ b/reference/cmark/commonmark.node.image.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.item.xml b/reference/cmark/commonmark.node.item.xml
index 0cb79c3e2..035d00ef3 100644
--- a/reference/cmark/commonmark.node.item.xml
+++ b/reference/cmark/commonmark.node.item.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.linebreak.xml b/reference/cmark/commonmark.node.linebreak.xml
index f8a2942c6..c8a1755b8 100644
--- a/reference/cmark/commonmark.node.linebreak.xml
+++ b/reference/cmark/commonmark.node.linebreak.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.link.xml b/reference/cmark/commonmark.node.link.xml
index f7071a33c..726ca972e 100644
--- a/reference/cmark/commonmark.node.link.xml
+++ b/reference/cmark/commonmark.node.link.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.orderedlist.xml b/reference/cmark/commonmark.node.orderedlist.xml
index 3121b8510..d5d1a88b2 100644
--- a/reference/cmark/commonmark.node.orderedlist.xml
+++ b/reference/cmark/commonmark.node.orderedlist.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.paragraph.xml b/reference/cmark/commonmark.node.paragraph.xml
index 337a6b517..52a8654f3 100644
--- a/reference/cmark/commonmark.node.paragraph.xml
+++ b/reference/cmark/commonmark.node.paragraph.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.softbreak.xml b/reference/cmark/commonmark.node.softbreak.xml
index 579d42576..ee80e228a 100644
--- a/reference/cmark/commonmark.node.softbreak.xml
+++ b/reference/cmark/commonmark.node.softbreak.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.text.emphasis.xml b/reference/cmark/commonmark.node.text.emphasis.xml
index 40bbbb390..a8cc4a0c1 100644
--- a/reference/cmark/commonmark.node.text.emphasis.xml
+++ b/reference/cmark/commonmark.node.text.emphasis.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.text.strong.xml b/reference/cmark/commonmark.node.text.strong.xml
index 787b2d67c..8e1c888aa 100644
--- a/reference/cmark/commonmark.node.text.strong.xml
+++ b/reference/cmark/commonmark.node.text.strong.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.text.xml b/reference/cmark/commonmark.node.text.xml
index 7343edcae..7995e7049 100644
--- a/reference/cmark/commonmark.node.text.xml
+++ b/reference/cmark/commonmark.node.text.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.thematicbreak.xml b/reference/cmark/commonmark.node.thematicbreak.xml
index 61643cd00..12756e7c0 100644
--- a/reference/cmark/commonmark.node.thematicbreak.xml
+++ b/reference/cmark/commonmark.node.thematicbreak.xml
@@ -32,7 +32,7 @@
      </oointerface>
      
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/cmark/commonmark.node.xml b/reference/cmark/commonmark.node.xml
index e57acf212..3b2b8ed7a 100644
--- a/reference/cmark/commonmark.node.xml
+++ b/reference/cmark/commonmark.node.xml
@@ -36,7 +36,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
 
     </classsynopsisinfo>
diff --git a/reference/componere/componere/abstract/definition/addinterface.xml b/reference/componere/componere/abstract/definition/addinterface.xml
index 04df5e924..84d26373d 100644
--- a/reference/componere/componere/abstract/definition/addinterface.xml
+++ b/reference/componere/componere/abstract/definition/addinterface.xml
@@ -43,7 +43,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/abstract/definition/addmethod.xml b/reference/componere/componere/abstract/definition/addmethod.xml
index dac3f10d7..937f9b09f 100644
--- a/reference/componere/componere/abstract/definition/addmethod.xml
+++ b/reference/componere/componere/abstract/definition/addmethod.xml
@@ -52,12 +52,12 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if Method was added to another Definition
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if Method was added to another Definition
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/abstract/definition/addtrait.xml b/reference/componere/componere/abstract/definition/addtrait.xml
index f720ee8a3..09261ef19 100644
--- a/reference/componere/componere/abstract/definition/addtrait.xml
+++ b/reference/componere/componere/abstract/definition/addtrait.xml
@@ -43,7 +43,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/abstract/definition/getreflector.xml b/reference/componere/componere/abstract/definition/getreflector.xml
index 11a93d485..c10e987a7 100644
--- a/reference/componere/componere/abstract/definition/getreflector.xml
+++ b/reference/componere/componere/abstract/definition/getreflector.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>ReflectionClass</type><methodname>Componere\Abstract\Definition::getReflector</methodname>
+   <modifier>public</modifier> <type xlink:href="&url.php.manual.class.reflectionclass;">ReflectionClass</type><methodname>Componere\Abstract\Definition::getReflector</methodname>
    <void/>
   </methodsynopsis>
   <simpara>
diff --git a/reference/componere/componere/definition/addconstant.xml b/reference/componere/componere/definition/addconstant.xml
index 351f347cc..362281118 100644
--- a/reference/componere/componere/definition/addconstant.xml
+++ b/reference/componere/componere/definition/addconstant.xml
@@ -51,22 +51,22 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> is already declared as a constant
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <parameter>name</parameter> is already declared as a constant
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>value</parameter> is static
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <parameter>value</parameter> is static
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>value</parameter> is undefined
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <parameter>value</parameter> is undefined
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/definition/addproperty.xml b/reference/componere/componere/definition/addproperty.xml
index 74a702d41..9802c52ba 100644
--- a/reference/componere/componere/definition/addproperty.xml
+++ b/reference/componere/componere/definition/addproperty.xml
@@ -52,12 +52,12 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> is already declared as a property
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <parameter>name</parameter> is already declared as a property
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/definition/construct.xml b/reference/componere/componere/definition/construct.xml
index 96c3f5ab9..c0ea868d3 100644
--- a/reference/componere/componere/definition/construct.xml
+++ b/reference/componere/componere/definition/construct.xml
@@ -68,27 +68,27 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if an attempt is made to replace an internal class
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if an attempt is made to replace an internal class
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if an attempt is made to replace an interface
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if an attempt is made to replace an interface
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if an attempt is made to replace a trait
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if an attempt is made to replace a trait
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> cannot be found
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if a class in <parameter>interfaces</parameter> cannot be found
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> is not an interface
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if a class in <parameter>interfaces</parameter> is not an interface
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/definition/getclosure.xml b/reference/componere/componere/definition/getclosure.xml
index 3c741c10e..5be568f25 100644
--- a/reference/componere/componere/definition/getclosure.xml
+++ b/reference/componere/componere/definition/getclosure.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>Closure</type><methodname>Componere\Definition::getClosure</methodname>
+   <modifier>public</modifier> <type xlink:href="&url.php.manual.class.closure;">Closure</type><methodname>Componere\Definition::getClosure</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
   <simpara>
@@ -43,12 +43,12 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> could not be found
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <parameter>name</parameter> could not be found
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/definition/getclosures.xml b/reference/componere/componere/definition/getclosures.xml
index 808e71d37..6f09c9d06 100644
--- a/reference/componere/componere/definition/getclosures.xml
+++ b/reference/componere/componere/definition/getclosures.xml
@@ -29,7 +29,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/definition/register.xml b/reference/componere/componere/definition/register.xml
index f5f96e820..14ceecea8 100644
--- a/reference/componere/componere/definition/register.xml
+++ b/reference/componere/componere/definition/register.xml
@@ -22,7 +22,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <type>Definition</type> was registered
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/method/construct.xml b/reference/componere/componere/method/construct.xml
index 1ae6a0ce0..e7b40dadc 100644
--- a/reference/componere/componere/method/construct.xml
+++ b/reference/componere/componere/method/construct.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <constructorsynopsis>
    <modifier>public</modifier> <methodname>Componere\Method::__construct</methodname>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>closure</parameter></methodparam>
   </constructorsynopsis>
 
  </refsect1>
diff --git a/reference/componere/componere/method/getreflector.xml b/reference/componere/componere/method/getreflector.xml
index 0d9b8b798..fa4651820 100644
--- a/reference/componere/componere/method/getreflector.xml
+++ b/reference/componere/componere/method/getreflector.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>ReflectionMethod</type><methodname>Componere\Method::getReflector</methodname>
+   <modifier>public</modifier> <type xlink:href="&url.php.manual.class.reflectionmethod;">ReflectionMethod</type><methodname>Componere\Method::getReflector</methodname>
    <void/>
   </methodsynopsis>
   <simpara>
diff --git a/reference/componere/componere/method/setprivate.xml b/reference/componere/componere/method/setprivate.xml
index d3865ea82..ed8cf5f60 100644
--- a/reference/componere/componere/method/setprivate.xml
+++ b/reference/componere/componere/method/setprivate.xml
@@ -25,7 +25,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if access level was previously set
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/method/setprotected.xml b/reference/componere/componere/method/setprotected.xml
index e13da5661..e77a0308e 100644
--- a/reference/componere/componere/method/setprotected.xml
+++ b/reference/componere/componere/method/setprotected.xml
@@ -25,7 +25,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if access level was previously set
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/patch/construct.xml b/reference/componere/componere/patch/construct.xml
index 954cdd48a..bafcb61c9 100644
--- a/reference/componere/componere/patch/construct.xml
+++ b/reference/componere/componere/patch/construct.xml
@@ -46,12 +46,12 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> cannot be found
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if a class in <parameter>interfaces</parameter> cannot be found
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> is not an interface
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if a class in <parameter>interfaces</parameter> is not an interface
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/patch/derive.xml b/reference/componere/componere/patch/derive.xml
index 7f93bb98e..86cbafab5 100644
--- a/reference/componere/componere/patch/derive.xml
+++ b/reference/componere/componere/patch/derive.xml
@@ -43,7 +43,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <parameter>instance</parameter> is not compatible
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <parameter>instance</parameter> is not compatible
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/patch/getclosure.xml b/reference/componere/componere/patch/getclosure.xml
index 1da32bb40..db3e8885b 100644
--- a/reference/componere/componere/patch/getclosure.xml
+++ b/reference/componere/componere/patch/getclosure.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>Closure</type><methodname>Componere\Patch::getClosure</methodname>
+   <modifier>public</modifier> <type xlink:href="&url.php.manual.class.closure;">Closure</type><methodname>Componere\Patch::getClosure</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
   <simpara>
@@ -43,7 +43,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> could not be found
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if <parameter>name</parameter> could not be found
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/value/construct.xml b/reference/componere/componere/value/construct.xml
index 83ab23eac..9a719d0fd 100644
--- a/reference/componere/componere/value/construct.xml
+++ b/reference/componere/componere/value/construct.xml
@@ -36,7 +36,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <parameter>default</parameter> does not have a suitable value
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <parameter>default</parameter> does not have a suitable value
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/value/setprivate.xml b/reference/componere/componere/value/setprivate.xml
index 8db751330..2d814c9b6 100644
--- a/reference/componere/componere/value/setprivate.xml
+++ b/reference/componere/componere/value/setprivate.xml
@@ -29,7 +29,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if access level was previously set
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/componere/value/setprotected.xml b/reference/componere/componere/value/setprotected.xml
index 99be9efe8..0ccb9bfb5 100644
--- a/reference/componere/componere/value/setprotected.xml
+++ b/reference/componere/componere/value/setprotected.xml
@@ -29,7 +29,7 @@
   <title>Exceptions</title>
   <warning>
    <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
+    Shall throw <type xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</type> if access level was previously set
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/functions/componere.cast.xml b/reference/componere/functions/componere.cast.xml
index f9b7b48e9..d0f689ba7 100644
--- a/reference/componere/functions/componere.cast.xml
+++ b/reference/componere/functions/componere.cast.xml
@@ -48,27 +48,27 @@
   &reftitle.errors;
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an interface
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an interface
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is a trait
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is a trait
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an abstract
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an abstract
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is not compatible with the type of <parameter>object</parameter>
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is not compatible with the type of <parameter>object</parameter>
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/componere/functions/componere.cast_by_ref.xml b/reference/componere/functions/componere.cast_by_ref.xml
index 6d7d387fa..f4c102ea2 100644
--- a/reference/componere/functions/componere.cast_by_ref.xml
+++ b/reference/componere/functions/componere.cast_by_ref.xml
@@ -48,27 +48,27 @@
   &reftitle.errors;
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an interface
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an interface
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is a trait
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is a trait
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an abstract
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an abstract
    </simpara>
   </warning>
   <warning>
    <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is not compatible with the type of <parameter>object</parameter>
+    Shall throw <type xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is not compatible with the type of <parameter>object</parameter>
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/cubrid/cubridmysql/cubrid-fetch-object.xml b/reference/cubrid/cubridmysql/cubrid-fetch-object.xml
index 012f242cb..4761f926b 100644
--- a/reference/cubrid/cubridmysql/cubrid-fetch-object.xml
+++ b/reference/cubrid/cubridmysql/cubrid-fetch-object.xml
@@ -34,7 +34,7 @@
      <listitem>
       <simpara>
        The name of the class to instantiate. If not specified, a
-       <classname>stdClass</classname> (stdClass is PHP's generic empty class
+       <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> (stdClass is PHP's generic empty class
        that's used when casting other types to objects) object is returned.
       </simpara>
     </listitem>
diff --git a/reference/cubrid/cubridmysql/cubrid-field-flags.xml b/reference/cubrid/cubridmysql/cubrid-field-flags.xml
index 7299de51f..b81650e1b 100644
--- a/reference/cubrid/cubridmysql/cubrid-field-flags.xml
+++ b/reference/cubrid/cubridmysql/cubrid-field-flags.xml
@@ -36,7 +36,7 @@
    <listitem><simpara>
     The numerical field offset. The <parameter>field_offset</parameter>
     starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
+    error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is also issued.
    </simpara></listitem>
   </varlistentry>
  </variablelist>
diff --git a/reference/cubrid/cubridmysql/cubrid-field-len.xml b/reference/cubrid/cubridmysql/cubrid-field-len.xml
index b6f9705e2..50b17adc4 100644
--- a/reference/cubrid/cubridmysql/cubrid-field-len.xml
+++ b/reference/cubrid/cubridmysql/cubrid-field-len.xml
@@ -27,7 +27,7 @@
   </varlistentry>
     <varlistentry>
  <term><parameter>field_offset</parameter></term>
- <listitem><simpara>The numerical field offset. The <parameter>field_offset</parameter> starts at 0. If <parameter>field_offset</parameter> does not exist, an error of level <constant>E_WARNING</constant> is also issued.</simpara></listitem>
+ <listitem><simpara>The numerical field offset. The <parameter>field_offset</parameter> starts at 0. If <parameter>field_offset</parameter> does not exist, an error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is also issued.</simpara></listitem>
   </varlistentry>
  </variablelist>
  </refsect1>
diff --git a/reference/cubrid/cubridmysql/cubrid-field-name.xml b/reference/cubrid/cubridmysql/cubrid-field-name.xml
index ed9241d3c..833315e71 100644
--- a/reference/cubrid/cubridmysql/cubrid-field-name.xml
+++ b/reference/cubrid/cubridmysql/cubrid-field-name.xml
@@ -31,7 +31,7 @@
    <listitem><simpara>
     The numerical field offset. The <parameter>field_offset</parameter>
     starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
+    error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is also issued.
    </simpara></listitem>
   </varlistentry>
  </variablelist>
diff --git a/reference/cubrid/cubridmysql/cubrid-field-seek.xml b/reference/cubrid/cubridmysql/cubrid-field-seek.xml
index d88a2560d..2adbae9aa 100644
--- a/reference/cubrid/cubridmysql/cubrid-field-seek.xml
+++ b/reference/cubrid/cubridmysql/cubrid-field-seek.xml
@@ -33,7 +33,7 @@
     <listitem><simpara>
       The numerical field offset. The <parameter>field_offset</parameter>
       starts at 0. If <parameter>field_offset</parameter> does not exist, an
-      error of level <constant>E_WARNING</constant> is also issued.
+      error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is also issued.
     </simpara></listitem>
    </varlistentry>
   </variablelist>
diff --git a/reference/cubrid/cubridmysql/cubrid-field-table.xml b/reference/cubrid/cubridmysql/cubrid-field-table.xml
index fd6a53ed6..09fc984ab 100644
--- a/reference/cubrid/cubridmysql/cubrid-field-table.xml
+++ b/reference/cubrid/cubridmysql/cubrid-field-table.xml
@@ -33,7 +33,7 @@
    <listitem><simpara>
     The numerical field offset. The <parameter>field_offset</parameter>
     starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
+    error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is also issued.
    </simpara></listitem>
   </varlistentry>
  </variablelist>
diff --git a/reference/cubrid/cubridmysql/cubrid-field-type.xml b/reference/cubrid/cubridmysql/cubrid-field-type.xml
index 45efda969..675da3f96 100644
--- a/reference/cubrid/cubridmysql/cubrid-field-type.xml
+++ b/reference/cubrid/cubridmysql/cubrid-field-type.xml
@@ -35,7 +35,7 @@
    <listitem><simpara>
     The numerical field offset. The <parameter>field_offset</parameter>
     starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
+    error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is also issued.
    </simpara></listitem>
   </varlistentry>
  </variablelist>
diff --git a/reference/dbase/book.xml b/reference/dbase/book.xml
index 4ec110cf4..79e065829 100644
--- a/reference/dbase/book.xml
+++ b/reference/dbase/book.xml
@@ -31,7 +31,7 @@
   <caution>
    <para>
     As of dbase 7.0.0 the databases are automatically locked via
-    <function>flock</function>. There has been no support for locking earlier,
+    <function xlink:href="&url.php.manual.function.flock;">flock</function>. There has been no support for locking earlier,
     so two concurrent web server processes modifying the same dBase file would
     have very likely ruined your database. This can happen even with dbase
     7.0.0+ on systems which implement the locks at the process level with
diff --git a/reference/dbase/entities.dbase.ent b/reference/dbase/entities.dbase.ent
index 1930ea3c8..396454725 100644
--- a/reference/dbase/entities.dbase.ent
+++ b/reference/dbase/entities.dbase.ent
@@ -27,7 +27,7 @@ See doc-base/scripts/text-entities.php for details.
     <listitem>
      <simpara>
       Integers outside the range
-      <constant>PHP_INT_MIN</constant>..<constant>PHP_INT_MAX</constant> are
+      <constant xlink:href="&url.php.manual.constant.php-int-min;">PHP_INT_MIN</constant>..<constant xlink:href="&url.php.manual.constant.php-int-max;">PHP_INT_MAX</constant> are
       returned as strings.
      </simpara>
     </listitem>
diff --git a/reference/dbase/functions/dbase-get-header-info.xml b/reference/dbase/functions/dbase-get-header-info.xml
index 727276fa9..848a24a7c 100644
--- a/reference/dbase/functions/dbase-get-header-info.xml
+++ b/reference/dbase/functions/dbase-get-header-info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.dbase-get-header-info" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.dbase-get-header-info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>dbase_get_header_info</refname>
   <refpurpose>Gets the header info of a database</refpurpose>
@@ -80,7 +80,7 @@
      <term>format</term>
      <listitem>
       <simpara>
-       A suggested <function>printf</function> format specifier for the column
+       A suggested <function xlink:href="&url.php.manual.function.printf;">printf</function> format specifier for the column
       </simpara>
      </listitem>
     </varlistentry>
diff --git a/reference/dio/book.xml b/reference/dio/book.xml
index 7351515e9..f8f905d85 100644
--- a/reference/dio/book.xml
+++ b/reference/dio/book.xml
@@ -12,7 +12,7 @@
    PHP supports the direct io functions as described in the Posix
    Standard (Section 6) for performing I/O functions at a lower
    level than the C-Language stream I/O functions
-   (<function>fopen</function>, <function>fread</function>,..).  The use
+   (<function xlink:href="&url.php.manual.function.fopen;">fopen</function>, <function xlink:href="&url.php.manual.function.fread;">fread</function>,..).  The use
    of the DIO functions should be considered only when direct 
    control of a device is needed.  In all other cases, the standard
    <link xlink:href="&url.php.manual.book.filesystem;">filesystem</link> functions are more
diff --git a/reference/dio/functions/dio-fcntl.xml b/reference/dio/functions/dio-fcntl.xml
index eb8e74f04..6d78b9f9d 100644
--- a/reference/dio/functions/dio-fcntl.xml
+++ b/reference/dio/functions/dio-fcntl.xml
@@ -103,8 +103,8 @@
         <listitem>
          <para>
           <literal>whence</literal> - Where l_start is relative to: can be 
-          <constant>SEEK_SET</constant>,
-          <constant>SEEK_END</constant> and <constant>SEEK_CUR</constant>
+          <constant xlink:href="&url.php.manual.constant.seek-set;">SEEK_SET</constant>,
+          <constant xlink:href="&url.php.manual.constant.seek-end;">SEEK_END</constant> and <constant xlink:href="&url.php.manual.constant.seek-cur;">SEEK_CUR</constant>
          </para>
         </listitem>
         <listitem>
diff --git a/reference/dio/functions/dio-seek.xml b/reference/dio/functions/dio-seek.xml
index b7401722e..e34612339 100644
--- a/reference/dio/functions/dio-seek.xml
+++ b/reference/dio/functions/dio-seek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.dio-seek" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.dio-seek" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>dio_seek</refname>
   <refpurpose>Seeks to pos on fd from whence</refpurpose>
@@ -47,21 +47,21 @@
        <itemizedlist>
         <listitem>
          <para>
-          <constant>SEEK_SET</constant> (default) - specifies that 
+          <constant xlink:href="&url.php.manual.constant.seek-set;">SEEK_SET</constant> (default) - specifies that 
           <parameter>pos</parameter> is specified from the beginning of the 
           file.
          </para>
         </listitem>
         <listitem>
          <para>
-          <constant>SEEK_CUR</constant> - Specifies that 
+          <constant xlink:href="&url.php.manual.constant.seek-cur;">SEEK_CUR</constant> - Specifies that 
           <parameter>pos</parameter> is a count of characters from the current
           file position. This count may be positive or negative.
          </para>
         </listitem>
         <listitem>
          <para>
-          <constant>SEEK_END</constant> - Specifies that 
+          <constant xlink:href="&url.php.manual.constant.seek-end;">SEEK_END</constant> - Specifies that 
           <parameter>pos</parameter> is a count of characters from the end of
           the file. A negative count specifies a position within the current 
           extent of the file; a positive count specifies a position past the 
diff --git a/reference/ds/ds.collection.xml b/reference/ds/ds.collection.xml
index 734f2d939..e79302d06 100644
--- a/reference/ds/ds.collection.xml
+++ b/reference/ds/ds.collection.xml
@@ -13,7 +13,7 @@
    <simpara>
     <classname>Collection</classname> is the base interface which covers functionality
     common to all the data structures in this library. It guarantees that all structures
-    are traversable, countable, and can be converted to json using <function>json_encode</function>.
+    are traversable, countable, and can be converted to json using <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function>.
    </simpara>
   </section>
 
@@ -25,22 +25,22 @@
 
     <oointerface>
      <modifier>extends</modifier>
-     <interfacename>Countable</interfacename>
+     <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
     </oointerface>
     <oointerface>
-     <interfacename>IteratorAggregate</interfacename>
+     <interfacename xlink:href="&url.php.manual.class.iteratoraggregate;">IteratorAggregate</interfacename>
     </oointerface>
     <oointerface>
-     <interfacename>JsonSerializable</interfacename>
+     <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
     </oointerface>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-collection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.countable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.iteratoraggregate')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.jsonserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
+    &class.countable.methods;
+    &class.iteratoraggregate.methods;
+    &class.jsonserializable.methods;
 
    </classsynopsis>
 
@@ -61,7 +61,7 @@
        <entry>PECL ds 1.4.0</entry>
        <entry>
         <classname>Collection</classname> implements
-        <interfacename>IteratorAggregate</interfacename> now instead of just <interfacename>Traversable</interfacename>. (This change came to the polyfill in 1.4.1.)
+        <interfacename xlink:href="&url.php.manual.class.iteratoraggregate;">IteratorAggregate</interfacename> now instead of just <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>. (This change came to the polyfill in 1.4.1.)
        </entry>
       </row>
      </tbody>
diff --git a/reference/ds/ds.deque.xml b/reference/ds/ds.deque.xml
index badebc0db..dd4270929 100644
--- a/reference/ds/ds.deque.xml
+++ b/reference/ds/ds.deque.xml
@@ -75,7 +75,7 @@
       <interfacename>Ds\Sequence</interfacename>
      </oointerface>
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 
@@ -122,7 +122,7 @@
        <row>
         <entry>PECL ds 1.3.0</entry>
         <entry>
-         The class now implements <classname>ArrayAccess</classname>.
+         The class now implements <classname xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</classname>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/ds/ds.hashable.xml b/reference/ds/ds.hashable.xml
index 18beecd15..a2ffdda22 100644
--- a/reference/ds/ds.hashable.xml
+++ b/reference/ds/ds.hashable.xml
@@ -12,13 +12,13 @@
    &reftitle.intro;
    <simpara>
         Hashable is an interface which allows objects to be used as keys.
-        It’s an alternative to <function>spl_object_hash</function>,
+        It’s an alternative to <function xlink:href="&url.php.manual.function.spl-object-hash;">spl_object_hash</function>,
         which determines an object’s hash based on its handle:
         this means that two objects that are considered equal by an implicit
         definition would not be treated as equal because they are not the same instance.
    </simpara>
    <simpara>
-        <function>hash</function> is used to return a scalar value to be used as
+        <function xlink:href="&url.php.manual.function.hash;">hash</function> is used to return a scalar value to be used as
         the object's hash value, which determines where it goes in the hash table.
         While this value does not have to be unique, objects which are equal must
         have the same hash value.
diff --git a/reference/ds/ds.map.xml b/reference/ds/ds.map.xml
index d98861711..e9dee2f4f 100644
--- a/reference/ds/ds.map.xml
+++ b/reference/ds/ds.map.xml
@@ -57,7 +57,7 @@
       <interfacename>Ds\Collection</interfacename>
      </oointerface>
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 
@@ -104,7 +104,7 @@
        <row>
         <entry>PECL ds 1.3.0</entry>
         <entry>
-         The class now implements <classname>ArrayAccess</classname>.
+         The class now implements <classname xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</classname>.
         </entry>
        </row>
        <row>
diff --git a/reference/ds/ds.pair.xml b/reference/ds/ds.pair.xml
index a70f9d8e7..e2a47f0bd 100644
--- a/reference/ds/ds.pair.xml
+++ b/reference/ds/ds.pair.xml
@@ -27,7 +27,7 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 
diff --git a/reference/ds/ds.queue.xml b/reference/ds/ds.queue.xml
index eba8c6f4e..2306a77b1 100644
--- a/reference/ds/ds.queue.xml
+++ b/reference/ds/ds.queue.xml
@@ -32,7 +32,7 @@
       <interfacename>Ds\Collection</interfacename>
      </oointerface>
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 
@@ -79,7 +79,7 @@
        <row>
         <entry>PECL ds 1.3.0</entry>
         <entry>
-         The class now implements <classname>ArrayAccess</classname>.
+         The class now implements <classname xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</classname>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/ds/ds.sequence.xml b/reference/ds/ds.sequence.xml
index 098b3289c..4d431ea2e 100644
--- a/reference/ds/ds.sequence.xml
+++ b/reference/ds/ds.sequence.xml
@@ -24,8 +24,8 @@
         <simplelist>
             <member>Wherever you would use an array as a list (not concerned with keys).</member>
             <member>A more efficient alternative to
-                <classname>SplDoublyLinkedList</classname> and
-                <classname>SplFixedArray</classname>.
+                <classname xlink:href="&url.php.manual.class.spldoublylinkedlist;">SplDoublyLinkedList</classname> and
+                <classname xlink:href="&url.php.manual.class.splfixedarray;">SplFixedArray</classname>.
             </member>
         </simplelist>
    </para>
@@ -42,7 +42,7 @@
      <interfacename>Ds\Collection</interfacename>
     </oointerface>
     <oointerface>
-     <interfacename>ArrayAccess</interfacename>
+     <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
     </oointerface>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -50,10 +50,10 @@
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-collection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.countable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.iteratoraggregate')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.jsonserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.arrayaccess')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
+    &class.countable.methods;
+    &class.iteratoraggregate.methods;
+    &class.jsonserializable.methods;
+    &class.arrayaccess.methods;
 
    </classsynopsis>
 
@@ -74,7 +74,7 @@
        <row>
         <entry>PECL ds 1.3.0</entry>
         <entry>
-         The interface now extends <classname>ArrayAccess</classname>.
+         The interface now extends <classname xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</classname>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/ds/ds.set.xml b/reference/ds/ds.set.xml
index b85ef9161..8997a09f6 100644
--- a/reference/ds/ds.set.xml
+++ b/reference/ds/ds.set.xml
@@ -68,7 +68,7 @@
       <interfacename>Ds\Collection</interfacename>
      </oointerface>
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 
@@ -115,7 +115,7 @@
        <row>
         <entry>PECL ds 1.3.0</entry>
         <entry>
-         The class now implements <classname>ArrayAccess</classname>.
+         The class now implements <classname xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</classname>.
         </entry>
        </row>
        <row>
diff --git a/reference/ds/ds.stack.xml b/reference/ds/ds.stack.xml
index 8d2a21f4b..8b82ee812 100644
--- a/reference/ds/ds.stack.xml
+++ b/reference/ds/ds.stack.xml
@@ -35,7 +35,7 @@
       <interfacename>Ds\Collection</interfacename>
      </oointerface>
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 
@@ -60,7 +60,7 @@
        <row>
         <entry>PECL ds 1.3.0</entry>
         <entry>
-         The class now implements <classname>ArrayAccess</classname>.
+         The class now implements <classname xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</classname>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/ds/ds.vector.xml b/reference/ds/ds.vector.xml
index 9594effcd..7a5c768bf 100644
--- a/reference/ds/ds.vector.xml
+++ b/reference/ds/ds.vector.xml
@@ -62,7 +62,7 @@
 
     <ooclass><classname>Ds\Vector</classname></ooclass>
     <oointerface><interfacename>Ds\Sequence</interfacename></oointerface>
-    <oointerface><interfacename>ArrayAccess</interfacename></oointerface>
+    <oointerface><interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename></oointerface>
 
     </classsynopsisinfo>
 
@@ -109,7 +109,7 @@
        <row>
         <entry>PECL ds 1.3.0</entry>
         <entry>
-         The class now implements <classname>ArrayAccess</classname>.
+         The class now implements <classname xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</classname>.
         </entry>
        </row>
        <row>
diff --git a/reference/ds/ds/deque/construct.xml b/reference/ds/ds/deque/construct.xml
index 9579cc6b1..941d05fd9 100644
--- a/reference/ds/ds/deque/construct.xml
+++ b/reference/ds/ds/deque/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
   </constructorsynopsis>
   <para>
-    Creates a new instance, using either a <classname>traversable</classname>
+    Creates a new instance, using either a <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or an &array; for the initial <parameter>values</parameter>.
   </para>
  </refsect1>
diff --git a/reference/ds/ds/deque/first.xml b/reference/ds/ds/deque/first.xml
index f3837b3cc..98cfc48ec 100644
--- a/reference/ds/ds/deque/first.xml
+++ b/reference/ds/ds/deque/first.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/deque/get.xml b/reference/ds/ds/deque/get.xml
index 374a37383..0eefc6493 100644
--- a/reference/ds/ds/deque/get.xml
+++ b/reference/ds/ds/deque/get.xml
@@ -43,7 +43,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/deque/insert.xml b/reference/ds/ds/deque/insert.xml
index 136ec85ce..213498d67 100644
--- a/reference/ds/ds/deque/insert.xml
+++ b/reference/ds/ds/deque/insert.xml
@@ -57,7 +57,7 @@
 <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/deque/last.xml b/reference/ds/ds/deque/last.xml
index 8718c8041..8165904c3 100644
--- a/reference/ds/ds/deque/last.xml
+++ b/reference/ds/ds/deque/last.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/deque/merge.xml b/reference/ds/ds/deque/merge.xml
index 02412b276..fcf129572 100644
--- a/reference/ds/ds/deque/merge.xml
+++ b/reference/ds/ds/deque/merge.xml
@@ -26,7 +26,7 @@
     <term><parameter>values</parameter></term>
     <listitem>
      <para>
-        A <classname>traversable</classname> object or an &array;.
+        A <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname> object or an &array;.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ds/ds/deque/pop.xml b/reference/ds/ds/deque/pop.xml
index 44960b60d..1d1ed62a9 100644
--- a/reference/ds/ds/deque/pop.xml
+++ b/reference/ds/ds/deque/pop.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/deque/remove.xml b/reference/ds/ds/deque/remove.xml
index 100470a89..788f61917 100644
--- a/reference/ds/ds/deque/remove.xml
+++ b/reference/ds/ds/deque/remove.xml
@@ -43,7 +43,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/deque/set.xml b/reference/ds/ds/deque/set.xml
index 1555e6951..a4127b140 100644
--- a/reference/ds/ds/deque/set.xml
+++ b/reference/ds/ds/deque/set.xml
@@ -52,7 +52,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/deque/shift.xml b/reference/ds/ds/deque/shift.xml
index ad76fb929..2d7261d7b 100644
--- a/reference/ds/ds/deque/shift.xml
+++ b/reference/ds/ds/deque/shift.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/map/construct.xml b/reference/ds/ds/map/construct.xml
index ecd58f298..bea825277 100644
--- a/reference/ds/ds/map/construct.xml
+++ b/reference/ds/ds/map/construct.xml
@@ -14,7 +14,7 @@
    <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
   </constructorsynopsis>
   <para>
-    Creates a new instance, using either a <classname>traversable</classname>
+    Creates a new instance, using either a <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or an &array; for the initial <parameter>values</parameter>.
   </para>
 
diff --git a/reference/ds/ds/map/first.xml b/reference/ds/ds/map/first.xml
index 4434e5348..b4d15be2e 100644
--- a/reference/ds/ds/map/first.xml
+++ b/reference/ds/ds/map/first.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/map/get.xml b/reference/ds/ds/map/get.xml
index 8aae6aa0b..a708a5c3f 100644
--- a/reference/ds/ds/map/get.xml
+++ b/reference/ds/ds/map/get.xml
@@ -84,7 +84,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfBoundsException</classname> if the key could not be found
+   <classname xlink:href="&url.php.manual.class.outofboundsexception;">OutOfBoundsException</classname> if the key could not be found
    and a default value was not provided.
   </para>
  </refsect1>
diff --git a/reference/ds/ds/map/last.xml b/reference/ds/ds/map/last.xml
index 2b53f5bc7..57566c1a1 100644
--- a/reference/ds/ds/map/last.xml
+++ b/reference/ds/ds/map/last.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/map/merge.xml b/reference/ds/ds/map/merge.xml
index a21cc75bf..e1fdcc085 100644
--- a/reference/ds/ds/map/merge.xml
+++ b/reference/ds/ds/map/merge.xml
@@ -14,7 +14,7 @@
    <methodparam><type>mixed</type><parameter>values</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Returns the result of associating all keys of a given <classname>traversable</classname>
+    Returns the result of associating all keys of a given <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or &array; with their corresponding values, combined with the current instance.
   </para>
 
@@ -33,7 +33,7 @@
     <term><parameter>values</parameter></term>
     <listitem>
      <para>
-        A <classname>traversable</classname> object or an &array;.
+        A <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname> object or an &array;.
      </para>
     </listitem>
    </varlistentry>
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    The result of associating all keys of a given <classname>traversable</classname>
+    The result of associating all keys of a given <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or &array; with their corresponding values, combined with the current instance.
   </para>
   <note>
diff --git a/reference/ds/ds/map/putAll.xml b/reference/ds/ds/map/putAll.xml
index 1f4a613db..04862f529 100644
--- a/reference/ds/ds/map/putAll.xml
+++ b/reference/ds/ds/map/putAll.xml
@@ -14,7 +14,7 @@
    <methodparam><type>mixed</type><parameter>pairs</parameter></methodparam>
   </methodsynopsis>
   <para>
-    Associates all key-value <parameter>pairs</parameter> of a <classname>traversable</classname> object or &array;.
+    Associates all key-value <parameter>pairs</parameter> of a <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname> object or &array;.
   </para>
 
   <note>
@@ -38,7 +38,7 @@
     <term><parameter>pairs</parameter></term>
     <listitem>
      <para>
-        <classname>traversable</classname> object or &array;.
+        <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname> object or &array;.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ds/ds/map/remove.xml b/reference/ds/ds/map/remove.xml
index 10665a787..3c2946905 100644
--- a/reference/ds/ds/map/remove.xml
+++ b/reference/ds/ds/map/remove.xml
@@ -84,7 +84,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfBoundsException</classname> if the key could not be found
+   <classname xlink:href="&url.php.manual.class.outofboundsexception;">OutOfBoundsException</classname> if the key could not be found
    and a default value was not provided.
   </para>
  </refsect1>
diff --git a/reference/ds/ds/map/skip.xml b/reference/ds/ds/map/skip.xml
index 1cddb5db5..14ff883f6 100644
--- a/reference/ds/ds/map/skip.xml
+++ b/reference/ds/ds/map/skip.xml
@@ -43,7 +43,7 @@
   <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the position is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the position is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/priorityqueue/peek.xml b/reference/ds/ds/priorityqueue/peek.xml
index aaad62faf..336665f7a 100644
--- a/reference/ds/ds/priorityqueue/peek.xml
+++ b/reference/ds/ds/priorityqueue/peek.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/priorityqueue/pop.xml b/reference/ds/ds/priorityqueue/pop.xml
index b7050f106..305f488ce 100644
--- a/reference/ds/ds/priorityqueue/pop.xml
+++ b/reference/ds/ds/priorityqueue/pop.xml
@@ -39,7 +39,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/queue/construct.xml b/reference/ds/ds/queue/construct.xml
index 51d59eef4..8e05a02e9 100644
--- a/reference/ds/ds/queue/construct.xml
+++ b/reference/ds/ds/queue/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
   </constructorsynopsis>
   <para>
-    Creates a new instance, using either a <classname>traversable</classname>
+    Creates a new instance, using either a <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or an &array; for the initial <parameter>values</parameter>.
   </para>
  </refsect1>
diff --git a/reference/ds/ds/queue/peek.xml b/reference/ds/ds/queue/peek.xml
index 57371f8fe..eef5a4c95 100644
--- a/reference/ds/ds/queue/peek.xml
+++ b/reference/ds/ds/queue/peek.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/queue/pop.xml b/reference/ds/ds/queue/pop.xml
index 3d098b733..57215babd 100644
--- a/reference/ds/ds/queue/pop.xml
+++ b/reference/ds/ds/queue/pop.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/first.xml b/reference/ds/ds/sequence/first.xml
index e7322c7e0..cf0354fd4 100644
--- a/reference/ds/ds/sequence/first.xml
+++ b/reference/ds/ds/sequence/first.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
+   <exceptionname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</exceptionname> if empty.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/get.xml b/reference/ds/ds/sequence/get.xml
index 51e8df0cb..8fdf62be3 100644
--- a/reference/ds/ds/sequence/get.xml
+++ b/reference/ds/ds/sequence/get.xml
@@ -43,7 +43,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
+   <exceptionname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</exceptionname> if the index is not valid.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/insert.xml b/reference/ds/ds/sequence/insert.xml
index 32cc7d0ed..00dfaf9f6 100644
--- a/reference/ds/ds/sequence/insert.xml
+++ b/reference/ds/ds/sequence/insert.xml
@@ -57,7 +57,7 @@
 <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
+   <exceptionname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</exceptionname> if the index is not valid.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/last.xml b/reference/ds/ds/sequence/last.xml
index 90a743111..fb0ff6d44 100644
--- a/reference/ds/ds/sequence/last.xml
+++ b/reference/ds/ds/sequence/last.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
+   <exceptionname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</exceptionname> if empty.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/merge.xml b/reference/ds/ds/sequence/merge.xml
index 689af9305..40a8f0260 100644
--- a/reference/ds/ds/sequence/merge.xml
+++ b/reference/ds/ds/sequence/merge.xml
@@ -26,7 +26,7 @@
     <term><parameter>values</parameter></term>
     <listitem>
      <simpara>
-        A <classname>traversable</classname> object or an &array;.
+        A <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname> object or an &array;.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/ds/ds/sequence/pop.xml b/reference/ds/ds/sequence/pop.xml
index 86fe364a3..f5ba5c6ac 100644
--- a/reference/ds/ds/sequence/pop.xml
+++ b/reference/ds/ds/sequence/pop.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
+   <exceptionname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</exceptionname> if empty.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/remove.xml b/reference/ds/ds/sequence/remove.xml
index 5406876fb..20a48c43b 100644
--- a/reference/ds/ds/sequence/remove.xml
+++ b/reference/ds/ds/sequence/remove.xml
@@ -43,7 +43,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
+   <exceptionname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</exceptionname> if the index is not valid.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/set.xml b/reference/ds/ds/sequence/set.xml
index c35282418..7dad7c9d1 100644
--- a/reference/ds/ds/sequence/set.xml
+++ b/reference/ds/ds/sequence/set.xml
@@ -52,7 +52,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
+   <exceptionname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</exceptionname> if the index is not valid.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/sequence/shift.xml b/reference/ds/ds/sequence/shift.xml
index 0ab932ee4..040aca7d9 100644
--- a/reference/ds/ds/sequence/shift.xml
+++ b/reference/ds/ds/sequence/shift.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
+   <exceptionname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</exceptionname> if empty.
   </simpara>
  </refsect1>
 
diff --git a/reference/ds/ds/set/construct.xml b/reference/ds/ds/set/construct.xml
index a8701a796..aee7da376 100644
--- a/reference/ds/ds/set/construct.xml
+++ b/reference/ds/ds/set/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>mixed</type><parameter>values</parameter><initializer>[]</initializer></methodparam>
   </constructorsynopsis>
   <para>
-    Creates a new instance, using either a <classname>traversable</classname>
+    Creates a new instance, using either a <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or an &array; for the initial <parameter>values</parameter>.
   </para>
 
diff --git a/reference/ds/ds/set/first.xml b/reference/ds/ds/set/first.xml
index da39b7979..7ca316f20 100644
--- a/reference/ds/ds/set/first.xml
+++ b/reference/ds/ds/set/first.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/set/get.xml b/reference/ds/ds/set/get.xml
index b52a5b623..02f94fe9c 100644
--- a/reference/ds/ds/set/get.xml
+++ b/reference/ds/ds/set/get.xml
@@ -43,7 +43,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/set/last.xml b/reference/ds/ds/set/last.xml
index de41141ec..011e836b6 100644
--- a/reference/ds/ds/set/last.xml
+++ b/reference/ds/ds/set/last.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/set/merge.xml b/reference/ds/ds/set/merge.xml
index 277b08520..2de11bbcd 100644
--- a/reference/ds/ds/set/merge.xml
+++ b/reference/ds/ds/set/merge.xml
@@ -26,7 +26,7 @@
     <term><parameter>values</parameter></term>
     <listitem>
      <para>
-        A <classname>traversable</classname> object or an &array;.
+        A <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname> object or an &array;.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ds/ds/stack/construct.xml b/reference/ds/ds/stack/construct.xml
index 7554d18b4..89a826c43 100644
--- a/reference/ds/ds/stack/construct.xml
+++ b/reference/ds/ds/stack/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
   </constructorsynopsis>
   <para>
-    Creates a new instance, using either a <classname>traversable</classname>
+    Creates a new instance, using either a <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or an &array; for the initial <parameter>values</parameter>.
   </para>
  </refsect1>
diff --git a/reference/ds/ds/stack/peek.xml b/reference/ds/ds/stack/peek.xml
index 183e5dccf..42abee0a5 100644
--- a/reference/ds/ds/stack/peek.xml
+++ b/reference/ds/ds/stack/peek.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/stack/pop.xml b/reference/ds/ds/stack/pop.xml
index df040a788..eb776ab41 100644
--- a/reference/ds/ds/stack/pop.xml
+++ b/reference/ds/ds/stack/pop.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/construct.xml b/reference/ds/ds/vector/construct.xml
index fb9e4d703..14aa25e55 100644
--- a/reference/ds/ds/vector/construct.xml
+++ b/reference/ds/ds/vector/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
   </constructorsynopsis>
   <para>
-    Creates a new instance, using either a <classname>traversable</classname>
+    Creates a new instance, using either a <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname>
     object or an &array; for the initial <parameter>values</parameter>.
   </para>
  </refsect1>
diff --git a/reference/ds/ds/vector/first.xml b/reference/ds/ds/vector/first.xml
index 799f99847..194243f45 100644
--- a/reference/ds/ds/vector/first.xml
+++ b/reference/ds/ds/vector/first.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/get.xml b/reference/ds/ds/vector/get.xml
index 178423cf4..495b3ab2b 100644
--- a/reference/ds/ds/vector/get.xml
+++ b/reference/ds/ds/vector/get.xml
@@ -43,7 +43,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/insert.xml b/reference/ds/ds/vector/insert.xml
index 2f1c67a7f..7852496c4 100644
--- a/reference/ds/ds/vector/insert.xml
+++ b/reference/ds/ds/vector/insert.xml
@@ -57,7 +57,7 @@
 <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/last.xml b/reference/ds/ds/vector/last.xml
index b8d6b6846..cf01be0d7 100644
--- a/reference/ds/ds/vector/last.xml
+++ b/reference/ds/ds/vector/last.xml
@@ -33,7 +33,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/merge.xml b/reference/ds/ds/vector/merge.xml
index 955ad6bdd..48f0d4401 100644
--- a/reference/ds/ds/vector/merge.xml
+++ b/reference/ds/ds/vector/merge.xml
@@ -26,7 +26,7 @@
     <term><parameter>values</parameter></term>
     <listitem>
      <para>
-        A <classname>traversable</classname> object or an &array;.
+        A <classname xlink:href="&url.php.manual.class.traversable;">traversable</classname> object or an &array;.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/ds/ds/vector/pop.xml b/reference/ds/ds/vector/pop.xml
index 545d16b06..a266bdbe4 100644
--- a/reference/ds/ds/vector/pop.xml
+++ b/reference/ds/ds/vector/pop.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/remove.xml b/reference/ds/ds/vector/remove.xml
index b15f809cf..f6355a76e 100644
--- a/reference/ds/ds/vector/remove.xml
+++ b/reference/ds/ds/vector/remove.xml
@@ -43,7 +43,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/set.xml b/reference/ds/ds/vector/set.xml
index 848b73a87..f86b553ab 100644
--- a/reference/ds/ds/vector/set.xml
+++ b/reference/ds/ds/vector/set.xml
@@ -52,7 +52,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
+   <classname xlink:href="&url.php.manual.class.outofrangeexception;">OutOfRangeException</classname> if the index is not valid.
   </para>
  </refsect1>
 
diff --git a/reference/ds/ds/vector/shift.xml b/reference/ds/ds/vector/shift.xml
index f4facb965..80165e494 100644
--- a/reference/ds/ds/vector/shift.xml
+++ b/reference/ds/ds/vector/shift.xml
@@ -34,7 +34,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <classname>UnderflowException</classname> if empty.
+   <classname xlink:href="&url.php.manual.class.underflowexception;">UnderflowException</classname> if empty.
   </para>
  </refsect1>
 
diff --git a/reference/eio/constants.xml b/reference/eio/constants.xml
index 04009193a..956daf848 100644
--- a/reference/eio/constants.xml
+++ b/reference/eio/constants.xml
@@ -125,7 +125,7 @@
      <simpara>
       When this flag is specified, then the names will be returned in an order
       suitable for <literal>stat</literal>'ing each one. When planning to
-      <function>stat</function> all files in the given directory, the
+      <function xlink:href="&url.php.manual.function.stat;">stat</function> all files in the given directory, the
       returned order will likely be
       fastest.
      </simpara>
@@ -149,7 +149,7 @@
     </term>
     <listitem>
      <simpara>
-      Unknown node type (very common). Further <function>stat</function> needed.
+      Unknown node type (very common). Further <function xlink:href="&url.php.manual.function.stat;">stat</function> needed.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/eio/functions/eio-readdir.xml b/reference/eio/functions/eio-readdir.xml
index bfd34a63f..14d88cb21 100644
--- a/reference/eio/functions/eio-readdir.xml
+++ b/reference/eio/functions/eio-readdir.xml
@@ -119,7 +119,7 @@
      <simpara>
      When this flag is specified, then the names will be returned in an order
      suitable for <literal>stat</literal>'ing each one. When planning to
-     <function>stat</function> all files in the given directory, the
+     <function xlink:href="&url.php.manual.function.stat;">stat</function> all files in the given directory, the
      returned order will likely be
      fastest.
      </simpara>
@@ -149,7 +149,7 @@
      </term>
      <listitem>
       <simpara>
-      Unknown node type(very common). Further <function>stat</function> needed.
+      Unknown node type(very common). Further <function xlink:href="&url.php.manual.function.stat;">stat</function> needed.
       </simpara>
      </listitem>
     </varlistentry>
diff --git a/reference/eio/functions/eio-seek.xml b/reference/eio/functions/eio-seek.xml
index c1c670a57..a8f67b6e9 100644
--- a/reference/eio/functions/eio-seek.xml
+++ b/reference/eio/functions/eio-seek.xml
@@ -19,7 +19,7 @@
   </methodsynopsis>
   <simpara>
    <function>eio_seek</function> repositions the offset of the open file associated with
-   stream, <classname>Socket</classname> instance, or file descriptor specified by <parameter>fd</parameter> to
+   stream, <classname xlink:href="&url.php.manual.class.socket;">Socket</classname> instance, or file descriptor specified by <parameter>fd</parameter> to
    the argument <parameter>offset</parameter> according to
    the directive <parameter>whence</parameter>.
   </simpara>
@@ -32,7 +32,7 @@
     <term><parameter>fd</parameter></term>
     <listitem>
      <simpara>
-     Stream, <classname>Socket</classname> instance, or numeric file descriptor.
+     Stream, <classname xlink:href="&url.php.manual.class.socket;">Socket</classname> instance, or numeric file descriptor.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/ev/evchild.xml b/reference/ev/evchild.xml
index 6de0cfa62..6102ca264 100644
--- a/reference/ev/evchild.xml
+++ b/reference/ev/evchild.xml
@@ -10,7 +10,7 @@
    <simpara>
     <classname>EvChild</classname>
     watchers trigger when the process receives a
-    <constant>SIGCHLD</constant>
+    <constant xlink:href="&url.php.manual.constant.sigchld;">SIGCHLD</constant>
     in response to some child status changes (most typically when a child dies
     or exits). It is permissible to install an
     <constant>EvChild</constant>
diff --git a/reference/ev/evchild/construct.xml b/reference/ev/evchild/construct.xml
index 897061b45..18f01bd7a 100644
--- a/reference/ev/evchild/construct.xml
+++ b/reference/ev/evchild/construct.xml
@@ -52,7 +52,7 @@
    <parameter>trace</parameter>
    is &true;, additionally when it is stopped or continued). In other words,
    when the process receives a
-   <constant>SIGCHLD</constant>,
+   <constant xlink:href="&url.php.manual.constant.sigchld;">SIGCHLD</constant>,
    <emphasis>Ev</emphasis>
    will fetch the outstanding exit/wait status for all changed/zombie children
    and call the callback.
diff --git a/reference/ev/evio.xml b/reference/ev/evio.xml
index 3357cb662..840b92044 100644
--- a/reference/ev/evio.xml
+++ b/reference/ev/evio.xml
@@ -42,7 +42,7 @@
     <parameter>fd</parameter>
     in non-blocking mode, then separately re-test whether a file descriptor is
     really ready. Some people additionally use
-    <constant>SIGALRM</constant>
+    <constant xlink:href="&url.php.manual.constant.sigalrm;">SIGALRM</constant>
     and an interval timer, just to be sure they won't block infinitely.
    </simpara>
    <simpara>
diff --git a/reference/ev/evio/construct.xml b/reference/ev/evio/construct.xml
index 3e8c48033..de68f49f1 100644
--- a/reference/ev/evio/construct.xml
+++ b/reference/ev/evio/construct.xml
@@ -45,7 +45,7 @@
     <listitem>
      <simpara>
       Can be a stream opened with
-      <function>fopen</function>
+      <function xlink:href="&url.php.manual.function.fopen;">fopen</function>
       or similar functions, numeric file descriptor, or socket.
      </simpara>
     </listitem>
diff --git a/reference/ev/evsignal.xml b/reference/ev/evsignal.xml
index e7782ad09..6a9301523 100644
--- a/reference/ev/evsignal.xml
+++ b/reference/ev/evsignal.xml
@@ -18,13 +18,13 @@
    <simpara>
     There is no limit for the number of watchers for the same signal, but only
     within the same loop, i.e. one can watch for
-    <constant>SIGINT</constant>
+    <constant xlink:href="&url.php.manual.constant.sigint;">SIGINT</constant>
     in the default loop and for
-    <constant>SIGIO</constant>
+    <constant xlink:href="&url.php.manual.constant.sigio;">SIGIO</constant>
     in another loop, but it is not allowed to watch for
-    <constant>SIGINT</constant>
+    <constant xlink:href="&url.php.manual.constant.sigint;">SIGINT</constant>
     in both the default loop and another loop at the same time. At the moment,
-    <constant>SIGCHLD</constant>
+    <constant xlink:href="&url.php.manual.constant.sigchld;">SIGCHLD</constant>
     is permanently tied to the default loop.
    </simpara>
    <simpara>
diff --git a/reference/ev/watchers.xml b/reference/ev/watchers.xml
index c74e26256..2e53920f7 100644
--- a/reference/ev/watchers.xml
+++ b/reference/ev/watchers.xml
@@ -5,7 +5,7 @@
  <para>
   A watcher is an object that gets created to record interest in some event.
   For instance, the following code waits for
-  <constant>STDIN</constant>
+  <constant xlink:href="&url.php.manual.constant.stdin;">STDIN</constant>
   to become readable:
   <programlisting role="php">
 <![CDATA[
diff --git a/reference/event/event.callbacks.xml b/reference/event/event.callbacks.xml
index c5017d8ae..2acae8766 100644
--- a/reference/event/event.callbacks.xml
+++ b/reference/event/event.callbacks.xml
@@ -121,7 +121,7 @@
    <listitem>
     <para>
      The number of the triggered signal(e.g.
-     <constant>SIGTERM</constant>
+     <constant xlink:href="&url.php.manual.constant.sigterm;">SIGTERM</constant>
      ).
     </para>
    </listitem>
diff --git a/reference/event/event/construct.xml b/reference/event/event/construct.xml
index 0b3494f67..aa8af00ff 100644
--- a/reference/event/event/construct.xml
+++ b/reference/event/event/construct.xml
@@ -60,7 +60,7 @@
       events pass
       <constant>-1</constant>.
       For signal events pass the signal number, e.g.
-      <constant>SIGHUP</constant>.
+      <constant xlink:href="&url.php.manual.constant.sighup;">SIGHUP</constant>.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/event/event/free.xml b/reference/event/event/free.xml
index f365fb31d..b3d213408 100644
--- a/reference/event/event/free.xml
+++ b/reference/event/event/free.xml
@@ -24,7 +24,7 @@
     <methodname>Event::free</methodname>
     method currently doesn't destruct the object itself. To destruct the
     object completely call
-    <function>unset</function>,
+    <function xlink:href="&url.php.manual.function.unset;">unset</function>,
     or assign &null;.
    </para>
   </warning>
diff --git a/reference/event/event/set.xml b/reference/event/event/set.xml
index b52ffb25b..4f042a408 100644
--- a/reference/event/event/set.xml
+++ b/reference/event/event/set.xml
@@ -60,7 +60,7 @@
       events pass
       <constant>-1</constant>.
       For signal events pass the signal number, e.g.
-      <constant>SIGHUP</constant>.
+      <constant xlink:href="&url.php.manual.constant.sighup;">SIGHUP</constant>.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/event/eventbase/free.xml b/reference/event/eventbase/free.xml
index 21b8284e0..e4fabe90d 100644
--- a/reference/event/eventbase/free.xml
+++ b/reference/event/eventbase/free.xml
@@ -22,7 +22,7 @@
     <methodname>EventBase::free</methodname>
     method doesn't destruct the object itself. To destruct the
     object completely call
-    <function>unset</function>,
+    <function xlink:href="&url.php.manual.function.unset;">unset</function>,
     or assign &null;.
    </para>
    <para>
diff --git a/reference/event/eventdnsbase/construct.xml b/reference/event/eventdnsbase/construct.xml
index 04cf7a40d..47f815551 100644
--- a/reference/event/eventdnsbase/construct.xml
+++ b/reference/event/eventdnsbase/construct.xml
@@ -91,7 +91,7 @@
   <para>
    If <parameter>initialize</parameter> has a type other than
    <type class="union"><type>int</type><type>bool</type></type>,
-   a <exceptionname>TypeError</exceptionname> is thrown.
+   a <exceptionname xlink:href="&url.php.manual.class.typeerror;">TypeError</exceptionname> is thrown.
   </para>
   <para>
    If the value of <parameter>initialize</parameter> is invalid,
@@ -114,7 +114,7 @@
       <entry>
        If <parameter>initialize</parameter> has a type other than
        <type class="union"><type>int</type><type>bool</type></type>,
-       a <exceptionname>TypeError</exceptionname> is thrown.
+       a <exceptionname xlink:href="&url.php.manual.class.typeerror;">TypeError</exceptionname> is thrown.
       </entry>
      </row>
      <row>
diff --git a/reference/event/eventexception.xml b/reference/event/eventexception.xml
index b956d4d3b..7936df3ff 100644
--- a/reference/event/eventexception.xml
+++ b/reference/event/eventexception.xml
@@ -25,15 +25,14 @@
 
     <ooclass>
      <modifier>extends</modifier>
-     <classname>RuntimeException</classname>
+     <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.error.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])"/>
+    &class.error.methods;
    </classsynopsis>
 <!-- }}} -->
   </section>
diff --git a/reference/event/eventutil/setsocketoption.xml b/reference/event/eventutil/setsocketoption.xml
index 795aee7f4..822ac8815 100644
--- a/reference/event/eventutil/setsocketoption.xml
+++ b/reference/event/eventutil/setsocketoption.xml
@@ -63,7 +63,7 @@
       would be used. Other levels, such as TCP, can be used by specifying the
       protocol number of that level. Protocol numbers can be found by using
       the
-      <function>getprotobyname</function>
+      <function xlink:href="&url.php.manual.function.getprotobyname;">getprotobyname</function>
       function. See
       <link linkend="eventutil.constants">EventUtil constants</link>.
      </para>
@@ -76,7 +76,7 @@
     <listitem>
      <para>
       Option name(type). Has the same meaning as corresponding parameter of
-      <function>socket_get_option</function>
+      <function xlink:href="&url.php.manual.function.socket-get-option;">socket_get_option</function>
       function. See
       <link linkend="eventutil.constants">EventUtil constants</link>.
      </para>
@@ -91,7 +91,7 @@
       Accepts the same values as
       <parameter>optval</parameter>
       parameter of the
-      <function>socket_get_option</function>
+      <function xlink:href="&url.php.manual.function.socket-get-option;">socket_get_option</function>
       function.
      </para>
     </listitem>
@@ -108,10 +108,10 @@
   &reftitle.seealso;
   <simplelist>
    <member>
-    <function>socket_get_option</function>
+    <function xlink:href="&url.php.manual.function.socket-get-option;">socket_get_option</function>
    </member>
    <member>
-    <function>socket_set_option</function>
+    <function xlink:href="&url.php.manual.function.socket-set-option;">socket_set_option</function>
    </member>
   </simplelist>
  </refsect1>
diff --git a/reference/expect/functions/expect-popen.xml b/reference/expect/functions/expect-popen.xml
index ae96a0228..58b8d77da 100644
--- a/reference/expect/functions/expect-popen.xml
+++ b/reference/expect/functions/expect-popen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.expect-popen">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.expect-popen">
  <refnamediv>
   <refname>expect_popen</refname>
   <refpurpose>Execute command via Bourne shell, and open the PTY stream to
@@ -59,7 +59,7 @@ fclose ($stream);
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>popen</function></member>
+   <member><function xlink:href="&url.php.manual.function.popen;">popen</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/expect/ini.xml b/reference/expect/ini.xml
index cdebc6849..c7f783a21 100644
--- a/reference/expect/ini.xml
+++ b/reference/expect/ini.xml
@@ -21,25 +21,25 @@
      <row>
       <entry><link linkend="ini.expect.timeout">expect.timeout</link></entry>
       <entry>"10"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.expect.loguser">expect.loguser</link></entry>
       <entry>"1"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.expect.logfile">expect.logfile</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.expect.match-max">expect.match_max</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
     </tbody>
diff --git a/reference/gearman/gearmanexception.xml b/reference/gearman/gearmanexception.xml
index 937711b1e..43f3ddd7c 100644
--- a/reference/gearman/gearmanexception.xml
+++ b/reference/gearman/gearmanexception.xml
@@ -26,7 +26,7 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <!-- GearmanException doesn't have any methods.
@@ -34,7 +34,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/gearman/gearmanworker/wait.xml b/reference/gearman/gearmanworker/wait.xml
index 5fa726287..092967ab0 100644
--- a/reference/gearman/gearmanworker/wait.xml
+++ b/reference/gearman/gearmanworker/wait.xml
@@ -14,7 +14,7 @@
   </methodsynopsis>
   <simpara>
    Causes the worker to wait for activity from one of the Gearman job servers when operating
-   in non-blocking I/O mode.  On failure, issues a <constant>E_WARNING</constant> with the last Gearman error
+   in non-blocking I/O mode.  On failure, issues a <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> with the last Gearman error
    encountered.
   </simpara>
  </refsect1>
diff --git a/reference/gearman/gearmanworker/work.xml b/reference/gearman/gearmanworker/work.xml
index 99b502e63..5035cb172 100644
--- a/reference/gearman/gearmanworker/work.xml
+++ b/reference/gearman/gearmanworker/work.xml
@@ -14,7 +14,7 @@
   </methodsynopsis>
   <simpara>
    Waits for a job to be assigned and then calls the appropriate callback function.
-   Issues an <constant>E_WARNING</constant> with the last Gearman error if the return
+   Issues an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> with the last Gearman error if the return
    code is not one of <constant>GEARMAN_SUCCESS</constant>, <constant>GEARMAN_IO_WAIT</constant>,
    or <constant>GEARMAN_WORK_FAIL</constant>.
   </simpara>
diff --git a/reference/gender/gender/country.xml b/reference/gender/gender/country.xml
index 9a5c9b2c2..f33efad9a 100644
--- a/reference/gender/gender/country.xml
+++ b/reference/gender/gender/country.xml
@@ -44,7 +44,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title>Using <methodname>Gender\Gender::country</methodname></title>
+   <title>Using <methodname xlink:href="&url.php.manual.gender-gender.country;">Gender\Gender::country</methodname></title>
    <programlisting role="php">
 <![CDATA[
 $gender = new Gender\Gender;
diff --git a/reference/geoip/ini.xml b/reference/geoip/ini.xml
index 55b05fb15..c6c4dbb04 100644
--- a/reference/geoip/ini.xml
+++ b/reference/geoip/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="geoip.configuration">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="geoip.configuration">
   &reftitle.runtime;
   &extension.runtime;
   <table>
@@ -18,7 +18,7 @@
          <row>
            <entry><link linkend="ini.geoip.custom-directory">geoip.custom_directory</link></entry>
            <entry>""</entry>
-           <entry><constant>INI_ALL</constant></entry>
+           <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
            <entry><!-- leave empty, this will be filled by an automatic script --></entry>
          </row>
        </tbody>
diff --git a/reference/gmagick/gmagickexception.xml b/reference/gmagick/gmagickexception.xml
index d8c92f502..b9b3e1440 100644
--- a/reference/gmagick/gmagickexception.xml
+++ b/reference/gmagick/gmagickexception.xml
@@ -31,16 +31,16 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/gmagick/gmagickpixelexception.xml b/reference/gmagick/gmagickpixelexception.xml
index ef6d9e019..51b25070d 100644
--- a/reference/gmagick/gmagickpixelexception.xml
+++ b/reference/gmagick/gmagickpixelexception.xml
@@ -31,13 +31,13 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/hrtime/book.xml b/reference/hrtime/book.xml
index 3c319c609..f1ff511e8 100644
--- a/reference/hrtime/book.xml
+++ b/reference/hrtime/book.xml
@@ -14,7 +14,7 @@ a custom stopwatch using low level ticks delivered by the underlying APIs.
   </simpara>
   <note>
    <simpara>
-    As of PHP 7.3.0 the related function <function>hrtime</function> is part of
+    As of PHP 7.3.0 the related function <function xlink:href="&url.php.manual.function.hrtime;">hrtime</function> is part of
     the core.
    </simpara>
   </note>
diff --git a/reference/ibase/functions/ibase-blob-import.xml b/reference/ibase/functions/ibase-blob-import.xml
index 03bbfc85a..baaaa80e6 100644
--- a/reference/ibase/functions/ibase-blob-import.xml
+++ b/reference/ibase/functions/ibase-blob-import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-import">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ibase-blob-import">
  <refnamediv>
   <refname>ibase_blob_import</refname>
   <refpurpose>Create blob, copy file in it, and close it</refpurpose>
@@ -39,7 +39,7 @@
     <term><parameter>file_handle</parameter></term>
     <listitem>
      <simpara>
-      The file handle is a handle returned by <function>fopen</function>.
+      The file handle is a handle returned by <function xlink:href="&url.php.manual.function.fopen;">fopen</function>.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/ibase/ini.xml b/reference/ibase/ini.xml
index 622477099..0f9c43c0e 100644
--- a/reference/ibase/ini.xml
+++ b/reference/ibase/ini.xml
@@ -19,61 +19,61 @@
     <row>
      <entry><link linkend="ini.ibase.allow-persistent">ibase.allow_persistent</link></entry>
      <entry>"1"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.max-persistent">ibase.max_persistent</link></entry>
      <entry>"-1"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.max-links">ibase.max_links</link></entry>
      <entry>"-1"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.default-db">ibase.default_db</link></entry>
      <entry>NULL</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.default-user">ibase.default_user</link></entry>
      <entry>NULL</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.default-password">ibase.default_password</link></entry>
      <entry>NULL</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.default-charset">ibase.default_charset</link></entry>
      <entry>NULL</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.timestampformat">ibase.timestampformat</link></entry>
      <entry>"%Y-%m-%d %H:%M:%S"</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.dateformat">ibase.dateformat</link></entry>
      <entry>"%Y-%m-%d"</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibase.timeformat">ibase.timeformat</link></entry>
      <entry>"%H:%M:%S"</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
    </tbody>
diff --git a/reference/ibm_db2/functions/db2-client-info.xml b/reference/ibm_db2/functions/db2-client-info.xml
index 3528d77bd..8ff1b4494 100644
--- a/reference/ibm_db2/functions/db2-client-info.xml
+++ b/reference/ibm_db2/functions/db2-client-info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.db2-client-info" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.db2-client-info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>db2_client_info</refname>
   <refpurpose>Returns an object with properties that describe the DB2 database client</refpurpose>
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>stdClass</type><type>false</type></type><methodname>db2_client_info</methodname>
+   <type class="union"><type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><type>false</type></type><methodname>db2_client_info</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/ibm_db2/functions/db2-fetch-object.xml b/reference/ibm_db2/functions/db2-fetch-object.xml
index 783e35ee7..03fb3f579 100644
--- a/reference/ibm_db2/functions/db2-fetch-object.xml
+++ b/reference/ibm_db2/functions/db2-fetch-object.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-fetch-object">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.db2-fetch-object">
  <refnamediv>
   <refname>db2_fetch_object</refname>
   <refpurpose>
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>stdClass</type><type>false</type></type><methodname>db2_fetch_object</methodname>
+   <type class="union"><type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><type>false</type></type><methodname>db2_fetch_object</methodname>
    <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>row_number</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/ibm_db2/functions/db2-server-info.xml b/reference/ibm_db2/functions/db2-server-info.xml
index d15e89245..7c1312c45 100644
--- a/reference/ibm_db2/functions/db2-server-info.xml
+++ b/reference/ibm_db2/functions/db2-server-info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.db2-server-info" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.db2-server-info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>db2_server_info</refname>
   <refpurpose>Returns an object with properties that describe the DB2 database server</refpurpose>
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>stdClass</type><type>false</type></type><methodname>db2_server_info</methodname>
+   <type class="union"><type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><type>false</type></type><methodname>db2_server_info</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/ibm_db2/ini.xml b/reference/ibm_db2/ini.xml
index ece4d2b24..67ad3251b 100644
--- a/reference/ibm_db2/ini.xml
+++ b/reference/ibm_db2/ini.xml
@@ -18,91 +18,91 @@
     <row>
      <entry><link linkend="ini.ibm-db2.binmode">ibm_db2.binmode</link></entry>
      <entry>"1"</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-all-pconnect">ibm_db2.i5_all_pconnect</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.6.5.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-allow-commit">ibm_db2.i5_allow_commit</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.4.9.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-blank-userid">ibm_db2.i5_blank_userid</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.9.7.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-char-trim">ibm_db2.i5_char_trim</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 2.1.0.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-dbcs-alloc">ibm_db2.i5_dbcs_alloc</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.5.0.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-guard-profile">ibm_db2.i5_guard_profile</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.9.7.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-ignore-userid">ibm_db2.i5_ignore_userid</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.8.0.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-job-sort">ibm_db2.i5_job_sort</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.8.4.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-log-verbose">ibm_db2.i5_log_verbose</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.9.7.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-max-pconnect">ibm_db2.i5_max_pconnect</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.9.7.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-override-ccsid">ibm_db2.i5_override_ccsid</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.9.7.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-servermode-subsystem">ibm_db2.i5_servermode_subsystem</link></entry>
      <entry>NULL</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.9.7.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.i5-sys-naming">ibm_db2.i5_sys_naming</link></entry>
      <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.9.7.</entry>
     </row>
     <row>
      <entry><link linkend="ini.ibm-db2.instance-name">ibm_db2.instance_name</link></entry>
      <entry>NULL</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry>Available as of ibm_db2 1.0.2.</entry>
     </row>
    </tbody>
diff --git a/reference/igbinary/book.xml b/reference/igbinary/book.xml
index 4617832b9..cd3896110 100644
--- a/reference/igbinary/book.xml
+++ b/reference/igbinary/book.xml
@@ -8,7 +8,7 @@
   &reftitle.intro;
   <simpara>
    Igbinary is a drop in replacement for the standard PHP serializer.
-   Instead of the time and space consuming textual representation used by PHP's <function>serialize</function>,
+   Instead of the time and space consuming textual representation used by PHP's <function xlink:href="&url.php.manual.function.serialize;">serialize</function>,
    igbinary stores PHP data structures in a compact binary form.
    Memory savings are significant when using memcached, APCu,
    or similar memory based storages for serialized data.
diff --git a/reference/igbinary/functions/igbinary-serialize.xml b/reference/igbinary/functions/igbinary-serialize.xml
index 5e3b0f5c8..a3cb2c0a9 100644
--- a/reference/igbinary/functions/igbinary-serialize.xml
+++ b/reference/igbinary/functions/igbinary-serialize.xml
@@ -103,7 +103,7 @@ array (
   <note>
    <simpara>
     Note that many built-in PHP objects cannot be serialized. However, those with
-    this ability either implement the <interfacename>Serializable</interfacename> interface or the
+    this ability either implement the <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> interface or the
     magic <link xlink:href="&url.php.manual.object.serialize;">__serialize()</link>/<link xlink:href="&url.php.manual.object.unserialize;">__unserialize()</link>
     or <link xlink:href="&url.php.manual.object.sleep;">__sleep()</link>/<link xlink:href="&url.php.manual.object.wakeup;">__wakeup()</link> methods. If an
     internal class does not fulfill any of those requirements, it cannot reliably be
@@ -119,10 +119,10 @@ array (
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>serialize</function></member>
+   <member><function xlink:href="&url.php.manual.function.serialize;">serialize</function></member>
    <member><function>igbinary_unserialize</function></member>
-   <member><function>var_export</function></member>
-   <member><function>json_encode</function></member>
+   <member><function xlink:href="&url.php.manual.function.var-export;">var_export</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><link xlink:href="&url.php.manual.language.oop5.serialization;">Serializing Objects</link></member>
    <member><link xlink:href="&url.php.manual.object.sleep;">__sleep()</link></member>
    <member><link xlink:href="&url.php.manual.object.wakeup;">__wakeup()</link></member>
diff --git a/reference/igbinary/functions/igbinary-unserialize.xml b/reference/igbinary/functions/igbinary-unserialize.xml
index c5e6317d6..4aa05f8d5 100644
--- a/reference/igbinary/functions/igbinary-unserialize.xml
+++ b/reference/igbinary/functions/igbinary-unserialize.xml
@@ -23,12 +23,12 @@
     Unserialization can result in code being loaded and executed due to object
     instantiation and autoloading, and a malicious user may be able to exploit
     this. Instead a safe, standard data interchange format such as JSON (via
-    <function>json_decode</function> and <function>json_encode</function>) should be used,
+    <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> and <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function>) should be used,
     if serialized data needs to be passed to a client.
    </simpara>
    <simpara>
     If there is the need to unserialize externally-stored serialized data,
-    <function>hash_hmac</function> can be used for data validation.
+    <function xlink:href="&url.php.manual.function.hash-hmac;">hash_hmac</function> can be used for data validation.
     It is important to ensure that nobody has tampered with the data.
    </simpara>
   </warning>
@@ -84,14 +84,14 @@
   </simpara>
   <simpara>
    In case the passed string is not unserializeable, &false; is returned and
-   <constant>E_NOTICE</constant> or <constant>E_WARNING</constant> is issued.
+   <constant xlink:href="&url.php.manual.constant.e-notice;">E_NOTICE</constant> or <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is issued.
   </simpara>
  </refsect1>
 
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   Objects may throw <classname>Throwable</classname>s in their unserialization handlers.
+   Objects may throw <classname xlink:href="&url.php.manual.class.throwable;">Throwable</classname>s in their unserialization handlers.
   </simpara>
  </refsect1>
 
@@ -103,7 +103,7 @@
     the serialized &null; or &false; value. It is possible to catch this special case by
     comparing <parameter>str</parameter> with
     <code>igbinary_serialize(null)</code> or <code>igbinary_serialize(false)</code>
-    or by catching the issued <constant>E_NOTICE</constant>.
+    or by catching the issued <constant xlink:href="&url.php.manual.constant.e-notice;">E_NOTICE</constant>.
    </simpara>
   </warning>
  </refsect1>
@@ -111,10 +111,10 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>unserialize</function></member>
-   <member><function>json_encode</function></member>
-   <member><function>json_decode</function></member>
-   <member><function>hash_hmac</function></member>
+   <member><function xlink:href="&url.php.manual.function.unserialize;">unserialize</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-decode;">json_decode</function></member>
+   <member><function xlink:href="&url.php.manual.function.hash-hmac;">hash_hmac</function></member>
    <member><function>igbinary_serialize</function></member>
    <member><link xlink:href="&url.php.manual.language.oop5.autoload;">Autoloading Classes</link></member>
    <member><link xlink:href="&url.php.manual.ini.unserialize-callback-func;">unserialize_callback_func</link></member>
diff --git a/reference/igbinary/ini.xml b/reference/igbinary/ini.xml
index 21b8e28e8..7a8a7f542 100644
--- a/reference/igbinary/ini.xml
+++ b/reference/igbinary/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xml:id="igbinary.configuration">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="igbinary.configuration">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -18,7 +18,7 @@
      <row>
       <entry><link linkend="ini.igbinary.compact-strings">igbinary.compact_strings</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
     </tbody>
@@ -39,7 +39,7 @@
      <row>
       <entry><link linkend="ini.igbinary.save-handler">session.save_handler</link></entry>
       <entry>"files"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
     </tbody>
diff --git a/reference/imagick/imagick.xml b/reference/imagick/imagick.xml
index 2f24c5dd4..bd4b2cd6d 100644
--- a/reference/imagick/imagick.xml
+++ b/reference/imagick/imagick.xml
@@ -11,7 +11,7 @@
     <classsynopsisinfo>
      <ooclass><classname>Imagick</classname></ooclass>
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
     </classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagick')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
diff --git a/reference/imagick/imagick/trimimage.xml b/reference/imagick/imagick/trimimage.xml
index 94efd9752..446830c1a 100644
--- a/reference/imagick/imagick/trimimage.xml
+++ b/reference/imagick/imagick/trimimage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="imagick.trimimage" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="imagick.trimimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Imagick::trimImage</refname>
   <refpurpose>Remove edges from the image</refpurpose>
@@ -86,7 +86,7 @@ echo $im;
    <simplelist>
     <member><function>Imagick::getQuantumDepth</function></member>
     <member><function>Imagick::getQuantumRange</function></member>
-    <member><function>imagecropauto</function></member>
+    <member><function xlink:href="&url.php.manual.function.imagecropauto;">imagecropauto</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/imagick/imagickdrawexception.xml b/reference/imagick/imagickdrawexception.xml
index a4a7465e1..2205ec7f7 100644
--- a/reference/imagick/imagickdrawexception.xml
+++ b/reference/imagick/imagickdrawexception.xml
@@ -30,20 +30,19 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
 
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/imagick/imagickexception.xml b/reference/imagick/imagickexception.xml
index 11b90c849..bc4e59eb3 100644
--- a/reference/imagick/imagickexception.xml
+++ b/reference/imagick/imagickexception.xml
@@ -30,20 +30,19 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
 
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/imagick/imagickkernelexception.xml b/reference/imagick/imagickkernelexception.xml
index 712bf1e9e..b7917f8fb 100644
--- a/reference/imagick/imagickkernelexception.xml
+++ b/reference/imagick/imagickkernelexception.xml
@@ -32,17 +32,16 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/imagick/imagickpixelexception.xml b/reference/imagick/imagickpixelexception.xml
index f2cb22a43..c6a4adff3 100644
--- a/reference/imagick/imagickpixelexception.xml
+++ b/reference/imagick/imagickpixelexception.xml
@@ -30,20 +30,19 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
 
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/imagick/imagickpixeliteratorexception.xml b/reference/imagick/imagickpixeliteratorexception.xml
index 8ce45c77c..839038300 100644
--- a/reference/imagick/imagickpixeliteratorexception.xml
+++ b/reference/imagick/imagickpixeliteratorexception.xml
@@ -30,20 +30,19 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
 
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/imagick/ini.xml b/reference/imagick/ini.xml
index 1bdabf490..be07ae2a3 100644
--- a/reference/imagick/ini.xml
+++ b/reference/imagick/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xml:id="imagick.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="imagick.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -19,19 +19,19 @@
      <row>
       <entry><link linkend="ini.imagick.locale-fix">imagick.locale_fix</link></entry>
       <entry>&false;</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available since Imagick 2.1.0</entry>
      </row>
      <row>
       <entry><link linkend="ini.imagick.progress-monitor">imagick.progress_monitor</link></entry>
       <entry>&false;</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available since Imagick 2.2.2</entry>
      </row>
      <row>
       <entry><link linkend="ini.imagick.skip-version-check">imagick.skip_version_check</link></entry>
       <entry>&false;</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available since Imagick 3.3.0</entry>
      </row>     
     </tbody>
diff --git a/reference/inotify/book.xml b/reference/inotify/book.xml
index 61d71ba98..1c18c1fcd 100644
--- a/reference/inotify/book.xml
+++ b/reference/inotify/book.xml
@@ -14,8 +14,8 @@
   <simpara>
    As the C <function>inotify_init</function> function returns a file descriptor, PHP's
    <function>inotify_init</function> returns a stream resource, usable with standard
-   stream functions, like <function>stream_select</function>, <function>stream_set_blocking</function>
-   and <function>fclose</function>. <function>inotify_read</function> replaces the C way of reading inotify
+   stream functions, like <function xlink:href="&url.php.manual.function.stream-select;">stream_select</function>, <function xlink:href="&url.php.manual.function.stream-set-blocking;">stream_set_blocking</function>
+   and <function xlink:href="&url.php.manual.function.fclose;">fclose</function>. <function>inotify_read</function> replaces the C way of reading inotify
    events.
   </simpara>
  </preface>
diff --git a/reference/inotify/functions/inotify-init.xml b/reference/inotify/functions/inotify-init.xml
index bd1043e5c..6a4c4750c 100644
--- a/reference/inotify/functions/inotify-init.xml
+++ b/reference/inotify/functions/inotify-init.xml
@@ -102,7 +102,7 @@ array(
    <member><function>inotify_rm_watch</function></member>
    <member><function>inotify_queue_len</function></member>
    <member><function>inotify_read</function></member>
-   <member><function>fclose</function></member>
+   <member><function xlink:href="&url.php.manual.function.fclose;">fclose</function></member>
   </simplelist>
  </refsect1><!-- }}} -->
 
diff --git a/reference/inotify/functions/inotify-queue-len.xml b/reference/inotify/functions/inotify-queue-len.xml
index 713b4c49f..1f1a26ab4 100644
--- a/reference/inotify/functions/inotify-queue-len.xml
+++ b/reference/inotify/functions/inotify-queue-len.xml
@@ -44,8 +44,8 @@
   &reftitle.seealso;
   <simplelist>
    <member><function>inotify_init</function></member>
-   <member><function>stream_select</function></member>
-   <member><function>stream_set_blocking</function></member>
+   <member><function xlink:href="&url.php.manual.function.stream-select;">stream_select</function></member>
+   <member><function xlink:href="&url.php.manual.function.stream-set-blocking;">stream_set_blocking</function></member>
   </simplelist>
  </refsect1><!-- }}} -->
 
diff --git a/reference/inotify/functions/inotify-read.xml b/reference/inotify/functions/inotify-read.xml
index ad3515f46..db244543f 100644
--- a/reference/inotify/functions/inotify-read.xml
+++ b/reference/inotify/functions/inotify-read.xml
@@ -52,8 +52,8 @@
   &reftitle.seealso;
   <simplelist>
    <member><function>inotify_init</function></member>
-   <member><function>stream_select</function></member>
-   <member><function>stream_set_blocking</function></member>
+   <member><function xlink:href="&url.php.manual.function.stream-select;">stream_select</function></member>
+   <member><function xlink:href="&url.php.manual.function.stream-set-blocking;">stream_set_blocking</function></member>
    <member><function>inotify_queue_len</function></member>
   </simplelist>
  </refsect1><!-- }}} -->
diff --git a/reference/lua/luaexception.xml b/reference/lua/luaexception.xml
index 9547be226..5618bb376 100644
--- a/reference/lua/luaexception.xml
+++ b/reference/lua/luaexception.xml
@@ -31,16 +31,16 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/luasandbox/luasandboxerror.xml b/reference/luasandbox/luasandboxerror.xml
index f653f279f..e7b631956 100644
--- a/reference/luasandbox/luasandboxerror.xml
+++ b/reference/luasandbox/luasandboxerror.xml
@@ -31,7 +31,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -62,7 +62,7 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <!--
@@ -71,7 +71,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/luasandbox/luasandboxerrorerror.xml b/reference/luasandbox/luasandboxerrorerror.xml
index 95f7f5dbe..32057e487 100644
--- a/reference/luasandbox/luasandboxerrorerror.xml
+++ b/reference/luasandbox/luasandboxerrorerror.xml
@@ -37,7 +37,7 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <!--
@@ -46,7 +46,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/luasandbox/luasandboxfatalerror.xml b/reference/luasandbox/luasandboxfatalerror.xml
index ae9f25353..e4a55ea0b 100644
--- a/reference/luasandbox/luasandboxfatalerror.xml
+++ b/reference/luasandbox/luasandboxfatalerror.xml
@@ -41,7 +41,7 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <!--
@@ -50,7 +50,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/luasandbox/luasandboxfunction/call.xml b/reference/luasandbox/luasandboxfunction/call.xml
index c0536015e..583c676f7 100644
--- a/reference/luasandbox/luasandboxfunction/call.xml
+++ b/reference/luasandbox/luasandboxfunction/call.xml
@@ -17,7 +17,7 @@
   </simpara>
   <simpara>
    Errors considered to be the fault of the PHP code will result in the
-   function returning &false; and <constant>E_WARNING</constant>
+   function returning &false; and <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant>
    being raised, for example, a <type>resource</type> type being used as an
    argument. Lua errors will result in a <classname>LuaSandboxRuntimeError</classname>
    exception being thrown.
@@ -32,7 +32,7 @@
    <listitem>
     <simpara>
      PHP <type>int</type>s and <type>float</type>s are converted to Lua
-     numbers. Infinity and <constant>NAN</constant> are supported.
+     numbers. Infinity and <constant xlink:href="&url.php.manual.constant.nan;">NAN</constant> are supported.
     </simpara>
    </listitem>
    <listitem>
diff --git a/reference/luasandbox/luasandboxmemoryerror.xml b/reference/luasandbox/luasandboxmemoryerror.xml
index 9ae6439a9..d85bd5d75 100644
--- a/reference/luasandbox/luasandboxmemoryerror.xml
+++ b/reference/luasandbox/luasandboxmemoryerror.xml
@@ -37,7 +37,7 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <!--
@@ -46,7 +46,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/luasandbox/luasandboxruntimeerror.xml b/reference/luasandbox/luasandboxruntimeerror.xml
index 68a40b2c1..428c2a612 100644
--- a/reference/luasandbox/luasandboxruntimeerror.xml
+++ b/reference/luasandbox/luasandboxruntimeerror.xml
@@ -41,7 +41,7 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <!--
@@ -50,7 +50,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/luasandbox/luasandboxsyntaxerror.xml b/reference/luasandbox/luasandboxsyntaxerror.xml
index 75c2ae450..3ec8df021 100644
--- a/reference/luasandbox/luasandboxsyntaxerror.xml
+++ b/reference/luasandbox/luasandboxsyntaxerror.xml
@@ -37,7 +37,7 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <!--
@@ -46,7 +46,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/luasandbox/luasandboxtimeouterror.xml b/reference/luasandbox/luasandboxtimeouterror.xml
index 978f453b4..a7d33e345 100644
--- a/reference/luasandbox/luasandboxtimeouterror.xml
+++ b/reference/luasandbox/luasandboxtimeouterror.xml
@@ -37,7 +37,7 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
 
     <!--
@@ -46,7 +46,7 @@
     -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mailparse/setup.xml b/reference/mailparse/setup.xml
index 5abf24b0b..7fe6bbb79 100644
--- a/reference/mailparse/setup.xml
+++ b/reference/mailparse/setup.xml
@@ -27,7 +27,7 @@
       <row>
        <entry><link linkend="ini.mailparse.def_charset">mailparse.def_charset</link></entry>
        <entry>"us-ascii"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
+       <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
        <entry/>
       </row>
      </tbody>
diff --git a/reference/mcrypt/functions/mcrypt-create-iv.xml b/reference/mcrypt/functions/mcrypt-create-iv.xml
index 7af8c29d4..9e963a28f 100644
--- a/reference/mcrypt/functions/mcrypt-create-iv.xml
+++ b/reference/mcrypt/functions/mcrypt-create-iv.xml
@@ -10,7 +10,7 @@
   <warning>
    &warn.deprecated.function.7-1-0.removed.7-2-0.alternatives;
    <simplelist role="alternatives">
-    <member><function>random_bytes</function></member>
+    <member><function xlink:href="&url.php.manual.function.random-bytes;">random_bytes</function></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -99,7 +99,7 @@
    <member><link xlink:href="&url.mcrypt.iv;">&url.mcrypt.iv;</link></member>
    <member><link xlink:href="&url.mcrypt.bcm;">&url.mcrypt.bcm;</link></member>
    <member>Chapter 9.3 of &book.applied.cryptography;</member>
-   <member><function>random_bytes</function></member>
+   <member><function xlink:href="&url.php.manual.function.random-bytes;">random_bytes</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mcrypt/ini.xml b/reference/mcrypt/ini.xml
index 6bdc65bec..c2162c40c 100644
--- a/reference/mcrypt/ini.xml
+++ b/reference/mcrypt/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="mcrypt.configuration">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mcrypt.configuration">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -19,13 +19,13 @@
     <row>
      <entry><link linkend="ini.mcrypt.algorithms-dir">mcrypt.algorithms_dir</link></entry>
      <entry>&null;</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
     <row>
      <entry><link linkend="ini.mcrypt.modes-dir">mcrypt.modes_dir</link></entry>
      <entry>&null;</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry/>
     </row>
    </tbody>
diff --git a/reference/memcache/ini.xml b/reference/memcache/ini.xml
index 3a6bf69c9..4c7418096 100644
--- a/reference/memcache/ini.xml
+++ b/reference/memcache/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="memcache.ini">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="memcache.ini">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -19,67 +19,67 @@
      <row>
       <entry><link linkend="ini.memcache.allow-failover">memcache.allow_failover</link></entry>
       <entry>"1"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available since memcache 2.0.2.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.max-failover-attempts">memcache.max_failover_attempts</link></entry>
       <entry>"20"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available since memcache 2.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.chunk-size">memcache.chunk_size</link></entry>
       <entry>"8192"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available since memcache 2.0.2.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.default-port">memcache.default_port</link></entry>
       <entry>"11211"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available since memcache 2.0.2.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.hash-strategy">memcache.hash_strategy</link></entry>
       <entry>"standard"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available since memcache 2.2.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.hash-function">memcache.hash_function</link></entry>
       <entry>"crc32"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available since memcache 2.2.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.protocol">memcache.protocol</link></entry>
       <entry>ascii</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Supported since memcache 3.0.0</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.redundancy">memcache.redundancy</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Supported since memcache 3.0.0</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.session-redundancy">memcache.session_redundancy</link></entry>
       <entry>2</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Supported since memcache 3.0.0</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.compress-threshold">memcache.compress_threshold</link></entry>
       <entry>20000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Supported since memcache 3.0.3</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.lock-timeout">memcache.lock_timeout</link></entry>
       <entry>15</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Supported since memcache 3.0.4</entry>
      </row>
     </tbody>
@@ -100,13 +100,13 @@
      <row>
       <entry><link linkend="ini.memcache.save-handler">session.save_handler</link></entry>
       <entry>"files"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Supported since memcache 2.1.2</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcache.save-path">session.save_path</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Supported since memcache 2.1.2</entry>
      </row>
     </tbody>
diff --git a/reference/memcache/memcache/addserver.xml b/reference/memcache/memcache/addserver.xml
index 61ba70bab..283da489a 100644
--- a/reference/memcache/memcache/addserver.xml
+++ b/reference/memcache/memcache/addserver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.addserver">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="memcache.addserver">
  <refnamediv>
   <refname>Memcache::addServer</refname>
   <refname>memcache_add_server</refname>
@@ -127,7 +127,7 @@
       Controls how often a failed server will be retried, the default value
       is 15 seconds. Setting this parameter to -1 disables automatic retry.
       Neither this nor the <parameter>persistent</parameter> parameter has any
-      effect when the extension is loaded dynamically via <function>dl</function>.
+      effect when the extension is loaded dynamically via <function xlink:href="&url.php.manual.function.dl;">dl</function>.
      </simpara>
      <simpara>
       Each failed connection struct has its own timeout and before it has expired
diff --git a/reference/memcache/memcache/setserverparams.xml b/reference/memcache/memcache/setserverparams.xml
index a6547952c..d01f158ab 100644
--- a/reference/memcache/memcache/setserverparams.xml
+++ b/reference/memcache/memcache/setserverparams.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.setserverparams">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="memcache.setserverparams">
  <refnamediv>
   <refname>Memcache::setServerParams</refname>
   <refname>memcache_set_server_params</refname>
@@ -77,7 +77,7 @@
       Controls how often a failed server will be retried, the default value
       is 15 seconds. Setting this parameter to -1 disables automatic retry.
       Neither this nor the <parameter>persistent</parameter> parameter has any
-      effect when the extension is loaded dynamically via <function>dl</function>.
+      effect when the extension is loaded dynamically via <function xlink:href="&url.php.manual.function.dl;">dl</function>.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/memcached/ini.xml b/reference/memcached/ini.xml
index f1eb32656..ce2e7ea05 100644
--- a/reference/memcached/ini.xml
+++ b/reference/memcached/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="memcached.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="memcached.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,175 +20,175 @@
      <row>
       <entry><link linkend="ini.memcached.sess-locking">memcached.sess_locking</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 0.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-consistent-hash">memcached.sess_consistent_hash</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.1.0. Default value is <literal>On</literal> as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-binary">memcached.sess_binary</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.0.0. Replaced by <literal>memcached.sess_binary_protocol</literal> as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-lock-wait">memcached.sess_lock_wait</link></entry>
       <entry>150000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 0.1.0. Removed as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-prefix">memcached.sess_prefix</link></entry>
       <entry>memc.sess.key.</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 0.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-number-of-replicas">memcached.sess_number_of_replicas</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-randomize-replica-read">memcached.sess_randomize_replica_read</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-remove-failed">memcached.sess_remove_failed</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.1.0. Replaced by <literal>memcached.sess_remove_failed_servers</literal> as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.compression-type">memcached.compression_type</link></entry>
       <entry>fastlz</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 0.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.compression-factor">memcached.compression_factor</link></entry>
       <entry>1.3</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 0.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.compression-threshold">memcached.compression_threshold</link></entry>
       <entry>2000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 0.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.serializer">memcached.serializer</link></entry>
       <entry>igbinary</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 0.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.use-sasl">memcached.use_sasl</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.2.0. Removed as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.default-binary-protocol">memcached.default_binary_protocol</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.default-connect-timeout">memcached.default_connect_timeout</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.default-consistent-hash">memcached.default_consistent_hash</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-binary-protocol">memcached.sess_binary_protocol</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0. Replace <literal>memcached.sess_binary</literal>.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-connect-timeout">memcached.sess_connect_timeout</link></entry>
        <entry>1000</entry>
-       <entry><constant>INI_ALL</constant></entry>
+       <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
        <entry>Available as of memcached 2.2.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-consistent-hash-type">memcached.sess_consistent_hash_type</link></entry>
       <entry>ketama</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.1.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-lock-expire">memcached.sess_lock_expire</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.2.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-lock-retries">memcached.sess_lock_retries</link></entry>
       <entry>5</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-lock-wait-max">memcached.sess_lock_wait_max</link></entry>
       <entry>150</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0. Default value <literal>150</literal> as of memcached 3.1.0 (previously <literal>2000</literal>).</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-lock-wait-min">memcached.sess_lock_wait_min</link></entry>
       <entry>150</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0. Default value <literal>150</literal> as of memcached 3.1.0 (previously <literal>1000</literal>).</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-persistent">memcached.sess_persistent</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-remove-failed-servers">memcached.sess_remove_failed_servers</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0. Replace <literal>memcached.sess_remove_failed</literal>.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-server-failure-limit">memcached.sess_server_failure_limit</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 3.0.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-sasl-password">memcached.sess_sasl_password</link></entry>
       <entry>null</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.2.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.sess-sasl-username">memcached.sess_sasl_username</link></entry>
       <entry>null</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of memcached 2.2.0.</entry>
      </row>
      <row>
       <entry><link linkend="ini.memcached.store-retry-count">memcached.store_retry_count</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>
        Available as of memcached 2.2.0.
        Default value <literal>0</literal> as of memcached 3.2.0
diff --git a/reference/memcached/memcached/append.xml b/reference/memcached/memcached/append.xml
index 9a402ed7f..ef3d3ba62 100644
--- a/reference/memcached/memcached/append.xml
+++ b/reference/memcached/memcached/append.xml
@@ -64,7 +64,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
+   Returns &null; and raises an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> when
    compression is enabled.
   </para>
  </refsect1>
diff --git a/reference/memcached/memcached/appendbykey.xml b/reference/memcached/memcached/appendbykey.xml
index 756b4bdcc..f137b8235 100644
--- a/reference/memcached/memcached/appendbykey.xml
+++ b/reference/memcached/memcached/appendbykey.xml
@@ -65,7 +65,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
+   Returns &null; and raises an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> when
    compression is enabled.
   </para>
  </refsect1>
diff --git a/reference/memcached/memcached/prepend.xml b/reference/memcached/memcached/prepend.xml
index 25a204bd4..051115651 100644
--- a/reference/memcached/memcached/prepend.xml
+++ b/reference/memcached/memcached/prepend.xml
@@ -64,7 +64,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
+   Returns &null; and raises an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> when
    compression is enabled.
   </para>
  </refsect1>
diff --git a/reference/memcached/memcached/prependbykey.xml b/reference/memcached/memcached/prependbykey.xml
index c89f14a79..dac82d583 100644
--- a/reference/memcached/memcached/prependbykey.xml
+++ b/reference/memcached/memcached/prependbykey.xml
@@ -65,7 +65,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
+   Returns &null; and raises an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> when
    compression is enabled.
   </para>
  </refsect1>
diff --git a/reference/memcached/memcachedexception.xml b/reference/memcached/memcachedexception.xml
index 3c10b5007..a2d932ce0 100644
--- a/reference/memcached/memcachedexception.xml
+++ b/reference/memcached/memcachedexception.xml
@@ -32,16 +32,16 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
+      <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/architecture.xml b/reference/mongodb/architecture.xml
index 94972a67a..224f303e0 100644
--- a/reference/mongodb/architecture.xml
+++ b/reference/mongodb/architecture.xml
@@ -280,7 +280,7 @@ foreach ($managers as $manager) {
     <title>Objects</title>
 
      <simpara>
-      If an object is of the <classname>stdClass</classname> class, serialize
+      If an object is of the <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> class, serialize
       as a <emphasis>BSON document</emphasis>.
      </simpara>
 
@@ -313,7 +313,7 @@ foreach ($managers as $manager) {
       If an object is of a class that implements the
       <interfacename>MongoDB\BSON\Serializable</interfacename> interface, call
       <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname> and use
-      the returned array or <classname>stdClass</classname> to serialize as a
+      the returned array or <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> to serialize as a
       BSON document or array. The BSON type will be determined by the following:
      </simpara>
 
@@ -339,14 +339,14 @@ foreach ($managers as $manager) {
        <listitem>
         <simpara>
          If <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
-         returns a non-packed array or <classname>stdClass</classname>,
+         returns a non-packed array or <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>,
          serialize as a BSON document.
         </simpara>
        </listitem>
        <listitem>
         <simpara>
          If <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
-         did not return an array or <classname>stdClass</classname>, throw an
+         did not return an array or <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>, throw an
          <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname>
          exception.
         </simpara>
@@ -637,8 +637,8 @@ class UpperClass implements MongoDB\BSON\Persistable
              should be treated as any other normal property.
             </simpara>
            </footnote>
-           becomes a PHP <classname>stdClass</classname> object, with each
-           BSON document key set as a public <classname>stdClass</classname>
+           becomes a PHP <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> object, with each
+           BSON document key set as a public <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>
            property.
           </simpara>
          </listitem>
@@ -661,9 +661,9 @@ class UpperClass implements MongoDB\BSON\Persistable
           <simpara>
            If the named class does not exist or does not implement the
            <interfacename>MongoDB\BSON\Persistable</interfacename> interface,
-           <classname>stdClass</classname> will be used and each BSON document
+           <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> will be used and each BSON document
            key (including <property>__pclass</property>) will be set as a
-           public <classname>stdClass</classname> property.
+           public <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> property.
           </simpara>
           <simpara>
            The <property>__pclass</property> functionality relies on the
@@ -696,7 +696,7 @@ class UpperClass implements MongoDB\BSON\Persistable
       <listitem>
        <simpara>
         Turns a BSON array or BSON document into a
-        <classname>stdClass</classname> object. There will be no special
+        <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> object. There will be no special
         treatment of a <property>__pclass</property> property <footnoteref linkend="mongodb.pclass"/>, but it may
         be set as a public property in the returned object if it was present
         in the BSON document.
diff --git a/reference/mongodb/bson/binary.xml b/reference/mongodb/bson/binary.xml
index 2649cc642..55daeb950 100644
--- a/reference/mongodb/bson/binary.xml
+++ b/reference/mongodb/bson/binary.xml
@@ -43,11 +43,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -267,7 +267,7 @@
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
         <simpara>
-         Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+         Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
         </simpara>
         <simpara>
          Added <constant>MongoDB\BSON\Binary::TYPE_COLUMN</constant>.
@@ -289,8 +289,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/binary/jsonserialize.xml b/reference/mongodb/bson/binary/jsonserialize.xml
index 8aa93754f..112a84de7 100644
--- a/reference/mongodb/bson/binary/jsonserialize.xml
+++ b/reference/mongodb/bson/binary/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Binary</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/dbpointer.xml b/reference/mongodb/bson/dbpointer.xml
index 0f75b3fdb..133cc3b44 100644
--- a/reference/mongodb/bson/dbpointer.xml
+++ b/reference/mongodb/bson/dbpointer.xml
@@ -39,11 +39,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -70,7 +70,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/dbpointer/jsonserialize.xml b/reference/mongodb/bson/dbpointer/jsonserialize.xml
index 71d996e04..e8d887c38 100644
--- a/reference/mongodb/bson/dbpointer/jsonserialize.xml
+++ b/reference/mongodb/bson/dbpointer/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\DBPointer</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/decimal128.xml b/reference/mongodb/bson/decimal128.xml
index 17d5f2a02..6f8a80740 100644
--- a/reference/mongodb/bson/decimal128.xml
+++ b/reference/mongodb/bson/decimal128.xml
@@ -51,11 +51,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -82,7 +82,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
       <row>
@@ -94,8 +94,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/decimal128/jsonserialize.xml b/reference/mongodb/bson/decimal128/jsonserialize.xml
index a4fc5aecf..92f45330d 100644
--- a/reference/mongodb/bson/decimal128/jsonserialize.xml
+++ b/reference/mongodb/bson/decimal128/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Decimal128</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/document.xml b/reference/mongodb/bson/document.xml
index 20af840bb..773f2efa9 100644
--- a/reference/mongodb/bson/document.xml
+++ b/reference/mongodb/bson/document.xml
@@ -37,11 +37,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>IteratorAggregate</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iteratoraggregate;">IteratorAggregate</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mongodb/bson/document/offsetexists.xml b/reference/mongodb/bson/document/offsetexists.xml
index 2acc06699..ed424d988 100644
--- a/reference/mongodb/bson/document/offsetexists.xml
+++ b/reference/mongodb/bson/document/offsetexists.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetexists" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-document.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\Document::offsetExists</refname>
   <refpurpose>Returns whether a key is present in the document</refpurpose>
@@ -40,7 +40,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><methodname>ArrayAccess::offsetExists</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.arrayaccess.offsetexists;">ArrayAccess::offsetExists</methodname></member>
     <member><methodname>MongoDB\BSON\Document::has</methodname></member>
    </simplelist>
   </para>
diff --git a/reference/mongodb/bson/document/offsetget.xml b/reference/mongodb/bson/document/offsetget.xml
index 8463b5aef..613849c2a 100644
--- a/reference/mongodb/bson/document/offsetget.xml
+++ b/reference/mongodb/bson/document/offsetget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetget" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-document.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\Document::offsetGet</refname>
   <refpurpose>Returns the value of a key in the document</refpurpose>
@@ -56,7 +56,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><methodname>ArrayAccess::offsetGet</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.arrayaccess.offsetget;">ArrayAccess::offsetGet</methodname></member>
     <member><methodname>MongoDB\BSON\Document::get</methodname></member>
    </simplelist>
   </para>
diff --git a/reference/mongodb/bson/document/offsetset.xml b/reference/mongodb/bson/document/offsetset.xml
index 9109ac6b5..c71f8094d 100644
--- a/reference/mongodb/bson/document/offsetset.xml
+++ b/reference/mongodb/bson/document/offsetset.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetset" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-document.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\Document::offsetSet</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
+  <refpurpose>Implementation of <type xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</type></refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
diff --git a/reference/mongodb/bson/document/offsetunset.xml b/reference/mongodb/bson/document/offsetunset.xml
index b175dabf8..5f8f9a357 100644
--- a/reference/mongodb/bson/document/offsetunset.xml
+++ b/reference/mongodb/bson/document/offsetunset.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetunset" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-document.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\Document::offsetUnset</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
+  <refpurpose>Implementation of <type xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</type></refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
diff --git a/reference/mongodb/bson/int64.xml b/reference/mongodb/bson/int64.xml
index 31f81b134..d855e0363 100644
--- a/reference/mongodb/bson/int64.xml
+++ b/reference/mongodb/bson/int64.xml
@@ -55,11 +55,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -93,7 +93,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/int64/jsonserialize.xml b/reference/mongodb/bson/int64/jsonserialize.xml
index b0739436e..a0a17632a 100644
--- a/reference/mongodb/bson/int64/jsonserialize.xml
+++ b/reference/mongodb/bson/int64/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Int64</classname>.
   </simpara>
@@ -51,8 +51,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/iterator.xml b/reference/mongodb/bson/iterator.xml
index 51ba20ade..5e7ceb454 100644
--- a/reference/mongodb/bson/iterator.xml
+++ b/reference/mongodb/bson/iterator.xml
@@ -32,7 +32,7 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mongodb/bson/iterator/current.xml b/reference/mongodb/bson/iterator/current.xml
index 28c3ccf32..c586f54dc 100644
--- a/reference/mongodb/bson/iterator/current.xml
+++ b/reference/mongodb/bson/iterator/current.xml
@@ -45,7 +45,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::current</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.current;">Iterator::current</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/bson/iterator/key.xml b/reference/mongodb/bson/iterator/key.xml
index 902d0f3fb..b34764bc9 100644
--- a/reference/mongodb/bson/iterator/key.xml
+++ b/reference/mongodb/bson/iterator/key.xml
@@ -40,7 +40,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::key</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.key;">Iterator::key</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/bson/iterator/next.xml b/reference/mongodb/bson/iterator/next.xml
index e4e1cea44..e637e5143 100644
--- a/reference/mongodb/bson/iterator/next.xml
+++ b/reference/mongodb/bson/iterator/next.xml
@@ -23,7 +23,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::next</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.next;">Iterator::next</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/bson/iterator/rewind.xml b/reference/mongodb/bson/iterator/rewind.xml
index 3b29ba9ec..f4a823358 100644
--- a/reference/mongodb/bson/iterator/rewind.xml
+++ b/reference/mongodb/bson/iterator/rewind.xml
@@ -23,7 +23,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::rewind</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.rewind;">Iterator::rewind</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/bson/iterator/valid.xml b/reference/mongodb/bson/iterator/valid.xml
index 692699c48..23187a4e2 100644
--- a/reference/mongodb/bson/iterator/valid.xml
+++ b/reference/mongodb/bson/iterator/valid.xml
@@ -30,7 +30,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::valid</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.valid;">Iterator::valid</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/bson/javascript.xml b/reference/mongodb/bson/javascript.xml
index e3f5635e6..f5405dd97 100644
--- a/reference/mongodb/bson/javascript.xml
+++ b/reference/mongodb/bson/javascript.xml
@@ -49,11 +49,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -80,7 +80,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
       <row>
@@ -92,8 +92,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/javascript/jsonserialize.xml b/reference/mongodb/bson/javascript/jsonserialize.xml
index 897fb6fbf..d415387f0 100644
--- a/reference/mongodb/bson/javascript/jsonserialize.xml
+++ b/reference/mongodb/bson/javascript/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Javascript</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/maxkey.xml b/reference/mongodb/bson/maxkey.xml
index c11009032..63e01b58b 100644
--- a/reference/mongodb/bson/maxkey.xml
+++ b/reference/mongodb/bson/maxkey.xml
@@ -46,7 +46,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -79,8 +79,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/maxkey/jsonserialize.xml b/reference/mongodb/bson/maxkey/jsonserialize.xml
index b30e8d095..cda3d983a 100644
--- a/reference/mongodb/bson/maxkey/jsonserialize.xml
+++ b/reference/mongodb/bson/maxkey/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\MaxKey</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/minkey.xml b/reference/mongodb/bson/minkey.xml
index e0b8ec056..1c8439582 100644
--- a/reference/mongodb/bson/minkey.xml
+++ b/reference/mongodb/bson/minkey.xml
@@ -46,7 +46,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -79,8 +79,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/minkey/jsonserialize.xml b/reference/mongodb/bson/minkey/jsonserialize.xml
index 2ed71f5f0..38dbfff9a 100644
--- a/reference/mongodb/bson/minkey/jsonserialize.xml
+++ b/reference/mongodb/bson/minkey/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\MinKey</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/objectid.xml b/reference/mongodb/bson/objectid.xml
index cdc091b9c..d52f7a94a 100644
--- a/reference/mongodb/bson/objectid.xml
+++ b/reference/mongodb/bson/objectid.xml
@@ -62,11 +62,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -93,7 +93,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
       <row>
@@ -111,8 +111,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/objectid/jsonserialize.xml b/reference/mongodb/bson/objectid/jsonserialize.xml
index a1da1e483..b95038321 100644
--- a/reference/mongodb/bson/objectid/jsonserialize.xml
+++ b/reference/mongodb/bson/objectid/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\ObjectId</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/packedarray.xml b/reference/mongodb/bson/packedarray.xml
index 4ec141476..00eb62ab6 100644
--- a/reference/mongodb/bson/packedarray.xml
+++ b/reference/mongodb/bson/packedarray.xml
@@ -37,11 +37,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>IteratorAggregate</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iteratoraggregate;">IteratorAggregate</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mongodb/bson/packedarray/offsetexists.xml b/reference/mongodb/bson/packedarray/offsetexists.xml
index 7f2ff74a8..51cd51b3c 100644
--- a/reference/mongodb/bson/packedarray/offsetexists.xml
+++ b/reference/mongodb/bson/packedarray/offsetexists.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetexists" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-packedarray.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\PackedArray::offsetExists</refname>
   <refpurpose>Returns whether a index is present in the array</refpurpose>
@@ -40,7 +40,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><methodname>ArrayAccess::offsetExists</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.arrayaccess.offsetexists;">ArrayAccess::offsetExists</methodname></member>
     <member><methodname>MongoDB\BSON\PackedArray::has</methodname></member>
    </simplelist>
   </para>
diff --git a/reference/mongodb/bson/packedarray/offsetget.xml b/reference/mongodb/bson/packedarray/offsetget.xml
index 46b38b6fd..d4d84ac30 100644
--- a/reference/mongodb/bson/packedarray/offsetget.xml
+++ b/reference/mongodb/bson/packedarray/offsetget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetget" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-packedarray.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\PackedArray::offsetGet</refname>
   <refpurpose>Returns the value of an index in the array</refpurpose>
@@ -56,7 +56,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><methodname>ArrayAccess::offsetGet</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.arrayaccess.offsetget;">ArrayAccess::offsetGet</methodname></member>
     <member><methodname>MongoDB\BSON\PackedArray::get</methodname></member>
    </simplelist>
   </para>
diff --git a/reference/mongodb/bson/packedarray/offsetset.xml b/reference/mongodb/bson/packedarray/offsetset.xml
index edf95ca9d..c393ccf5d 100644
--- a/reference/mongodb/bson/packedarray/offsetset.xml
+++ b/reference/mongodb/bson/packedarray/offsetset.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetset" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-packedarray.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\PackedArray::offsetSet</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
+  <refpurpose>Implementation of <type xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</type></refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
diff --git a/reference/mongodb/bson/packedarray/offsetunset.xml b/reference/mongodb/bson/packedarray/offsetunset.xml
index 6ecaead40..69aa2893e 100644
--- a/reference/mongodb/bson/packedarray/offsetunset.xml
+++ b/reference/mongodb/bson/packedarray/offsetunset.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetunset" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="mongodb-bson-packedarray.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\BSON\PackedArray::offsetUnset</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
+  <refpurpose>Implementation of <type xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</type></refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
diff --git a/reference/mongodb/bson/persistable/bsonserialize.xml b/reference/mongodb/bson/persistable/bsonserialize.xml
index 1990b5c92..ac15f8063 100644
--- a/reference/mongodb/bson/persistable/bsonserialize.xml
+++ b/reference/mongodb/bson/persistable/bsonserialize.xml
@@ -10,12 +10,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>stdClass</type><type>MongoDB\BSON\Document</type></type><methodname>MongoDB\BSON\Persistable::bsonSerialize</methodname>
+   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><type>MongoDB\BSON\Document</type></type><methodname>MongoDB\BSON\Persistable::bsonSerialize</methodname>
    <void />
   </methodsynopsis>
   <simpara>
    Called during serialization of the object to BSON. The method must return an
-   <type>array</type>, <classname>stdClass</classname>, or
+   <type>array</type>, <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>, or
    <classname>MongoDB\BSON\Document</classname>.
   </simpara>
   <simpara>
@@ -42,7 +42,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   An <type>array</type>, <classname>stdClass</classname>, or <classname>MongoDB\BSON\Document</classname>
+   An <type>array</type>, <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>, or <classname>MongoDB\BSON\Document</classname>
    to be serialized as a BSON document.
   </simpara>
  </refsect1>
@@ -64,7 +64,7 @@
       <entry>
        <simpara>
         This method may now also return <classname>MongoDB\BSON\Document</classname>
-        instances in addition to <type>array</type> and <classname>stdClass</classname>.
+        instances in addition to <type>array</type> and <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>.
        </simpara>
       </entry>
      </row>
diff --git a/reference/mongodb/bson/regex.xml b/reference/mongodb/bson/regex.xml
index aba85a913..04a104427 100644
--- a/reference/mongodb/bson/regex.xml
+++ b/reference/mongodb/bson/regex.xml
@@ -49,11 +49,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -80,7 +80,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
       <row>
@@ -92,8 +92,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/regex/jsonserialize.xml b/reference/mongodb/bson/regex/jsonserialize.xml
index 5ad23a0a6..5c9e31dda 100644
--- a/reference/mongodb/bson/regex/jsonserialize.xml
+++ b/reference/mongodb/bson/regex/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Regex</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/serializable/bsonserialize.xml b/reference/mongodb/bson/serializable/bsonserialize.xml
index bdf8e55d5..25ff0d923 100644
--- a/reference/mongodb/bson/serializable/bsonserialize.xml
+++ b/reference/mongodb/bson/serializable/bsonserialize.xml
@@ -10,12 +10,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>stdClass</type><type>MongoDB\BSON\Document</type><type>MongoDB\BSON\PackedArray</type></type><methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
+   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><type>MongoDB\BSON\Document</type><type>MongoDB\BSON\PackedArray</type></type><methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
    <void />
   </methodsynopsis>
   <simpara>
    Called during serialization of the object to BSON. The method must return an
-   <type>array</type>, <classname>stdClass</classname>, <classname>MongoDB\BSON\Document</classname>,
+   <type>array</type>, <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>, <classname>MongoDB\BSON\Document</classname>,
    or <classname>MongoDB\BSON\PackedArray</classname>.
   </simpara>
   <simpara>
@@ -23,7 +23,7 @@
    <interfacename>MongoDB\BSON\Serializable</interfacename> passed to
    <methodname>MongoDB\BSON\Document::fromPHP</methodname>) will always be
    serialized as a BSON document. For field values, associative arrays and
-   <classname>stdClass</classname> instances will be serialized as a BSON
+   <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> instances will be serialized as a BSON
    document and sequential arrays (i.e. sequential, numeric indexes starting at
    <literal>0</literal>) will be serialized as a BSON array.
   </simpara>
@@ -45,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   An <type>array</type>, <classname>stdClass</classname>, <classname>MongoDB\BSON\Document</classname>,
+   An <type>array</type>, <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>, <classname>MongoDB\BSON\Document</classname>,
    or <classname>MongoDB\BSON\PackedArray</classname> to be serialized as a BSON
    array or document.
   </simpara>
@@ -68,7 +68,7 @@
       <entry>
        <simpara>
         The return type was changed from <type class="union"><type>array</type><type>object</type></type>.
-        Instead of <type>object</type>, the return type now specifies <classname>stdClass</classname>.
+        Instead of <type>object</type>, the return type now specifies <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>.
         Classes that implement this interface must be changed to no longer
         declare an <type>object</type> return type. As the return type is
         tentative, a deprecation warning is emitted on PHP 8.1 and newer.
diff --git a/reference/mongodb/bson/symbol.xml b/reference/mongodb/bson/symbol.xml
index 0040c943b..465a3206d 100644
--- a/reference/mongodb/bson/symbol.xml
+++ b/reference/mongodb/bson/symbol.xml
@@ -39,11 +39,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -70,7 +70,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/symbol/jsonserialize.xml b/reference/mongodb/bson/symbol/jsonserialize.xml
index 531156ff7..cfa1e9f8b 100644
--- a/reference/mongodb/bson/symbol/jsonserialize.xml
+++ b/reference/mongodb/bson/symbol/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Symbol</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/timestamp.xml b/reference/mongodb/bson/timestamp.xml
index 3169aa1c3..c7655f3fb 100644
--- a/reference/mongodb/bson/timestamp.xml
+++ b/reference/mongodb/bson/timestamp.xml
@@ -50,11 +50,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -81,7 +81,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
       <row>
@@ -93,8 +93,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/timestamp/jsonserialize.xml b/reference/mongodb/bson/timestamp/jsonserialize.xml
index 536f01d42..354eba7a1 100644
--- a/reference/mongodb/bson/timestamp/jsonserialize.xml
+++ b/reference/mongodb/bson/timestamp/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Timestamp</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/undefined.xml b/reference/mongodb/bson/undefined.xml
index 992676c79..2e73f6519 100644
--- a/reference/mongodb/bson/undefined.xml
+++ b/reference/mongodb/bson/undefined.xml
@@ -39,11 +39,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -70,7 +70,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/undefined/jsonserialize.xml b/reference/mongodb/bson/undefined/jsonserialize.xml
index 1e1fbac25..d83f9fbbf 100644
--- a/reference/mongodb/bson/undefined/jsonserialize.xml
+++ b/reference/mongodb/bson/undefined/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\Undefined</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/utcdatetime.xml b/reference/mongodb/bson/utcdatetime.xml
index 13875ed36..97c66e8cb 100644
--- a/reference/mongodb/bson/utcdatetime.xml
+++ b/reference/mongodb/bson/utcdatetime.xml
@@ -43,11 +43,11 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>JsonSerializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -74,7 +74,7 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
       <row>
@@ -86,8 +86,8 @@
       <row>
        <entry>PECL mongodb 1.2.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> and
+        <interfacename xlink:href="&url.php.manual.class.jsonserializable;">JsonSerializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/bson/utcdatetime/construct.xml b/reference/mongodb/bson/utcdatetime/construct.xml
index 5c4473ce2..13426421b 100644
--- a/reference/mongodb/bson/utcdatetime/construct.xml
+++ b/reference/mongodb/bson/utcdatetime/construct.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\UTCDateTime::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>int</type><type>MongoDB\BSON\Int64</type><type>DateTimeInterface</type><type>null</type></type><parameter>milliseconds</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>MongoDB\BSON\Int64</type><type xlink:href="&url.php.manual.class.datetimeinterface;">DateTimeInterface</type><type>null</type></type><parameter>milliseconds</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
  </refsect1>
 
@@ -19,7 +19,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>milliseconds</parameter> (<type class="union"><type>int</type><type>MongoDB\BSON\Int64</type><type>DateTimeInterface</type><type>null</type></type>)</term>
+    <term><parameter>milliseconds</parameter> (<type class="union"><type>int</type><type>MongoDB\BSON\Int64</type><type xlink:href="&url.php.manual.class.datetimeinterface;">DateTimeInterface</type><type>null</type></type>)</term>
     <listitem>
      <simpara>
       Number of milliseconds since the Unix epoch (Jan 1, 1970). Negative values
@@ -28,7 +28,7 @@
       may also be provided as a <classname>MongoDB\BSON\Int64</classname>.
      </simpara>
      <simpara>
-      If the argument is a <classname>DateTimeInterface</classname>, the number
+      If the argument is a <classname xlink:href="&url.php.manual.class.datetimeinterface;">DateTimeInterface</classname>, the number
       of milliseconds since the Unix epoch will be derived from that value.
      </simpara>
      <simpara>
@@ -83,7 +83,7 @@
        <simpara>
         The <parameter>milliseconds</parameter> argument is optional and
         defaults to &null; (i.e. current time). The argument also accepts a
-        <classname>DateTimeInterface</classname>, which may be used to derive
+        <classname xlink:href="&url.php.manual.class.datetimeinterface;">DateTimeInterface</classname>, which may be used to derive
         the number of milliseconds since the Unix epoch. Previously, only
         <type>int</type>, <type>float</type>, and <type>string</type> types
         were accepted.
diff --git a/reference/mongodb/bson/utcdatetime/jsonserialize.xml b/reference/mongodb/bson/utcdatetime/jsonserialize.xml
index 872a4bf46..15b6e7f60 100644
--- a/reference/mongodb/bson/utcdatetime/jsonserialize.xml
+++ b/reference/mongodb/bson/utcdatetime/jsonserialize.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
+   Returns data which can be serialized by <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> to
    produce an extended JSON representation of the
    <classname>MongoDB\BSON\UTCDateTime</classname>.
   </simpara>
@@ -40,8 +40,8 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
+   <member><methodname xlink:href="&url.php.manual.jsonserializable.jsonserialize;">JsonSerializable::jsonSerialize</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
    <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
    <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
diff --git a/reference/mongodb/bson/utcdatetime/todatetime.xml b/reference/mongodb/bson/utcdatetime/todatetime.xml
index 5327be347..9411eeafd 100644
--- a/reference/mongodb/bson/utcdatetime/todatetime.xml
+++ b/reference/mongodb/bson/utcdatetime/todatetime.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>DateTime</type><methodname>MongoDB\BSON\UTCDateTime::toDateTime</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.datetime;">DateTime</type><methodname>MongoDB\BSON\UTCDateTime::toDateTime</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
@@ -23,8 +23,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the <classname>DateTime</classname> representation of this
-   UTCDateTime. The returned <classname>DateTime</classname> will use the UTC
+   Returns the <classname xlink:href="&url.php.manual.class.datetime;">DateTime</classname> representation of this
+   UTCDateTime. The returned <classname xlink:href="&url.php.manual.class.datetime;">DateTime</classname> will use the UTC
    time zone.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/bson/utcdatetime/todatetimeimmutable.xml b/reference/mongodb/bson/utcdatetime/todatetimeimmutable.xml
index 493c4ab19..aee22c92e 100644
--- a/reference/mongodb/bson/utcdatetime/todatetimeimmutable.xml
+++ b/reference/mongodb/bson/utcdatetime/todatetimeimmutable.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>DateTimeImmutable</type><methodname>MongoDB\BSON\UTCDateTime::toDateTimeImmutable</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.datetimeimmutable;">DateTimeImmutable</type><methodname>MongoDB\BSON\UTCDateTime::toDateTimeImmutable</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
@@ -23,8 +23,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the <classname>DateTimeImmutable</classname> representation of this
-   UTCDateTime. The returned <classname>DateTimeImmutable</classname> will use the UTC
+   Returns the <classname xlink:href="&url.php.manual.class.datetimeimmutable;">DateTimeImmutable</classname> representation of this
+   UTCDateTime. The returned <classname xlink:href="&url.php.manual.class.datetimeimmutable;">DateTimeImmutable</classname> will use the UTC
    time zone.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/bson/utcdatetimeinterface/todatetime.xml b/reference/mongodb/bson/utcdatetimeinterface/todatetime.xml
index d1570087b..bd86f7eb5 100644
--- a/reference/mongodb/bson/utcdatetimeinterface/todatetime.xml
+++ b/reference/mongodb/bson/utcdatetimeinterface/todatetime.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>DateTime</type><methodname>MongoDB\BSON\UTCDateTimeInterface::toDateTime</methodname>
+   <modifier>abstract</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.datetime;">DateTime</type><methodname>MongoDB\BSON\UTCDateTimeInterface::toDateTime</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
@@ -23,8 +23,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the <classname>DateTime</classname> representation of this
-   UTCDateTimeInterface. The returned <classname>DateTime</classname> should use
+   Returns the <classname xlink:href="&url.php.manual.class.datetime;">DateTime</classname> representation of this
+   UTCDateTimeInterface. The returned <classname xlink:href="&url.php.manual.class.datetime;">DateTime</classname> should use
    the UTC time zone.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/bson/utcdatetimeinterface/todatetimeimmutable.xml b/reference/mongodb/bson/utcdatetimeinterface/todatetimeimmutable.xml
index 6e0beec3a..892fe1d84 100644
--- a/reference/mongodb/bson/utcdatetimeinterface/todatetimeimmutable.xml
+++ b/reference/mongodb/bson/utcdatetimeinterface/todatetimeimmutable.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>DateTimeImmutable</type><methodname>MongoDB\BSON\UTCDateTimeInterface::toDateTimeImmutable</methodname>
+   <modifier>abstract</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.datetimeimmutable;">DateTimeImmutable</type><methodname>MongoDB\BSON\UTCDateTimeInterface::toDateTimeImmutable</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
@@ -23,8 +23,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the <classname>DateTimeImmutable</classname> representation of this
-   UTCDateTimeInterface. The returned <classname>DateTimeImmutable</classname> will use the UTC
+   Returns the <classname xlink:href="&url.php.manual.class.datetimeimmutable;">DateTimeImmutable</classname> representation of this
+   UTCDateTimeInterface. The returned <classname xlink:href="&url.php.manual.class.datetimeimmutable;">DateTimeImmutable</classname> will use the UTC
    time zone.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/configure.xml b/reference/mongodb/configure.xml
index 65a7edfa5..0ae05f413 100644
--- a/reference/mongodb/configure.xml
+++ b/reference/mongodb/configure.xml
@@ -175,16 +175,16 @@ PHP Warning:  PHP Startup: Unable to load dynamic library 'mongodb'
    Ensure that the downloaded DLL corresponds to the following PHP runtime
    properties:
    <simplelist>
-    <member>PHP version (<constant>PHP_VERSION</constant>)</member>
-    <member>Thread safety (<constant>PHP_ZTS</constant>)</member>
-    <member>Architecture (<constant>PHP_INT_SIZE</constant>)</member>
+    <member>PHP version (<constant xlink:href="&url.php.manual.constant.php-version;">PHP_VERSION</constant>)</member>
+    <member>Thread safety (<constant xlink:href="&url.php.manual.constant.php-zts;">PHP_ZTS</constant>)</member>
+    <member>Architecture (<constant xlink:href="&url.php.manual.constant.php-int-size;">PHP_INT_SIZE</constant>)</member>
    </simplelist>
   </para>
 
   <simpara>
    In addition to the aforementioned constants, these properties can also be
-   inferred from <function>phpinfo</function>. If a system has multiple PHP
-   runtimes installed, double-check that the <function>phpinfo</function> output
+   inferred from <function xlink:href="&url.php.manual.function.phpinfo;">phpinfo</function>. If a system has multiple PHP
+   runtimes installed, double-check that the <function xlink:href="&url.php.manual.function.phpinfo;">phpinfo</function> output
    is for the correct environment.
   </simpara>
 
diff --git a/reference/mongodb/entities.mongodb.ent b/reference/mongodb/entities.mongodb.ent
index bc461b02d..70e0a11dc 100644
--- a/reference/mongodb/entities.mongodb.ent
+++ b/reference/mongodb/entities.mongodb.ent
@@ -44,7 +44,7 @@ See doc-base/scripts/text-entities.php for details.
         <entry>
          <simpara>
           This class no longer implements the
-          <interfacename>Serializable</interfacename> interface.
+          <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename> interface.
          </simpara>
         </entry>
        </row>
@@ -783,7 +783,7 @@ local: {
    <simpara>
     Because PHP&apos;s integer type is signed, some values returned by this
     method may appear as negative integers on 32-bit platforms. The
-    <literal>"&#37;u"</literal> formatter of <function>sprintf</function> may be
+    <literal>"&#37;u"</literal> formatter of <function xlink:href="&url.php.manual.function.sprintf;">sprintf</function> may be
     used to obtain a string representation of the unsigned decimal value.
    </simpara>
   </note>
diff --git a/reference/mongodb/exceptions.xml b/reference/mongodb/exceptions.xml
index d423662c9..e5c451fbd 100644
--- a/reference/mongodb/exceptions.xml
+++ b/reference/mongodb/exceptions.xml
@@ -34,11 +34,11 @@
    </simpara>
 
    <itemizedlist>
-    <listitem><simpara><classname>MongoDB\Driver\Exception\LogicException</classname> (extends <classname>LogicException</classname>)</simpara></listitem>
-    <listitem><simpara><classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> (extends <classname>InvalidArgumentException</classname>)</simpara></listitem>
-    <listitem><simpara><classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> (extends <classname>UnexpectedValueException</classname>)</simpara></listitem>
+    <listitem><simpara><classname>MongoDB\Driver\Exception\LogicException</classname> (extends <classname xlink:href="&url.php.manual.class.logicexception;">LogicException</classname>)</simpara></listitem>
+    <listitem><simpara><classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> (extends <classname xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</classname>)</simpara></listitem>
+    <listitem><simpara><classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> (extends <classname xlink:href="&url.php.manual.class.unexpectedvalueexception;">UnexpectedValueException</classname>)</simpara></listitem>
     <listitem>
-     <simpara><classname>MongoDB\Driver\Exception\RuntimeException</classname> (extends <classname>RuntimeException</classname>)</simpara>
+     <simpara><classname>MongoDB\Driver\Exception\RuntimeException</classname> (extends <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>)</simpara>
      <itemizedlist>
       <listitem>
        <simpara><classname>MongoDB\Driver\Exception\ConnectionException</classname></simpara>
diff --git a/reference/mongodb/functions/bson/fromphp.xml b/reference/mongodb/functions/bson/fromphp.xml
index d7d45261b..b789bd741 100644
--- a/reference/mongodb/functions/bson/fromphp.xml
+++ b/reference/mongodb/functions/bson/fromphp.xml
@@ -61,7 +61,7 @@
     not limited to, encountering an unexpected
     <interfacename>MongoDB\BSON\Type</interfacename> instance or
     <function>MongoDB\BSON\Serializable::bsonSerialize</function> failing to
-    return an <type>array</type> or <classname>stdClass</classname>.
+    return an <type>array</type> or <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>.
    </member>
   </simplelist>
  </refsect1>
diff --git a/reference/mongodb/functions/bson/tojson.xml b/reference/mongodb/functions/bson/tojson.xml
index d504c61cf..78cddd499 100644
--- a/reference/mongodb/functions/bson/tojson.xml
+++ b/reference/mongodb/functions/bson/tojson.xml
@@ -45,8 +45,8 @@
   <warning>
    <simpara>
     <link xlink:href="&url.json;">JSON</link> does not support
-    <link xlink:href="&url.php.manual.language.types.float.nan;"><constant>NAN</constant></link> and
-    <link xlink:href="&url.php.manual.function.is-infinite;"><constant>INF</constant></link> and
+    <link xlink:href="&url.php.manual.language.types.float.nan;"><constant xlink:href="&url.php.manual.constant.nan;">NAN</constant></link> and
+    <link xlink:href="&url.php.manual.function.is-infinite;"><constant xlink:href="&url.php.manual.constant.inf;">INF</constant></link> and
     MongoDB&apos;s Legacy Extended JSON format does not define an alternative
     representation for these values
     (<link xlink:href="&url.mongodb.libbson;">libbson</link> will output
diff --git a/reference/mongodb/ini.xml b/reference/mongodb/ini.xml
index ea8fdf8dc..8e8dc74c6 100644
--- a/reference/mongodb/ini.xml
+++ b/reference/mongodb/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="mongodb.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="mongodb.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,7 +20,7 @@
      <row>
       <entry><link linkend="ini.mongodb.debug">mongodb.debug</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry></entry>
      </row>
     </tbody>
@@ -55,7 +55,7 @@
        Specify <literal>"1"</literal>, <literal>"on"</literal>,
        <literal>"yes"</literal>, or <literal>"true"</literal> to log to a new
        temporary file within the default system temp directory (i.e.
-       <function>sys_get_temp_dir</function>).
+       <function xlink:href="&url.php.manual.function.sys-get-temp-dir;">sys_get_temp_dir</function>).
       </simpara>
       <simpara>
        Specify any other string to log to a new temporary file within that
diff --git a/reference/mongodb/mongodb/driver/bulkwrite.xml b/reference/mongodb/mongodb/driver/bulkwrite.xml
index 81e2df95c..092d1da6e 100644
--- a/reference/mongodb/mongodb/driver/bulkwrite.xml
+++ b/reference/mongodb/mongodb/driver/bulkwrite.xml
@@ -44,7 +44,7 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/bulkwritecommand.xml b/reference/mongodb/mongodb/driver/bulkwritecommand.xml
index ab837a85a..d13dc426f 100644
--- a/reference/mongodb/mongodb/driver/bulkwritecommand.xml
+++ b/reference/mongodb/mongodb/driver/bulkwritecommand.xml
@@ -51,7 +51,7 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/cursor.xml b/reference/mongodb/mongodb/driver/cursor.xml
index 96ee97180..eaf57f2f7 100644
--- a/reference/mongodb/mongodb/driver/cursor.xml
+++ b/reference/mongodb/mongodb/driver/cursor.xml
@@ -61,14 +61,14 @@
       <row>
        <entry>PECL mongodb 1.9.0</entry>
        <entry>
-        Implements <interfacename>Iterator</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>.
        </entry>
       </row>
       <row>
        <entry>PECL mongodb 1.6.0</entry>
        <entry>
         Implements <interfacename>MongoDB\Driver\CursorInterface</interfacename>,
-        which extends <interfacename>Traversable</interfacename>.
+        which extends <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>.
        </entry>
       </row>
      </tbody>
@@ -90,7 +90,7 @@
     </simpara>
     <simpara>
      Because <classname>MongoDB\Driver\Cursor</classname> implements the
-     <interfacename>Traversable</interfacename> interface, you can simply
+     <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename> interface, you can simply
      iterate over the result set with
      <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link>.
     </simpara>
@@ -173,7 +173,7 @@ stdClass Object
     </simpara>
     <simpara>
      In order to continuously read from a tailable cursor, the Cursor object
-     must be wrapped with an <classname>IteratorIterator</classname>. This
+     must be wrapped with an <classname xlink:href="&url.php.manual.class.iteratoriterator;">IteratorIterator</classname>. This
      allows the application to directly control the cursor's iteration, avoid
      inadvertently rewinding the cursor, and decide when to wait for new results
      or stop iteration entirely.
diff --git a/reference/mongodb/mongodb/driver/cursor/current.xml b/reference/mongodb/mongodb/driver/cursor/current.xml
index 679246923..6370cb809 100644
--- a/reference/mongodb/mongodb/driver/cursor/current.xml
+++ b/reference/mongodb/mongodb/driver/cursor/current.xml
@@ -32,7 +32,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::current</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.current;">Iterator::current</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/mongodb/driver/cursor/key.xml b/reference/mongodb/mongodb/driver/cursor/key.xml
index 53672b72a..beafb4e55 100644
--- a/reference/mongodb/mongodb/driver/cursor/key.xml
+++ b/reference/mongodb/mongodb/driver/cursor/key.xml
@@ -30,7 +30,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::key</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.key;">Iterator::key</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/mongodb/driver/cursor/next.xml b/reference/mongodb/mongodb/driver/cursor/next.xml
index 2f66d3a32..81bccedde 100644
--- a/reference/mongodb/mongodb/driver/cursor/next.xml
+++ b/reference/mongodb/mongodb/driver/cursor/next.xml
@@ -37,7 +37,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::next</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.next;">Iterator::next</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/mongodb/driver/cursor/rewind.xml b/reference/mongodb/mongodb/driver/cursor/rewind.xml
index 548d1ec8e..026fa0194 100644
--- a/reference/mongodb/mongodb/driver/cursor/rewind.xml
+++ b/reference/mongodb/mongodb/driver/cursor/rewind.xml
@@ -42,7 +42,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::rewind</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.rewind;">Iterator::rewind</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/mongodb/driver/cursor/valid.xml b/reference/mongodb/mongodb/driver/cursor/valid.xml
index 253fc9a56..f2750e38d 100644
--- a/reference/mongodb/mongodb/driver/cursor/valid.xml
+++ b/reference/mongodb/mongodb/driver/cursor/valid.xml
@@ -30,7 +30,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>Iterator::valid</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.iterator.valid;">Iterator::valid</methodname></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mongodb/mongodb/driver/cursorid.xml b/reference/mongodb/mongodb/driver/cursorid.xml
index 6285ae7c2..811648537 100644
--- a/reference/mongodb/mongodb/driver/cursorid.xml
+++ b/reference/mongodb/mongodb/driver/cursorid.xml
@@ -42,11 +42,11 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Stringable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -79,13 +79,13 @@
       <row>
        <entry>PECL mongodb 1.12.0</entry>
        <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
+        Implements <interfacename xlink:href="&url.php.manual.class.stringable;">Stringable</interfacename> for PHP 8.0+.
        </entry>
       </row>
       <row>
        <entry>PECL mongodb 1.7.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongodb/mongodb/driver/cursorinterface.xml b/reference/mongodb/mongodb/driver/cursorinterface.xml
index 84f368913..5d8268e29 100644
--- a/reference/mongodb/mongodb/driver/cursorinterface.xml
+++ b/reference/mongodb/mongodb/driver/cursorinterface.xml
@@ -33,7 +33,7 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -60,7 +60,7 @@
        <entry>PECL mongodb 2.0.0</entry>
        <entry>
         <simpara>
-         This interface now extends <interfacename>Iterator</interfacename>.
+         This interface now extends <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>.
         </simpara>
         <simpara>
          Return types previously declared as tentative are now enforced.
diff --git a/reference/mongodb/mongodb/driver/exception/authenticationexception.xml b/reference/mongodb/mongodb/driver/exception/authenticationexception.xml
index 879dd85b0..44705adc2 100644
--- a/reference/mongodb/mongodb/driver/exception/authenticationexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/authenticationexception.xml
@@ -41,16 +41,12 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-connectionexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception.xml b/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception.xml
index cc34384f2..e262137c5 100644
--- a/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception.xml
@@ -66,19 +66,15 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-bulkwritecommandexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml b/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml
index c6b8f08ca..2f8e80b2b 100644
--- a/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml
@@ -49,19 +49,15 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" />-->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-bulkwriteexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />-->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/commandexception.xml b/reference/mongodb/mongodb/driver/exception/commandexception.xml
index f817719aa..c3396fe4e 100644
--- a/reference/mongodb/mongodb/driver/exception/commandexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/commandexception.xml
@@ -49,19 +49,15 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-commandexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/connectionexception.xml b/reference/mongodb/mongodb/driver/exception/connectionexception.xml
index eebc83cc6..140544647 100644
--- a/reference/mongodb/mongodb/driver/exception/connectionexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/connectionexception.xml
@@ -43,13 +43,11 @@
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml b/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml
index d3ee0ab22..dccea581b 100644
--- a/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml
@@ -46,16 +46,12 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-connectionexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/encryptionexception.xml b/reference/mongodb/mongodb/driver/exception/encryptionexception.xml
index b64ed7224..ab97daf49 100644
--- a/reference/mongodb/mongodb/driver/exception/encryptionexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/encryptionexception.xml
@@ -42,13 +42,11 @@
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml b/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml
index 37539dc8b..ff6b22682 100644
--- a/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml
@@ -44,16 +44,12 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/invalidargumentexception.xml b/reference/mongodb/mongodb/driver/exception/invalidargumentexception.xml
index ac0c7e16d..aab137f00 100644
--- a/reference/mongodb/mongodb/driver/exception/invalidargumentexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/invalidargumentexception.xml
@@ -33,7 +33,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>InvalidArgumentException</classname>
+      <classname xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</classname>
      </ooclass>
 
      <oointerface>
@@ -42,12 +42,10 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('invalidargumentexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.invalidargumentexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/logicexception.xml b/reference/mongodb/mongodb/driver/exception/logicexception.xml
index b16ad2886..ca504b1ba 100644
--- a/reference/mongodb/mongodb/driver/exception/logicexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/logicexception.xml
@@ -32,7 +32,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>LogicException</classname>
+      <classname xlink:href="&url.php.manual.class.logicexception;">LogicException</classname>
      </ooclass>
 
      <oointerface>
@@ -41,12 +41,10 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('logicexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.logicexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/runtimeexception.xml b/reference/mongodb/mongodb/driver/exception/runtimeexception.xml
index b14ad24ef..31f06a9cc 100644
--- a/reference/mongodb/mongodb/driver/exception/runtimeexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/runtimeexception.xml
@@ -33,7 +33,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
+      <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
      </ooclass>
 
      <oointerface>
@@ -49,15 +49,13 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/serverexception.xml b/reference/mongodb/mongodb/driver/exception/serverexception.xml
index ed13e9e0e..a44655966 100644
--- a/reference/mongodb/mongodb/driver/exception/serverexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/serverexception.xml
@@ -42,13 +42,11 @@
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml b/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml
index 3c275913d..dda20940d 100644
--- a/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml
@@ -51,16 +51,12 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-connectionexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/unexpectedvalueexception.xml b/reference/mongodb/mongodb/driver/exception/unexpectedvalueexception.xml
index 3ea6b2372..fc0644acb 100644
--- a/reference/mongodb/mongodb/driver/exception/unexpectedvalueexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/unexpectedvalueexception.xml
@@ -33,7 +33,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>UnexpectedValueException</classname>
+      <classname xlink:href="&url.php.manual.class.unexpectedvalueexception;">UnexpectedValueException</classname>
      </ooclass>
 
      <oointerface>
@@ -42,12 +42,10 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('unexpectedvalueexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.unexpectedvalueexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/exception/writeexception.xml b/reference/mongodb/mongodb/driver/exception/writeexception.xml
index b8b0b4345..470d4e097 100644
--- a/reference/mongodb/mongodb/driver/exception/writeexception.xml
+++ b/reference/mongodb/mongodb/driver/exception/writeexception.xml
@@ -59,19 +59,15 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-writeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/manager.xml b/reference/mongodb/mongodb/driver/manager.xml
index 41c4102e1..a97b63a96 100644
--- a/reference/mongodb/mongodb/driver/manager.xml
+++ b/reference/mongodb/mongodb/driver/manager.xml
@@ -58,7 +58,7 @@
    <example>
     <title><function>MongoDB\Driver\Manager::__construct</function> basic example</title>
     <simpara>
-     <function>var_dump</function>ing a
+     <function xlink:href="&url.php.manual.function.var-dump;">var_dump</function>ing a
      <classname>MongoDB\Driver\Manager</classname> will print out various
      details about the manager that are otherwise not normally exposed.
      This can be useful to debug how the driver views your MongoDB setup, and
diff --git a/reference/mongodb/mongodb/driver/manager/construct.xml b/reference/mongodb/mongodb/driver/manager/construct.xml
index 7779dbb22..0f151101b 100644
--- a/reference/mongodb/mongodb/driver/manager/construct.xml
+++ b/reference/mongodb/mongodb/driver/manager/construct.xml
@@ -66,7 +66,7 @@ mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][
       characters such as <literal>@</literal>, <literal>:</literal>, or
       <literal>%</literal>. When connecting via a Unix domain socket, the socket
       path may contain special characters such as slashes and must be encoded.
-      The <function>rawurlencode</function> function may be used to encode
+      The <function xlink:href="&url.php.manual.function.rawurlencode;">rawurlencode</function> function may be used to encode
       constituent parts of the URI.
      </simpara>
      <simpara>
@@ -1190,7 +1190,7 @@ $manager = new MongoDB\Driver\Manager("mongodb://example.com:27017");
    <simpara>
     Connecting to standalone MongoDB node via a Unix domain socket. The socket
     path may include special characters such as slashes and should be encoded
-    with <function>rawurlencode</function>.
+    with <function xlink:href="&url.php.manual.function.rawurlencode;">rawurlencode</function>.
    </simpara>
    <programlisting role="php">
 <![CDATA[
@@ -1238,7 +1238,7 @@ $manager = new MongoDB\Driver\Manager("mongodb://myusername:mypassword@example.c
     characters (e.g. <literal>@</literal>, <literal>:</literal>,
     <literal>%</literal>). In the following example, the password string
     <literal>myp@ss:w%rd</literal> has been manually escaped; however,
-    <function>rawurlencode</function> may also be used to escape URI components
+    <function xlink:href="&url.php.manual.function.rawurlencode;">rawurlencode</function> may also be used to escape URI components
     that may contain special characters.
    </simpara>
    <programlisting role="php">
diff --git a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent.xml
index 1e3326b44..0df598041 100644
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent.xml
@@ -68,7 +68,7 @@
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>readonly</modifier>
-     <type>Exception</type>
+     <type xlink:href="&url.php.manual.class.exception;">Exception</type>
      <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.error">error</varname>
     </fieldsynopsis>
     <fieldsynopsis>
diff --git a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
index 8560a208a..dc1942ea9 100644
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>Exception</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getError</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.exception;">Exception</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getError</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the <classname>Exception</classname> associated with the failed command.
+   Returns the <classname xlink:href="&url.php.manual.class.exception;">Exception</classname> associated with the failed command.
   </simpara>
  </refsect1>
 
diff --git a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getreply.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getreply.xml
index feef33fc8..7a9404a81 100644
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getreply.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getreply.xml
@@ -16,7 +16,7 @@
   <simpara>
    The reply document will be converted from BSON to PHP using the default
    <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
+   rules (e.g. BSON documents will be converted to <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type>).
   </simpara>
  </refsect1>
 
@@ -28,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the command reply document as a <classname>stdClass</classname>
+   Returns the command reply document as a <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>
    object.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommand.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommand.xml
index 256ce6d88..2e2a1479b 100644
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommand.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommand.xml
@@ -16,7 +16,7 @@
   <simpara>
    The reply document will be converted from BSON to PHP using the default
    <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
+   rules (e.g. BSON documents will be converted to <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type>).
   </simpara>
  </refsect1>
 
@@ -28,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the command document as a <classname>stdClass</classname> object.
+   Returns the command document as a <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> object.
   </simpara>
  </refsect1>
 
diff --git a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getreply.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getreply.xml
index 471ade691..821bd3cdf 100644
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getreply.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getreply.xml
@@ -16,7 +16,7 @@
   <simpara>
    The reply document will be converted from BSON to PHP using the default
    <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
+   rules (e.g. BSON documents will be converted to <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type>).
   </simpara>
  </refsect1>
 
@@ -28,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the command reply document as a <classname>stdClass</classname>
+   Returns the command reply document as a <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>
    object.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent.xml
index 26c41fdc9..502e4e492 100644
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent.xml
@@ -65,7 +65,7 @@
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>readonly</modifier>
-     <type>Exception</type>
+     <type xlink:href="&url.php.manual.class.exception;">Exception</type>
      <varname linkend="mongodb-driver-monitoring-serverheartbeatfailedevent.props.error">error</varname>
     </fieldsynopsis>
 
diff --git a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
index c32abbb6c..cd4706e36 100644
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>Exception</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getError</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.exception;">Exception</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getError</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the <classname>Exception</classname> associated with the failed
+   Returns the <classname xlink:href="&url.php.manual.class.exception;">Exception</classname> associated with the failed
    heartbeat.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getreply.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getreply.xml
index ec7a7800a..171b3a509 100644
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getreply.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getreply.xml
@@ -16,7 +16,7 @@
   <simpara>
    The reply document will be converted from BSON to PHP using the default
    <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
+   rules (e.g. BSON documents will be converted to <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type>).
   </simpara>
  </refsect1>
 
@@ -28,7 +28,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the heartbeat reply document as a <classname>stdClass</classname>
+   Returns the heartbeat reply document as a <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>
    object.
   </simpara>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/query/construct.xml b/reference/mongodb/mongodb/driver/query/construct.xml
index c49a9274f..2f3678555 100644
--- a/reference/mongodb/mongodb/driver/query/construct.xml
+++ b/reference/mongodb/mongodb/driver/query/construct.xml
@@ -256,7 +256,7 @@
             PHP class, make sure that you include the
             <property>__pclass</property> field in the projection. This is
             required for the deserialization to work and without it, the
-            extension will return (by default) a <classname>stdClass</classname>
+            extension will return (by default) a <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname>
             object instead.
            </simpara>
           </entry>
diff --git a/reference/mongodb/mongodb/driver/readconcern.xml b/reference/mongodb/mongodb/driver/readconcern.xml
index 141dc1f79..29e8123a1 100644
--- a/reference/mongodb/mongodb/driver/readconcern.xml
+++ b/reference/mongodb/mongodb/driver/readconcern.xml
@@ -38,7 +38,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -278,7 +278,7 @@
       <row>
        <entry>PECL mongodb 1.7.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>.
        </entry>
       </row>
       <row>
diff --git a/reference/mongodb/mongodb/driver/readconcern/bsonserialize.xml b/reference/mongodb/mongodb/driver/readconcern/bsonserialize.xml
index d19e66c39..90c709fee 100644
--- a/reference/mongodb/mongodb/driver/readconcern/bsonserialize.xml
+++ b/reference/mongodb/mongodb/driver/readconcern/bsonserialize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\ReadConcern::bsonSerialize</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><methodname>MongoDB\Driver\ReadConcern::bsonSerialize</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/readpreference.xml b/reference/mongodb/mongodb/driver/readpreference.xml
index 2f5c6498c..58892544b 100644
--- a/reference/mongodb/mongodb/driver/readpreference.xml
+++ b/reference/mongodb/mongodb/driver/readpreference.xml
@@ -36,7 +36,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -310,7 +310,7 @@
          constants.
         </simpara>
         <simpara>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>.
         </simpara>
        </entry>
       </row>
diff --git a/reference/mongodb/mongodb/driver/readpreference/bsonserialize.xml b/reference/mongodb/mongodb/driver/readpreference/bsonserialize.xml
index ff7d1503c..d88656bb9 100644
--- a/reference/mongodb/mongodb/driver/readpreference/bsonserialize.xml
+++ b/reference/mongodb/mongodb/driver/readpreference/bsonserialize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\ReadPreference::bsonSerialize</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><methodname>MongoDB\Driver\ReadPreference::bsonSerialize</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/serverapi.xml b/reference/mongodb/mongodb/driver/serverapi.xml
index 912cba728..688280ed5 100644
--- a/reference/mongodb/mongodb/driver/serverapi.xml
+++ b/reference/mongodb/mongodb/driver/serverapi.xml
@@ -35,7 +35,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml b/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
index 510e7d7dc..050685641 100644
--- a/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
+++ b/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\ServerApi::bsonSerialize</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><methodname>MongoDB\Driver\ServerApi::bsonSerialize</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/writeconcern.xml b/reference/mongodb/mongodb/driver/writeconcern.xml
index c1769066b..3cdc3c1dd 100644
--- a/reference/mongodb/mongodb/driver/writeconcern.xml
+++ b/reference/mongodb/mongodb/driver/writeconcern.xml
@@ -40,7 +40,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -155,7 +155,7 @@
       <row>
        <entry>PECL mongodb 1.7.0</entry>
        <entry>
-        Implements <interfacename>Serializable</interfacename>.
+        Implements <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>.
        </entry>
       </row>
       <row>
diff --git a/reference/mongodb/mongodb/driver/writeconcern/bsonserialize.xml b/reference/mongodb/mongodb/driver/writeconcern/bsonserialize.xml
index 583db2322..672e92cf8 100644
--- a/reference/mongodb/mongodb/driver/writeconcern/bsonserialize.xml
+++ b/reference/mongodb/mongodb/driver/writeconcern/bsonserialize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\WriteConcern::bsonSerialize</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type xlink:href="&url.php.manual.class.stdclass;">stdClass</type><methodname>MongoDB\Driver\WriteConcern::bsonSerialize</methodname>
    <void />
   </methodsynopsis>
  </refsect1>
diff --git a/reference/mongodb/security.xml b/reference/mongodb/security.xml
index 31455353c..5208caee9 100644
--- a/reference/mongodb/security.xml
+++ b/reference/mongodb/security.xml
@@ -31,7 +31,7 @@
   <simpara>
    This is a fairly easy attack to defend against: make sure $_GET and $_POST
    parameters are the type you expect before you send them to the database.
-   PHP has the <function>filter_var</function> function to assist with this.
+   PHP has the <function xlink:href="&url.php.manual.function.filter-var;">filter_var</function> function to assist with this.
   </simpara>
 
   <simpara>
diff --git a/reference/mongodb/tutorial/library.xml b/reference/mongodb/tutorial/library.xml
index e9246570e..63d1e0a4e 100644
--- a/reference/mongodb/tutorial/library.xml
+++ b/reference/mongodb/tutorial/library.xml
@@ -145,7 +145,7 @@ foreach ($result as $entry) {
    <simpara>
     While it may not be apparent in the examples, BSON documents and arrays are
     unserialized as special classes in the library by default. These classes
-    extend <classname>ArrayObject</classname> for usability and implement the
+    extend <classname xlink:href="&url.php.manual.class.arrayobject;">ArrayObject</classname> for usability and implement the
     extension's <interfacename>MongoDB\BSON\Serializable</interfacename> and
     <interfacename>MongoDB\BSON\Unserializable</interfacename> interfaces to
     ensure that values preserve their type when serialized back into BSON. This
diff --git a/reference/mysql/entities.mysql.ent b/reference/mysql/entities.mysql.ent
index 862b0bcb4..cd5a48b77 100644
--- a/reference/mysql/entities.mysql.ent
+++ b/reference/mysql/entities.mysql.ent
@@ -17,14 +17,14 @@ link identifier is not specified, the last link opened by
 <function>mysql_connect</function> is assumed. If no such link is found, it
 will try to create one as if <function>mysql_connect</function> had been called
 with no arguments. If no connection is found or established, an
-<constant>E_WARNING</constant> level error is generated.</simpara></listitem>
+<constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> level error is generated.</simpara></listitem>
 </varlistentry></entity>
 
 <entity name="mysql.linkid-noreopen.description"><varlistentry><term>
 <parameter>link_identifier</parameter></term><listitem><simpara>The MySQL connection. If the
 link identifier is not specified, the last link opened by
 <function>mysql_connect</function> is assumed. If no connection is found or
-established, an <constant>E_WARNING</constant> level error is
+established, an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> level error is
 generated.</simpara></listitem></varlistentry></entity>
 
 <entity name="mysql.result.description"><varlistentry><term>
@@ -36,7 +36,7 @@ is being evaluated. This result comes from a call to
 <parameter>field_offset</parameter></term><listitem><simpara>The numerical field offset. The
 <parameter>field_offset</parameter> starts at <literal>0</literal>. If
 <parameter>field_offset</parameter> does not exist, an error of level
-<constant>E_WARNING</constant> is also issued.</simpara></listitem></varlistentry></entity>
+<constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is also issued.</simpara></listitem></varlistentry></entity>
 
 <entity name="mysql.alternative.note"><simpara>This extension was deprecated in PHP 5.5.0, and it was removed in PHP 7.0.0.
 Instead, the <link xlink:href="&url.php.manual.book.mysqli;">MySQLi</link> or <link xlink:href="&url.php.manual.ref.pdo-mysql;">PDO_MySQL</link> extension should be used.
diff --git a/reference/mysql/functions/mysql-affected-rows.xml b/reference/mysql/functions/mysql-affected-rows.xml
index 6422d41bf..2ecbda306 100644
--- a/reference/mysql/functions/mysql-affected-rows.xml
+++ b/reference/mysql/functions/mysql-affected-rows.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-affected-rows">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-affected-rows">
  <refnamediv>
   <refname>mysql_affected_rows</refname>
   <refpurpose>Get number of affected rows in previous MySQL operation</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_affected_rows</function></member>
-    <member><methodname>PDOStatement::rowCount</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.rowcount;">PDOStatement::rowCount</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-connect.xml b/reference/mysql/functions/mysql-connect.xml
index 4c6079939..a1938bb38 100644
--- a/reference/mysql/functions/mysql-connect.xml
+++ b/reference/mysql/functions/mysql-connect.xml
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_connect</function></member>
-    <member><methodname>PDO::__construct</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.construct;">PDO::__construct</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-create-db.xml b/reference/mysql/functions/mysql-create-db.xml
index ea11e1fa5..93c57eff4 100644
--- a/reference/mysql/functions/mysql-create-db.xml
+++ b/reference/mysql/functions/mysql-create-db.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-create-db">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-create-db">
  <refnamediv>
   <refname>mysql_create_db</refname>
   <refpurpose>Create a MySQL database</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note.4-3-0;
    <simplelist role="alternatives">
     <member><function>mysqli_query</function></member>
-    <member><methodname>PDO::query</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.query;">PDO::query</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-data-seek.xml b/reference/mysql/functions/mysql-data-seek.xml
index 53933ae00..19db8d039 100644
--- a/reference/mysql/functions/mysql-data-seek.xml
+++ b/reference/mysql/functions/mysql-data-seek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-data-seek">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-data-seek">
  <refnamediv>
   <refname>mysql_data_seek</refname>
   <refpurpose>Move internal result pointer</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_data_seek</function></member>
-    <member><constant>PDO::FETCH_ORI_ABS</constant></member>
+    <member><constant xlink:href="&url.php.manual.pdo.constants.fetch-ori-abs;">PDO::FETCH_ORI_ABS</constant></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -35,7 +35,7 @@
    <parameter>row_number</parameter> should be a value in the range from 0 to
    <function>mysql_num_rows</function> - 1. However if the result set
    is empty (<function>mysql_num_rows</function> == 0), a seek to 0 will
-   fail with an <constant>E_WARNING</constant> and
+   fail with an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> and
    <function>mysql_data_seek</function> will return &false;.
   </simpara>
  </refsect1>
diff --git a/reference/mysql/functions/mysql-db-query.xml b/reference/mysql/functions/mysql-db-query.xml
index da49bacfd..d314a9028 100644
--- a/reference/mysql/functions/mysql-db-query.xml
+++ b/reference/mysql/functions/mysql-db-query.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-db-query">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-db-query">
  <refnamediv>
   <refname>mysql_db_query</refname>
   <refpurpose>Selects a database and executes a query on it</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note.5-3-0;
    <simplelist role="alternatives">
     <member><function>mysqli_select_db</function> then the query</member>
-    <member><methodname>PDO::__construct</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.construct;">PDO::__construct</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-errno.xml b/reference/mysql/functions/mysql-errno.xml
index 2f0eb7f44..de3699242 100644
--- a/reference/mysql/functions/mysql-errno.xml
+++ b/reference/mysql/functions/mysql-errno.xml
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_errno</function></member>
-    <member><methodname>PDO::errorCode</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.errorcode;">PDO::errorCode</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-error.xml b/reference/mysql/functions/mysql-error.xml
index 20babf417..c4478d0c1 100644
--- a/reference/mysql/functions/mysql-error.xml
+++ b/reference/mysql/functions/mysql-error.xml
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_error</function></member>
-    <member><methodname>PDO::errorInfo</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.errorinfo;">PDO::errorInfo</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-escape-string.xml b/reference/mysql/functions/mysql-escape-string.xml
index a28322331..fc481acd5 100644
--- a/reference/mysql/functions/mysql-escape-string.xml
+++ b/reference/mysql/functions/mysql-escape-string.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-escape-string">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-escape-string">
  <refnamediv>
   <refname>mysql_escape_string</refname>
   <refpurpose>Escapes a string for use in a mysql_query</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note.4-3-0;
    <simplelist role="alternatives">
     <member><function>mysqli_escape_string</function></member>
-    <member><methodname>PDO::quote</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.quote;">PDO::quote</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-fetch-array.xml b/reference/mysql/functions/mysql-fetch-array.xml
index 83bfc1fba..de88b9ede 100644
--- a/reference/mysql/functions/mysql-fetch-array.xml
+++ b/reference/mysql/functions/mysql-fetch-array.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-array">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-fetch-array">
  <refnamediv>
   <refname>mysql_fetch_array</refname>
   <refpurpose>Fetch a result row as an associative array, a numeric array, or both</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_array</function></member>
-    <member><methodname>PDOStatement::fetch</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.fetch;">PDOStatement::fetch</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-fetch-assoc.xml b/reference/mysql/functions/mysql-fetch-assoc.xml
index 12e186890..a87e3347e 100644
--- a/reference/mysql/functions/mysql-fetch-assoc.xml
+++ b/reference/mysql/functions/mysql-fetch-assoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-assoc">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-fetch-assoc">
  <refnamediv>
   <refname>mysql_fetch_assoc</refname>
   <refpurpose>Fetch a result row as an associative array</refpurpose>
@@ -12,8 +12,8 @@
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_assoc</function></member>
     <member>
-     <methodname>PDOStatement::fetch</methodname>
-     with <parameter>mode</parameter> as <constant>PDO::FETCH_ASSOC</constant>
+     <methodname xlink:href="&url.php.manual.pdostatement.fetch;">PDOStatement::fetch</methodname>
+     with <parameter>mode</parameter> as <constant xlink:href="&url.php.manual.pdo.constants.fetch-assoc;">PDO::FETCH_ASSOC</constant>
     </member>
    </simplelist>
   </warning>
diff --git a/reference/mysql/functions/mysql-fetch-field.xml b/reference/mysql/functions/mysql-fetch-field.xml
index 2b00cdba2..6cf2d9660 100644
--- a/reference/mysql/functions/mysql-fetch-field.xml
+++ b/reference/mysql/functions/mysql-fetch-field.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-field">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-fetch-field">
  <refnamediv>
   <refname>mysql_fetch_field</refname>
   <refpurpose>Get column information from a result and return as an object</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field</function></member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -170,7 +170,7 @@ mysql_free_result($result);
    <simpara>
     If field or tablenames are aliased in the SQL query the aliased name will
     be returned. The original name can be retrieved for instance by using
-    <methodname>mysqli_result::fetch_field</methodname>.
+    <methodname xlink:href="&url.php.manual.mysqli-result.fetch-field;">mysqli_result::fetch_field</methodname>.
    </simpara>
   </note>
  </refsect1>
diff --git a/reference/mysql/functions/mysql-fetch-lengths.xml b/reference/mysql/functions/mysql-fetch-lengths.xml
index d4bd2b46d..1509eeeff 100644
--- a/reference/mysql/functions/mysql-fetch-lengths.xml
+++ b/reference/mysql/functions/mysql-fetch-lengths.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-lengths">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-fetch-lengths">
  <refnamediv>
   <refname>mysql_fetch_lengths</refname>
   <refpurpose>Get the length of each output in a result</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_lengths</function></member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -94,7 +94,7 @@ Array
   <simplelist>
    <member><function>mysql_field_len</function></member>
    <member><function>mysql_fetch_row</function></member>
-   <member><function>strlen</function></member>
+   <member><function xlink:href="&url.php.manual.function.strlen;">strlen</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mysql/functions/mysql-fetch-object.xml b/reference/mysql/functions/mysql-fetch-object.xml
index d11820713..85361f4e7 100644
--- a/reference/mysql/functions/mysql-fetch-object.xml
+++ b/reference/mysql/functions/mysql-fetch-object.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-object">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-fetch-object">
  <refnamediv>
   <refname>mysql_fetch_object</refname>
   <refpurpose>Fetch a result row as an object</refpurpose>
@@ -12,8 +12,8 @@
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_object</function></member>
     <member>
-     <methodname>PDOStatement::fetch</methodname>
-     with <parameter>mode</parameter> as <constant>PDO::FETCH_OBJ</constant>
+     <methodname xlink:href="&url.php.manual.pdostatement.fetch;">PDOStatement::fetch</methodname>
+     with <parameter>mode</parameter> as <constant xlink:href="&url.php.manual.pdo.constants.fetch-obj;">PDO::FETCH_OBJ</constant>
     </member>
    </simplelist>
   </warning>
@@ -42,7 +42,7 @@
      <listitem>
       <simpara>
        The name of the class to instantiate, set the properties of and return.
-       If not specified, a <classname>stdClass</classname> object is returned.
+       If not specified, a <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> object is returned.
       </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/mysql/functions/mysql-fetch-row.xml b/reference/mysql/functions/mysql-fetch-row.xml
index 3e877a7af..955851427 100644
--- a/reference/mysql/functions/mysql-fetch-row.xml
+++ b/reference/mysql/functions/mysql-fetch-row.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-row">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-fetch-row">
  <refnamediv>
   <refname>mysql_fetch_row</refname>
   <refpurpose>Get a result row as an enumerated array</refpurpose>
@@ -12,8 +12,8 @@
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_row</function></member>
     <member>
-     <methodname>PDOStatement::fetch</methodname>
-     with <parameter>mode</parameter> as <constant>PDO::FETCH_NUM</constant>
+     <methodname xlink:href="&url.php.manual.pdostatement.fetch;">PDOStatement::fetch</methodname>
+     with <parameter>mode</parameter> as <constant xlink:href="&url.php.manual.pdo.constants.fetch-num;">PDO::FETCH_NUM</constant>
     </member>
    </simplelist>
   </warning>
diff --git a/reference/mysql/functions/mysql-field-flags.xml b/reference/mysql/functions/mysql-field-flags.xml
index 372861f95..b897374a5 100644
--- a/reference/mysql/functions/mysql-field-flags.xml
+++ b/reference/mysql/functions/mysql-field-flags.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-flags">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-field-flags">
  <refnamediv>
   <refname>mysql_field_flags</refname>
   <refpurpose>Get the flags associated with the specified field in a result</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [flags]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [flags]</member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname> [flags]</member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -27,7 +27,7 @@
    <function>mysql_field_flags</function> returns the field flags of
    the specified field. The flags are reported as a single word
    per flag separated by a single space, so that you can split the
-   returned value using <function>explode</function>.
+   returned value using <function xlink:href="&url.php.manual.function.explode;">explode</function>.
   </simpara>
  </refsect1>
 
diff --git a/reference/mysql/functions/mysql-field-len.xml b/reference/mysql/functions/mysql-field-len.xml
index 679d9c9dc..565904050 100644
--- a/reference/mysql/functions/mysql-field-len.xml
+++ b/reference/mysql/functions/mysql-field-len.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-len">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-field-len">
  <refnamediv>
   <refname>mysql_field_len</refname>
   <refpurpose>Returns the length of the specified field</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [length]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [len]</member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname> [len]</member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -81,7 +81,7 @@ echo $length;
   &reftitle.seealso;
   <simplelist>
    <member><function>mysql_fetch_lengths</function></member>
-   <member><function>strlen</function></member>
+   <member><function xlink:href="&url.php.manual.function.strlen;">strlen</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mysql/functions/mysql-field-name.xml b/reference/mysql/functions/mysql-field-name.xml
index 9d23f5bca..d1e9d92be 100644
--- a/reference/mysql/functions/mysql-field-name.xml
+++ b/reference/mysql/functions/mysql-field-name.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-name">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-field-name">
  <refnamediv>
   <refname>mysql_field_name</refname>
   <refpurpose>Get the name of the specified field in a result</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [name] or [orgname]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [name]</member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname> [name]</member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-field-seek.xml b/reference/mysql/functions/mysql-field-seek.xml
index c1cb581b4..d9be627a5 100644
--- a/reference/mysql/functions/mysql-field-seek.xml
+++ b/reference/mysql/functions/mysql-field-seek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-seek">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-field-seek">
  <refnamediv>
   <refname>mysql_field_seek</refname>
   <refpurpose>Set result pointer to a specified field offset</refpurpose>
@@ -12,7 +12,7 @@
    <simplelist role="alternatives">
     <member><function>mysqli_field_seek</function></member>
     <member>
-     <methodname>PDOStatement::fetch</methodname> using the
+     <methodname xlink:href="&url.php.manual.pdostatement.fetch;">PDOStatement::fetch</methodname> using the
      <parameter>cursor_orientation</parameter> and
      <parameter>offset</parameter> parameters
     </member>
diff --git a/reference/mysql/functions/mysql-field-table.xml b/reference/mysql/functions/mysql-field-table.xml
index 8c256f2ae..070515b36 100644
--- a/reference/mysql/functions/mysql-field-table.xml
+++ b/reference/mysql/functions/mysql-field-table.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-table">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-field-table">
  <refnamediv>
   <refname>mysql_field_table</refname>
   <refpurpose>Get name of the table the specified field is in</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [table] or [orgtable]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [table]</member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname> [table]</member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-field-type.xml b/reference/mysql/functions/mysql-field-type.xml
index 7578758f0..f15a44d2c 100644
--- a/reference/mysql/functions/mysql-field-type.xml
+++ b/reference/mysql/functions/mysql-field-type.xml
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [type]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [driver:decl_type] or [pdo_type]</member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname> [driver:decl_type] or [pdo_type]</member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-free-result.xml b/reference/mysql/functions/mysql-free-result.xml
index 575915e68..500fbeb25 100644
--- a/reference/mysql/functions/mysql-free-result.xml
+++ b/reference/mysql/functions/mysql-free-result.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-free-result">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-free-result">
  <refnamediv>
   <refname>mysql_free_result</refname>
   <refpurpose>Free result memory</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_free_result</function></member>
-    <member>Assign the value of &null; to the PDO object, or <methodname>PDOStatement::closeCursor</methodname></member>
+    <member>Assign the value of &null; to the PDO object, or <methodname xlink:href="&url.php.manual.pdostatement.closecursor;">PDOStatement::closeCursor</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -94,7 +94,7 @@ echo $row['email'];
   &reftitle.seealso;
   <simplelist>
    <member><function>mysql_query</function></member>
-   <member><function>is_resource</function></member>
+   <member><function xlink:href="&url.php.manual.function.is-resource;">is_resource</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mysql/functions/mysql-get-client-info.xml b/reference/mysql/functions/mysql-get-client-info.xml
index 286d34421..44a0de72e 100644
--- a/reference/mysql/functions/mysql-get-client-info.xml
+++ b/reference/mysql/functions/mysql-get-client-info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-get-client-info">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-get-client-info">
  <refnamediv>
   <refname>mysql_get_client_info</refname>
   <refpurpose>Get MySQL client info</refpurpose>
@@ -12,8 +12,8 @@
    <simplelist role="alternatives">
     <member><function>mysqli_get_client_info</function></member>
     <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_CLIENT_VERSION</constant>
+     <methodname xlink:href="&url.php.manual.pdo.getattribute;">PDO::getAttribute</methodname>
+     with <parameter>attribute</parameter> as <constant xlink:href="&url.php.manual.pdo.constants.attr-client-version;">PDO::ATTR_CLIENT_VERSION</constant>
     </member>
    </simplelist>
   </warning>
diff --git a/reference/mysql/functions/mysql-get-host-info.xml b/reference/mysql/functions/mysql-get-host-info.xml
index 802c0d131..9e34e1629 100644
--- a/reference/mysql/functions/mysql-get-host-info.xml
+++ b/reference/mysql/functions/mysql-get-host-info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-get-host-info">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-get-host-info">
  <refnamediv>
   <refname>mysql_get_host_info</refname>
   <refpurpose>Get MySQL host info</refpurpose>
@@ -12,8 +12,8 @@
    <simplelist role="alternatives">
     <member><function>mysqli_get_host_info</function></member>
     <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_CONNECTION_STATUS</constant>
+     <methodname xlink:href="&url.php.manual.pdo.getattribute;">PDO::getAttribute</methodname>
+     with <parameter>attribute</parameter> as <constant xlink:href="&url.php.manual.pdo.constants.attr-connection-status;">PDO::ATTR_CONNECTION_STATUS</constant>
     </member>
    </simplelist>
   </warning>
diff --git a/reference/mysql/functions/mysql-get-server-info.xml b/reference/mysql/functions/mysql-get-server-info.xml
index 13e34b525..130b2ad2e 100644
--- a/reference/mysql/functions/mysql-get-server-info.xml
+++ b/reference/mysql/functions/mysql-get-server-info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-get-server-info">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-get-server-info">
  <refnamediv>
   <refname>mysql_get_server_info</refname>
   <refpurpose>Get MySQL server info</refpurpose>
@@ -12,8 +12,8 @@
    <simplelist role="alternatives">
     <member><function>mysqli_get_server_info</function></member>
     <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_SERVER_VERSION</constant>
+     <methodname xlink:href="&url.php.manual.pdo.getattribute;">PDO::getAttribute</methodname>
+     with <parameter>attribute</parameter> as <constant xlink:href="&url.php.manual.pdo.constants.attr-server-version;">PDO::ATTR_SERVER_VERSION</constant>
     </member>
    </simplelist>
   </warning>
@@ -74,7 +74,7 @@ MySQL server version: 4.0.1-alpha
    <member><function>mysql_get_client_info</function></member>
    <member><function>mysql_get_host_info</function></member>
    <member><function>mysql_get_proto_info</function></member>
-   <member><function>phpversion</function></member>
+   <member><function xlink:href="&url.php.manual.function.phpversion;">phpversion</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/mysql/functions/mysql-insert-id.xml b/reference/mysql/functions/mysql-insert-id.xml
index d36bdf467..2861fc3d9 100644
--- a/reference/mysql/functions/mysql-insert-id.xml
+++ b/reference/mysql/functions/mysql-insert-id.xml
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_insert_id</function></member>
-    <member><methodname>PDO::lastInsertId</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.lastinsertid;">PDO::lastInsertId</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-num-fields.xml b/reference/mysql/functions/mysql-num-fields.xml
index c525e0d6a..9f0b5bdc5 100644
--- a/reference/mysql/functions/mysql-num-fields.xml
+++ b/reference/mysql/functions/mysql-num-fields.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-num-fields">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-num-fields">
  <refnamediv>
   <refname>mysql_num_fields</refname>
   <refpurpose>Get number of fields in result</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_num_fields</function></member>
-    <member><methodname>PDOStatement::columnCount</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.columncount;">PDOStatement::columnCount</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-num-rows.xml b/reference/mysql/functions/mysql-num-rows.xml
index bc43c5340..f1c03af22 100644
--- a/reference/mysql/functions/mysql-num-rows.xml
+++ b/reference/mysql/functions/mysql-num-rows.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-num-rows">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-num-rows">
  <refnamediv>
   <refname>mysql_num_rows</refname>
   <refpurpose>Get number of rows in result</refpurpose>
@@ -12,7 +12,7 @@
    <simplelist role="alternatives">
     <member><function>mysqli_num_rows</function></member>
     <member><function>mysqli_stmt_num_rows</function></member>
-    <member><methodname>PDOStatement::rowCount</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.rowcount;">PDOStatement::rowCount</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-pconnect.xml b/reference/mysql/functions/mysql-pconnect.xml
index 723efea28..40a80c5ac 100644
--- a/reference/mysql/functions/mysql-pconnect.xml
+++ b/reference/mysql/functions/mysql-pconnect.xml
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_connect</function> with <literal>p:</literal> host prefix</member>
-    <member><methodname>PDO::__construct</methodname> with <constant>PDO::ATTR_PERSISTENT</constant> as a driver option</member>
+    <member><methodname xlink:href="&url.php.manual.pdo.construct;">PDO::__construct</methodname> with <constant xlink:href="&url.php.manual.pdo.constants.attr-persistent;">PDO::ATTR_PERSISTENT</constant> as a driver option</member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-query.xml b/reference/mysql/functions/mysql-query.xml
index 39e974a5a..fd826ece5 100644
--- a/reference/mysql/functions/mysql-query.xml
+++ b/reference/mysql/functions/mysql-query.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-query">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-query">
  <refnamediv>
   <refname>mysql_query</refname>
   <refpurpose>Send a MySQL query</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_query</function></member>
-    <member><methodname>PDO::query</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.query;">PDO::query</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-real-escape-string.xml b/reference/mysql/functions/mysql-real-escape-string.xml
index dd64f4bec..39a816ed8 100644
--- a/reference/mysql/functions/mysql-real-escape-string.xml
+++ b/reference/mysql/functions/mysql-real-escape-string.xml
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_real_escape_string</function></member>
-    <member><methodname>PDO::quote</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdo.quote;">PDO::quote</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
@@ -79,7 +79,7 @@
   &reftitle.errors;
   <simpara>
    Executing this function without a MySQL connection present will
-   also emit <constant>E_WARNING</constant> level PHP errors. Only
+   also emit <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> level PHP errors. Only
    execute this function with a valid MySQL connection present.
   </simpara>
  </refsect1>
@@ -173,7 +173,7 @@ SELECT * FROM users WHERE user='aidan' AND password='' OR ''=''
    <simpara>
     A MySQL connection is required before using
     <function>mysql_real_escape_string</function> otherwise an error of
-    level <constant>E_WARNING</constant> is generated, and &false; is
+    level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is generated, and &false; is
     returned. If <parameter>link_identifier</parameter> isn't defined, the
     last MySQL connection is used.
    </simpara>
diff --git a/reference/mysql/functions/mysql-result.xml b/reference/mysql/functions/mysql-result.xml
index 097a3e289..9675ed9a8 100644
--- a/reference/mysql/functions/mysql-result.xml
+++ b/reference/mysql/functions/mysql-result.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-result">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-result">
  <refnamediv>
   <refname>mysql_result</refname>
   <refpurpose>Get result data</refpurpose>
@@ -15,7 +15,7 @@
      <function>mysqli_field_seek</function> and
      <function>mysqli_fetch_field</function>
     </member>
-    <member><methodname>PDOStatement::fetchColumn</methodname></member>
+    <member><methodname xlink:href="&url.php.manual.pdostatement.fetchcolumn;">PDOStatement::fetchColumn</methodname></member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-select-db.xml b/reference/mysql/functions/mysql-select-db.xml
index 32ab346a2..5477b5e6f 100644
--- a/reference/mysql/functions/mysql-select-db.xml
+++ b/reference/mysql/functions/mysql-select-db.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-select-db">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-select-db">
  <refnamediv>
   <refname>mysql_select_db</refname>
   <refpurpose>Select a MySQL database</refpurpose>
@@ -11,7 +11,7 @@
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_select_db</function></member>
-    <member><methodname>PDO::__construct</methodname> (part of dsn)</member>
+    <member><methodname xlink:href="&url.php.manual.pdo.construct;">PDO::__construct</methodname> (part of dsn)</member>
    </simplelist>
   </warning>
  </refsynopsisdiv>
diff --git a/reference/mysql/functions/mysql-stat.xml b/reference/mysql/functions/mysql-stat.xml
index 019715df9..4c2c2b880 100644
--- a/reference/mysql/functions/mysql-stat.xml
+++ b/reference/mysql/functions/mysql-stat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-stat">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-stat">
  <refnamediv>
   <refname>mysql_stat</refname>
   <refpurpose>Get current system status</refpurpose>
@@ -12,8 +12,8 @@
    <simplelist role="alternatives">
     <member><function>mysqli_stat</function></member>
     <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_SERVER_INFO</constant>
+     <methodname xlink:href="&url.php.manual.pdo.getattribute;">PDO::getAttribute</methodname>
+     with <parameter>attribute</parameter> as <constant xlink:href="&url.php.manual.pdo.constants.attr-server-info;">PDO::ATTR_SERVER_INFO</constant>
     </member>
    </simplelist>
   </warning>
diff --git a/reference/mysql/ini.xml b/reference/mysql/ini.xml
index 6ed6ee6f0..b6dc33ce3 100644
--- a/reference/mysql/ini.xml
+++ b/reference/mysql/ini.xml
@@ -19,67 +19,67 @@
      <row>
       <entry><link linkend="ini.mysql.allow-local-infile">mysql.allow_local_infile</link></entry>
       <entry>"1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.allow-persistent">mysql.allow_persistent</link></entry>
       <entry>"1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.max-persistent">mysql.max_persistent</link></entry>
       <entry>"-1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.max-links">mysql.max_links</link></entry>
       <entry>"-1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.trace-mode">mysql.trace_mode</link></entry>
       <entry>"0"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.default-port">mysql.default_port</link></entry>
       <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.default-socket">mysql.default_socket</link></entry>
       <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.default-host">mysql.default_host</link></entry>
       <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.default-user">mysql.default_user</link></entry>
       <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.default-password">mysql.default_password</link></entry>
       <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.mysql.connect-timeout">mysql.connect_timeout</link></entry>
       <entry>"60"</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry/>
      </row>
     </tbody>
diff --git a/reference/mysql_xdevapi/examples.xml b/reference/mysql_xdevapi/examples.xml
index 328553609..b96550d4e 100644
--- a/reference/mysql_xdevapi/examples.xml
+++ b/reference/mysql_xdevapi/examples.xml
@@ -41,7 +41,7 @@ $collection = $schema->createCollection("example");
   </programlisting>
  </example>
  <para>
-  When storing data, typically <function>json_encode</function> is used to encode
+  When storing data, typically <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function> is used to encode
   the data into JSON, which can then be stored inside a collection.
  </para>
  <para>
diff --git a/reference/mysql_xdevapi/functions/mysql-xdevapi.getsession.xml b/reference/mysql_xdevapi/functions/mysql-xdevapi.getsession.xml
index d22628cc6..ef88302c3 100644
--- a/reference/mysql_xdevapi/functions/mysql-xdevapi.getsession.xml
+++ b/reference/mysql_xdevapi/functions/mysql-xdevapi.getsession.xml
@@ -157,7 +157,7 @@ mysqlx://foo:bar@localhost:33160/?connect-timeout=10&amp;compression=required&am
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A connection failure throws an <classname>Exception</classname>.
+   A connection failure throws an <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>.
   </para>
  </refsect1>
 
diff --git a/reference/mysql_xdevapi/ini.xml b/reference/mysql_xdevapi/ini.xml
index 8e1a076aa..beb98de34 100644
--- a/reference/mysql_xdevapi/ini.xml
+++ b/reference/mysql_xdevapi/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="mysql-xdevapi.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="mysql-xdevapi.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,37 +20,37 @@
      <row>
       <entry><link linkend="ini.xmysqlnd.collect-memory-statistics">xmysqlnd.collect_memory_statistics</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.xmysqlnd.collect-statistics">xmysqlnd.collect_statistics</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.xmysqlnd.debug">xmysqlnd.debug</link></entry>
       <entry></entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.xmysqlnd.mempool-default-size">xmysqlnd.mempool_default_size</link></entry>
       <entry>16000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.xmysqlnd.net-read-timeout">xmysqlnd.net_read_timeout</link></entry>
       <entry>31536000</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.xmysqlnd.trace-alloc">xmysqlnd.trace_alloc</link></entry>
       <entry></entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
diff --git a/reference/mysql_xdevapi/mysql-xdevapi.docresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.docresult.xml
index 55753313b..27a31b9a7 100644
--- a/reference/mysql_xdevapi/mysql-xdevapi.docresult.xml
+++ b/reference/mysql_xdevapi/mysql-xdevapi.docresult.xml
@@ -35,7 +35,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mysql_xdevapi/mysql-xdevapi.exception.xml b/reference/mysql_xdevapi/mysql-xdevapi.exception.xml
index 991b524a5..605ee1494 100644
--- a/reference/mysql_xdevapi/mysql-xdevapi.exception.xml
+++ b/reference/mysql_xdevapi/mysql-xdevapi.exception.xml
@@ -32,11 +32,11 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
+      <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mysql_xdevapi/mysql-xdevapi.result.xml b/reference/mysql_xdevapi/mysql-xdevapi.result.xml
index 098a6ab46..04de571be 100644
--- a/reference/mysql_xdevapi/mysql-xdevapi.result.xml
+++ b/reference/mysql_xdevapi/mysql-xdevapi.result.xml
@@ -35,7 +35,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mysql_xdevapi/mysql-xdevapi.rowresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.rowresult.xml
index d2de1dff4..90c880d1d 100644
--- a/reference/mysql_xdevapi/mysql-xdevapi.rowresult.xml
+++ b/reference/mysql_xdevapi/mysql-xdevapi.rowresult.xml
@@ -35,7 +35,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mysql_xdevapi/mysql-xdevapi.sqlstatementresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.sqlstatementresult.xml
index f54836f92..3a20ca5f3 100644
--- a/reference/mysql_xdevapi/mysql-xdevapi.sqlstatementresult.xml
+++ b/reference/mysql_xdevapi/mysql-xdevapi.sqlstatementresult.xml
@@ -35,7 +35,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mysql_xdevapi/mysql_xdevapi/session/dropschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/dropschema.xml
index cc5684082..0f5baadd0 100644
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/dropschema.xml
+++ b/reference/mysql_xdevapi/mysql_xdevapi/session/dropschema.xml
@@ -39,7 +39,7 @@
    or can't be dropped. 
   </para>
   <para>
-   An <constant>E_WARNING</constant> level error is generated if the 
+   An <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> level error is generated if the 
    schema does not exist.
   </para>
  </refsect1>
diff --git a/reference/oauth/entities.oauth.ent b/reference/oauth/entities.oauth.ent
index 3cbd33a08..0c4e4f27f 100644
--- a/reference/oauth/entities.oauth.ent
+++ b/reference/oauth/entities.oauth.ent
@@ -11,7 +11,7 @@ See doc-base/scripts/text-entities.php for details.
           xmlns:xlink = "http://www.w3.org/1999/xlink"
           translate   = "yes">
 
-<entity name="oauth.callback.error">Emits an <constant>E_ERROR</constant> level
+<entity name="oauth.callback.error">Emits an <constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level
 error if the callback function cannot be called, or was not specified.</entity>
 
 <entity name="oauth.changelog.error.null">Previously returned &null; on failure, instead of &false;.</entity>
diff --git a/reference/oauth/oauth/getlastresponseinfo.xml b/reference/oauth/oauth/getlastresponseinfo.xml
index 221990d77..a0abe7367 100644
--- a/reference/oauth/oauth/getlastresponseinfo.xml
+++ b/reference/oauth/oauth/getlastresponseinfo.xml
@@ -26,7 +26,7 @@
   &reftitle.returnvalues;
   <simpara>
    Returns an array containing the response information for the last
-   request. Constants from <function>curl_getinfo</function> may be
+   request. Constants from <function xlink:href="&url.php.manual.function.curl-getinfo;">curl_getinfo</function> may be
    used.
   </simpara>
  </refsect1>
diff --git a/reference/oauth/oauthexception.xml b/reference/oauth/oauthexception.xml
index 8f380b17d..1fefee549 100644
--- a/reference/oauth/oauthexception.xml
+++ b/reference/oauth/oauthexception.xml
@@ -31,7 +31,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -46,10 +46,10 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/oauth/oauthprovider/checkoauthrequest.xml b/reference/oauth/oauthprovider/checkoauthrequest.xml
index 8b06ac3a8..fe3c0348d 100644
--- a/reference/oauth/oauthprovider/checkoauthrequest.xml
+++ b/reference/oauth/oauthprovider/checkoauthrequest.xml
@@ -54,7 +54,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   Emits an <constant>E_ERROR</constant> level error if
+   Emits an <constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error if
    the HTTP method cannot be detected.
   </simpara>
  </refsect1>
diff --git a/reference/oauth/oauthprovider/generatetoken.xml b/reference/oauth/oauthprovider/generatetoken.xml
index 344ccebb3..0901fd67a 100644
--- a/reference/oauth/oauthprovider/generatetoken.xml
+++ b/reference/oauth/oauthprovider/generatetoken.xml
@@ -53,8 +53,8 @@
   &reftitle.errors;
   <simpara>
    If the <parameter>strong</parameter> parameter is &true;, then an
-   <constant>E_WARNING</constant> level error will be emitted when the
-   fallback <function>rand</function> implementation is used to fill
+   <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> level error will be emitted when the
+   fallback <function xlink:href="&url.php.manual.function.rand;">rand</function> implementation is used to fill
    the remaining random bytes (e.g., when not enough random data was found,
    initially).
   </simpara>
@@ -92,7 +92,7 @@ b6a82c27
   <note>
    <simpara>
     When not enough random data is available to the system, this function will
-    fill the remaining random bytes using the internal PHP <function>rand</function>
+    fill the remaining random bytes using the internal PHP <function xlink:href="&url.php.manual.function.rand;">rand</function>
     implementation.
    </simpara>
   </note>
@@ -101,7 +101,7 @@ b6a82c27
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>openssl_random_pseudo_bytes</function></member>
+   <member><function xlink:href="&url.php.manual.function.openssl-random-pseudo-bytes;">openssl_random_pseudo_bytes</function></member>
    <member><function>mcrypt_create_iv</function></member>
   </simplelist>
  </refsect1>
diff --git a/reference/openal/functions/openal-stream.xml b/reference/openal/functions/openal-stream.xml
index 4c5dc9eea..c40a72edc 100644
--- a/reference/openal/functions/openal-stream.xml
+++ b/reference/openal/functions/openal-stream.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-stream">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.openal-stream">
  <refnamediv>
   <refname>openal_stream</refname>
   <refpurpose>
@@ -60,7 +60,7 @@
   &reftitle.seealso;
   <simplelist>
    <member><function>openal_source_create</function></member>
-   <member><function>fwrite</function></member>
+   <member><function xlink:href="&url.php.manual.function.fwrite;">fwrite</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/parallel/book.xml b/reference/parallel/book.xml
index 923c45b7f..c5c1aa9f7 100644
--- a/reference/parallel/book.xml
+++ b/reference/parallel/book.xml
@@ -36,7 +36,7 @@
   <simplesect>
    <title>Task</title>
    <para>
-    A task is simply a <classname>Closure</classname> intended for parallel execution. The <classname>Closure</classname> may contain almost any instruction, including nested closures.
+    A task is simply a <classname xlink:href="&url.php.manual.class.closure;">Closure</classname> intended for parallel execution. The <classname xlink:href="&url.php.manual.class.closure;">Closure</classname> may contain almost any instruction, including nested closures.
     However, there are some instructions that are prohibited in tasks:
     <itemizedlist>
      <listitem>
@@ -81,7 +81,7 @@
   <simplesect>
    <title>Events</title>
    <simpara>
-    The <classname>parallel\Events</classname> API implements a native feel (<classname>Traversable</classname>) event loop, and <methodname>parallel\Events::poll</methodname> method.
+    The <classname>parallel\Events</classname> API implements a native feel (<classname xlink:href="&url.php.manual.class.traversable;">Traversable</classname>) event loop, and <methodname>parallel\Events::poll</methodname> method.
     It allows the programmer to work with sets of channels and or futures.
     The programmer simply adds channels and futures to the event loop, optionally setting the input for writes with <methodname>parallel\Events::setInput</methodname>,
     and enters into a foreach: parallel will read from and write to objects as they become available yielding <classname>parallel\Events\Event</classname> objects
diff --git a/reference/parallel/functions/parallel.run.xml b/reference/parallel/functions/parallel.run.xml
index 32c5e6cf3..fc275f7e4 100644
--- a/reference/parallel/functions/parallel.run.xml
+++ b/reference/parallel/functions/parallel.run.xml
@@ -10,14 +10,14 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>task</parameter></methodparam>
   </methodsynopsis>
   <simpara>
    Shall schedule <parameter>task</parameter> for execution in parallel.
   </simpara>
   <methodsynopsis>
    <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>task</parameter></methodparam>
    <methodparam><type>array</type><parameter>argv</parameter></methodparam>
   </methodsynopsis>
   <simpara>
diff --git a/reference/parallel/parallel.events.xml b/reference/parallel/parallel.events.xml
index b45d5e9f5..9400c3775 100644
--- a/reference/parallel/parallel.events.xml
+++ b/reference/parallel/parallel.events.xml
@@ -26,10 +26,10 @@
       <classname>parallel\Events</classname>
      </ooclass>
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/parallel/parallel/future/value.xml b/reference/parallel/parallel/future/value.xml
index d3f1e77f3..b521bdae8 100644
--- a/reference/parallel/parallel/future/value.xml
+++ b/reference/parallel/parallel/future/value.xml
@@ -41,7 +41,7 @@
   </warning>
   <warning>
    <simpara>
-    Shall rethrow <type>Throwable</type> uncaught in task
+    Shall rethrow <type xlink:href="&url.php.manual.class.throwable;">Throwable</type> uncaught in task
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/parallel/parallel/runtime/run.xml b/reference/parallel/parallel/runtime/run.xml
index 39b06180a..8efefc3c4 100644
--- a/reference/parallel/parallel/runtime/run.xml
+++ b/reference/parallel/parallel/runtime/run.xml
@@ -10,14 +10,14 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\Runtime::run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>task</parameter></methodparam>
   </methodsynopsis>
   <simpara>
    Shall schedule <parameter>task</parameter> for execution in parallel.
   </simpara>
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\Runtime::run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>task</parameter></methodparam>
    <methodparam><type>array</type><parameter>argv</parameter></methodparam>
   </methodsynopsis>
   <simpara>
@@ -33,7 +33,7 @@
     <term><parameter>task</parameter></term>
     <listitem>
      <simpara>
-      A <classname>Closure</classname> with specific characteristics.
+      A <classname xlink:href="&url.php.manual.class.closure;">Closure</classname> with specific characteristics.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/parle/parle.lexerexception.xml b/reference/parle/parle.lexerexception.xml
index 0dbdabfe4..e9c399fd3 100644
--- a/reference/parle/parle.lexerexception.xml
+++ b/reference/parle/parle.lexerexception.xml
@@ -32,16 +32,16 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -49,7 +49,7 @@
     <!--<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-lexerexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />-->
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/parle/parle.parserexception.xml b/reference/parle/parle.parserexception.xml
index 42e227b98..b3eaad609 100644
--- a/reference/parle/parle.parserexception.xml
+++ b/reference/parle/parle.parserexception.xml
@@ -32,16 +32,16 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -49,7 +49,7 @@
     <!--<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-parserexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />-->
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/pdo_cubrid/reference.xml b/reference/pdo_cubrid/reference.xml
index 106d90496..a100bd69c 100644
--- a/reference/pdo_cubrid/reference.xml
+++ b/reference/pdo_cubrid/reference.xml
@@ -26,7 +26,7 @@
     <simpara>
      PDO_CUBRID supports scrollable cursors. The default cursor type is
      forward only, and you can use parameter driver_options in
-     <methodname>PDO::prepare</methodname> to change cursor type.
+     <methodname xlink:href="&url.php.manual.pdo.prepare;">PDO::prepare</methodname> to change cursor type.
     </simpara>
    </section>
 
@@ -34,7 +34,7 @@
     <title>Timeout</title>
     <simpara>
      PDO_CUBRID supports sql statement execution timeout setting;
-     You can use <methodname>PDO::setAttribute</methodname> to set timeout value.
+     You can use <methodname xlink:href="&url.php.manual.pdo.setattribute;">PDO::setAttribute</methodname> to set timeout value.
     </simpara>
    </section>
 
@@ -44,14 +44,14 @@
     <simpara>
      PDO_CUBRID supports both autocommit_mode and transaction, and
      autocommit_mode is enabled by default. You can use
-     <methodname>PDO::setAttribute</methodname> to change its state.
+     <methodname xlink:href="&url.php.manual.pdo.setattribute;">PDO::setAttribute</methodname> to change its state.
     </simpara>
 
     <simpara>
-     If you use <methodname>PDO::beginTransaction</methodname> to begin a
+     If you use <methodname xlink:href="&url.php.manual.pdo.begintransaction;">PDO::beginTransaction</methodname> to begin a
      transaction, it will disable autocommit_mode automatically and
-     restore it after <methodname>PDO::commit</methodname> or
-     <methodname>PDO::rollBack</methodname>.
+     restore it after <methodname xlink:href="&url.php.manual.pdo.commit;">PDO::commit</methodname> or
+     <methodname xlink:href="&url.php.manual.pdo.rollback;">PDO::rollBack</methodname>.
     </simpara>
 
     <note>
@@ -75,7 +75,7 @@
     <title>Schema Information</title>
 
     <simpara>
-     PDO_CUBRID implements <methodname>PDO::cubrid_schema</methodname>
+     PDO_CUBRID implements <methodname xlink:href="&url.php.manual.pdo.cubrid-schema;">PDO::cubrid_schema</methodname>
      to get schema information.
     </simpara>
    </section>
@@ -130,7 +130,7 @@ fpassthru($result[0]);
     <title>Column meta</title>
 
     <para>
-     The <methodname>PDOStatement::getColumnMeta</methodname> in CUBRID PDO
+     The <methodname xlink:href="&url.php.manual.pdostatement.getcolumnmeta;">PDOStatement::getColumnMeta</methodname> in CUBRID PDO
      will return an associative array containing the following values:
      <simplelist>
       <member>type</member>
@@ -206,7 +206,7 @@ var_Dump($ret);
 
     <para>
      CUBRID Bind Data Types for the fifth parameter of
-     <methodname>PDOStatement::bindParam</methodname>:
+     <methodname xlink:href="&url.php.manual.pdostatement.bindparam;">PDOStatement::bindParam</methodname>:
      <simplelist>
       <member>CHAR</member>
       <member>STRING</member>
diff --git a/reference/pdo_ibm/ini.xml b/reference/pdo_ibm/ini.xml
index f036a85b1..0f7d6d6c7 100644
--- a/reference/pdo_ibm/ini.xml
+++ b/reference/pdo_ibm/ini.xml
@@ -19,13 +19,13 @@
      <row>
       <entry><link linkend="ini.pdo-ibm.i5-dbcs-alloc">pdo_ibm.i5_dbcs_alloc</link></entry>
       <entry>"0"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Added in PDO_IBM 1.5.0</entry>
      </row>
      <row>
       <entry><link linkend="ini.pdo-ibm.i5-override-ccsid">pdo_ibm.i5_override_ccsid</link></entry>
       <entry>"0"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Added in PDO_IBM 1.5.0</entry>
      </row>
     </tbody>
diff --git a/reference/ps/functions/ps-hyphenate.xml b/reference/ps/functions/ps-hyphenate.xml
index 0d8fbe27d..d500e3526 100644
--- a/reference/ps/functions/ps-hyphenate.xml
+++ b/reference/ps/functions/ps-hyphenate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-hyphenate" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.ps-hyphenate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>ps_hyphenate</refname>
   <refpurpose>Hyphenates a word</refpurpose>
@@ -21,7 +21,7 @@
    hyphendict must be set before calling this function.
   </para>
   <para>
-   This function requires the locale category <constant>LC_CTYPE</constant> to be set properly.
+   This function requires the locale category <constant xlink:href="&url.php.manual.constant.lc-ctype;">LC_CTYPE</constant> to be set properly.
    This is done when the extension is initialized by using the environment
    variables. On Unix systems read the man page of locale for more information.
   </para>
diff --git a/reference/pthreads/thread.xml b/reference/pthreads/thread.xml
index 3093a869e..87c4a0d5c 100644
--- a/reference/pthreads/thread.xml
+++ b/reference/pthreads/thread.xml
@@ -43,15 +43,15 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/pthreads/threaded.xml b/reference/pthreads/threaded.xml
index 9988c1757..af7cdbf2b 100644
--- a/reference/pthreads/threaded.xml
+++ b/reference/pthreads/threaded.xml
@@ -37,15 +37,15 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/pthreads/threaded/synchronized.xml b/reference/pthreads/threaded/synchronized.xml
index 19024ab48..4fb8fc838 100644
--- a/reference/pthreads/threaded/synchronized.xml
+++ b/reference/pthreads/threaded/synchronized.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>mixed</type><methodname>Threaded::synchronized</methodname>
-   <methodparam><type>Closure</type><parameter>block</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>block</parameter></methodparam>
    <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
   </methodsynopsis>
   <simpara>
diff --git a/reference/pthreads/volatile.xml b/reference/pthreads/volatile.xml
index 9d1dd0a50..3cecd52d2 100644
--- a/reference/pthreads/volatile.xml
+++ b/reference/pthreads/volatile.xml
@@ -40,7 +40,7 @@
      </oointerface>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 
diff --git a/reference/pthreads/worker.xml b/reference/pthreads/worker.xml
index a0f511a55..463872181 100644
--- a/reference/pthreads/worker.xml
+++ b/reference/pthreads/worker.xml
@@ -53,15 +53,15 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/quickhash/quickhashinthash.xml b/reference/quickhash/quickhashinthash.xml
index 5286ac49e..62c62ebdf 100644
--- a/reference/quickhash/quickhashinthash.xml
+++ b/reference/quickhash/quickhashinthash.xml
@@ -13,10 +13,10 @@
    <simpara>
     This class wraps around a hash containing integer numbers, where the
     values are also integer numbers. Hashes are also available as
-    implementation of the <interfacename>ArrayAccess</interfacename> interface.
+    implementation of the <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename> interface.
    </simpara>
    <simpara>
-    Hashes can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
+    Hashes can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename> interface is
     implemented as well. The order of which elements are returned in is not
     guaranteed.
    </simpara>
diff --git a/reference/quickhash/quickhashintset.xml b/reference/quickhash/quickhashintset.xml
index 17abce2c0..f99f89cbb 100644
--- a/reference/quickhash/quickhashintset.xml
+++ b/reference/quickhash/quickhashintset.xml
@@ -14,7 +14,7 @@
     This class wraps around a set containing integer numbers.
    </simpara>
    <simpara>
-    Sets can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
+    Sets can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename> interface is
     implemented as well. The order of which elements are returned in is not
     guaranteed.
    </simpara>
diff --git a/reference/quickhash/quickhashintstringhash.xml b/reference/quickhash/quickhashintstringhash.xml
index c87dd5df8..ca7a46e92 100644
--- a/reference/quickhash/quickhashintstringhash.xml
+++ b/reference/quickhash/quickhashintstringhash.xml
@@ -13,10 +13,10 @@
    <simpara>
     This class wraps around a hash containing integer numbers, where the
     values are strings. Hashes are also available as implementation of the
-    <interfacename>ArrayAccess</interfacename> interface.
+    <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename> interface.
    </simpara>
    <simpara>
-    Hashes can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
+    Hashes can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename> interface is
     implemented as well. The order of which elements are returned in is not
     guaranteed.
    </simpara>
diff --git a/reference/quickhash/quickhashstringinthash.xml b/reference/quickhash/quickhashstringinthash.xml
index 0195bace6..e168beaef 100644
--- a/reference/quickhash/quickhashstringinthash.xml
+++ b/reference/quickhash/quickhashstringinthash.xml
@@ -13,10 +13,10 @@
    <simpara>
     This class wraps around a hash containing strings, where the
     values are integer numbers. Hashes are also available as
-    implementation of the <interfacename>ArrayAccess</interfacename> interface.
+    implementation of the <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename> interface.
    </simpara>
    <simpara>
-    Hashes can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
+    Hashes can also be iterated over with <link xlink:href="&url.php.manual.control-structures.foreach;"><literal>foreach</literal></link> as the <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename> interface is
     implemented as well. The order of which elements are returned in is not
     guaranteed.
    </simpara>
diff --git a/reference/rar/rararchive.xml b/reference/rar/rararchive.xml
index a158b5adb..8127cbc4e 100644
--- a/reference/rar/rararchive.xml
+++ b/reference/rar/rararchive.xml
@@ -37,7 +37,7 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Traversable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.traversable;">Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/rar/rararchive/open.xml b/reference/rar/rararchive/open.xml
index eebe5e376..bcaaf1048 100644
--- a/reference/rar/rararchive/open.xml
+++ b/reference/rar/rararchive/open.xml
@@ -76,7 +76,7 @@
   <warning>
    <simpara>
     Prior to version 2.0.0, this function would not handle relative
-    paths correctly. Use <function>realpath</function> as a workaround.
+    paths correctly. Use <function xlink:href="&url.php.manual.function.realpath;">realpath</function> as a workaround.
    </simpara>
   </warning>
  </refsect1>
diff --git a/reference/rar/rarentry/extract.xml b/reference/rar/rarentry/extract.xml
index 1781ef8e5..faeaf4da3 100644
--- a/reference/rar/rarentry/extract.xml
+++ b/reference/rar/rarentry/extract.xml
@@ -75,7 +75,7 @@
   </variablelist>
   <warning>
       <simpara>Prior to version 2.0.0, this function would not handle relative
-      paths correctly. Use <function>realpath</function> as a workaround.</simpara>
+      paths correctly. Use <function xlink:href="&url.php.manual.function.realpath;">realpath</function> as a workaround.</simpara>
   </warning>
  </refsect1>
 
diff --git a/reference/rar/rarentry/getpackedsize.xml b/reference/rar/rarentry/getpackedsize.xml
index 487a66f03..8d0155d4f 100644
--- a/reference/rar/rarentry/getpackedsize.xml
+++ b/reference/rar/rarentry/getpackedsize.xml
@@ -18,7 +18,7 @@
   <note>
     <simpara>Note that on platforms with 32-bit longs (that includes Windows
     x64), the maximum size returned is capped at 2 GiB. Check the constant
-    <constant>PHP_INT_MAX</constant>.</simpara>
+    <constant xlink:href="&url.php.manual.constant.php-int-max;">PHP_INT_MAX</constant>.</simpara>
   </note>
  </refsect1>
 
diff --git a/reference/rar/rarentry/getunpackedsize.xml b/reference/rar/rarentry/getunpackedsize.xml
index 15c987a2d..e1e5b40ad 100644
--- a/reference/rar/rarentry/getunpackedsize.xml
+++ b/reference/rar/rarentry/getunpackedsize.xml
@@ -18,7 +18,7 @@
   <note>
     <simpara>Note that on platforms with 32-bit longs (that includes Windows
     x64), the maximum size returned is capped at 2 GiB. Check the constant
-    <constant>PHP_INT_MAX</constant>.</simpara>
+    <constant xlink:href="&url.php.manual.constant.php-int-max;">PHP_INT_MAX</constant>.</simpara>
   </note>
  </refsect1>
 
diff --git a/reference/rar/rarexception.xml b/reference/rar/rarexception.xml
index cb5283dc2..06ce4d6dd 100644
--- a/reference/rar/rarexception.xml
+++ b/reference/rar/rarexception.xml
@@ -114,7 +114,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -123,7 +123,7 @@
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rarexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/recode/functions/recode-file.xml b/reference/recode/functions/recode-file.xml
index 00db5b578..0f4b37707 100644
--- a/reference/recode/functions/recode-file.xml
+++ b/reference/recode/functions/recode-file.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.recode-file">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.recode-file">
  <refnamediv>
   <refname>recode_file</refname>
   <refpurpose>Recode from file to file according to recode request</refpurpose>
@@ -88,7 +88,7 @@ recode_file("us..flat", $input, $output);
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>fopen</function></member>
+   <member><function xlink:href="&url.php.manual.function.fopen;">fopen</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/recode/functions/recode-string.xml b/reference/recode/functions/recode-string.xml
index 4cc32aa96..1d178d884 100644
--- a/reference/recode/functions/recode-string.xml
+++ b/reference/recode/functions/recode-string.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.recode-string">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.recode-string">
  <refnamediv>
   <refname>recode_string</refname>
   <refpurpose>Recode a string according to a recode request</refpurpose>
@@ -78,9 +78,9 @@ echo recode_string("us..flat", "The following character has a diacritical mark:
     The GNU Recode documentation of your installation for detailed
     instructions about recode requests.
    </member>
-   <member><function>mb_convert_encoding</function></member>
-   <member><methodname>UConverter::transcode</methodname></member>
-   <member><function>iconv</function></member>
+   <member><function xlink:href="&url.php.manual.function.mb-convert-encoding;">mb_convert_encoding</function></member>
+   <member><methodname xlink:href="&url.php.manual.uconverter.transcode;">UConverter::transcode</methodname></member>
+   <member><function xlink:href="&url.php.manual.function.iconv;">iconv</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/rrd/rrdupdater/update.xml b/reference/rrd/rrdupdater/update.xml
index 78d0b1c21..ad5a7232e 100644
--- a/reference/rrd/rrdupdater/update.xml
+++ b/reference/rrd/rrdupdater/update.xml
@@ -54,7 +54,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   Throws a <classname>Exception</classname> on error.
+   Throws a <classname xlink:href="&url.php.manual.class.exception;">Exception</classname> on error.
   </simpara>
  </refsect1>
 
diff --git a/reference/runkit7/functions/runkit7-constant-add.xml b/reference/runkit7/functions/runkit7-constant-add.xml
index 2e1603614..b37c9e915 100644
--- a/reference/runkit7/functions/runkit7-constant-add.xml
+++ b/reference/runkit7/functions/runkit7-constant-add.xml
@@ -60,7 +60,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>define</function></member>
+   <member><function xlink:href="&url.php.manual.function.define;">define</function></member>
    <member><function>runkit7_constant_redefine</function></member>
    <member><function>runkit7_constant_remove</function></member>
   </simplelist>
diff --git a/reference/runkit7/functions/runkit7-constant-remove.xml b/reference/runkit7/functions/runkit7-constant-remove.xml
index f743ae0b7..ab54a04f6 100644
--- a/reference/runkit7/functions/runkit7-constant-remove.xml
+++ b/reference/runkit7/functions/runkit7-constant-remove.xml
@@ -41,7 +41,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>define</function></member>
+   <member><function xlink:href="&url.php.manual.function.define;">define</function></member>
    <member><function>runkit7_constant_add</function></member>
    <member><function>runkit7_constant_redefine</function></member>
   </simplelist>
diff --git a/reference/runkit7/functions/runkit7-function-add.xml b/reference/runkit7/functions/runkit7-function-add.xml
index e5df6aa94..098d10112 100644
--- a/reference/runkit7/functions/runkit7-function-add.xml
+++ b/reference/runkit7/functions/runkit7-function-add.xml
@@ -4,7 +4,7 @@
  <refnamediv>
   <refname>runkit7_function_add</refname>
   <refpurpose>
-   Add a new function, similar to <function>create_function</function>
+   Add a new function, similar to <function xlink:href="&url.php.manual.function.create-function;">create_function</function>
   </refpurpose>
  </refnamediv>
 
@@ -23,7 +23,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>runkit7_function_add</methodname>
    <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>closure</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
@@ -61,7 +61,7 @@
     <term><parameter>closure</parameter></term>
     <listitem>
      <simpara>
-      A <classname>closure</classname> that defines the function.
+      A <classname xlink:href="&url.php.manual.class.closure;">closure</classname> that defines the function.
      </simpara>
     </listitem>
    </varlistentry>
@@ -132,7 +132,7 @@ The value of b is 2
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>create_function</function></member>
+   <member><function xlink:href="&url.php.manual.function.create-function;">create_function</function></member>
    <member><function>runkit7_function_redefine</function></member>
    <member><function>runkit7_function_copy</function></member>
    <member><function>runkit7_function_rename</function></member>
diff --git a/reference/runkit7/functions/runkit7-function-redefine.xml b/reference/runkit7/functions/runkit7-function-redefine.xml
index 4969f7577..1f3231e63 100644
--- a/reference/runkit7/functions/runkit7-function-redefine.xml
+++ b/reference/runkit7/functions/runkit7-function-redefine.xml
@@ -23,7 +23,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>runkit7_function_redefine</methodname>
    <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>closure</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
@@ -64,7 +64,7 @@
      <term><parameter>closure</parameter></term>
      <listitem>
       <simpara>
-       A <classname>closure</classname> that defines the function.
+       A <classname xlink:href="&url.php.manual.class.closure;">closure</classname> that defines the function.
       </simpara>
      </listitem>
     </varlistentry>
diff --git a/reference/runkit7/functions/runkit7-import.xml b/reference/runkit7/functions/runkit7-import.xml
index 363423784..bcaa31012 100644
--- a/reference/runkit7/functions/runkit7-import.xml
+++ b/reference/runkit7/functions/runkit7-import.xml
@@ -22,7 +22,7 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   Similar to <function>include</function>. However, any code residing outside
+   Similar to <function xlink:href="&url.php.manual.function.include;">include</function>. However, any code residing outside
    of a function or class is simply ignored.
    Additionally, depending on the value of <parameter>flags</parameter>,
    any functions or classes which already exist in the currently running environment
diff --git a/reference/runkit7/functions/runkit7-method-add.xml b/reference/runkit7/functions/runkit7-method-add.xml
index 4dd2bf829..3ba44dd25 100644
--- a/reference/runkit7/functions/runkit7-method-add.xml
+++ b/reference/runkit7/functions/runkit7-method-add.xml
@@ -23,7 +23,7 @@
    <type>bool</type><methodname>runkit7_method_add</methodname>
    <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
    <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>closure</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>RUNKIT7_ACC_PUBLIC</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
@@ -70,7 +70,7 @@
      <term><parameter>closure</parameter></term>
      <listitem>
       <simpara>
-       A <classname>closure</classname> that defines the method.
+       A <classname xlink:href="&url.php.manual.class.closure;">closure</classname> that defines the method.
       </simpara>
      </listitem>
     </varlistentry>
diff --git a/reference/runkit7/functions/runkit7-method-redefine.xml b/reference/runkit7/functions/runkit7-method-redefine.xml
index e8bbfce4b..87cfda869 100644
--- a/reference/runkit7/functions/runkit7-method-redefine.xml
+++ b/reference/runkit7/functions/runkit7-method-redefine.xml
@@ -23,7 +23,7 @@
    <type>bool</type><methodname>runkit7_method_redefine</methodname>
    <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
    <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>closure</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>RUNKIT7_ACC_PUBLIC</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
@@ -71,7 +71,7 @@
      <term><parameter>closure</parameter></term>
      <listitem>
       <simpara>
-       A <classname>closure</classname> that defines the method.
+       A <classname xlink:href="&url.php.manual.class.closure;">closure</classname> that defines the method.
       </simpara>
      </listitem>
     </varlistentry>
diff --git a/reference/runkit7/functions/runkit7-object-id.xml b/reference/runkit7/functions/runkit7-object-id.xml
index 979ce50dc..e4c1b1871 100644
--- a/reference/runkit7/functions/runkit7-object-id.xml
+++ b/reference/runkit7/functions/runkit7-object-id.xml
@@ -15,13 +15,13 @@
    <methodparam><type>object</type><parameter>obj</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   This function is equivalent to <function>spl_object_id</function>.
+   This function is equivalent to <function xlink:href="&url.php.manual.function.spl-object-id;">spl_object_id</function>.
   </simpara>
   <simpara>
    This function returns a unique identifier for the object. The object id is
    unique for the lifetime of the object. Once the object is destroyed, its id
    may be reused for other objects. This behavior is similar to
-   <function>spl_object_hash</function>.
+   <function xlink:href="&url.php.manual.function.spl-object-hash;">spl_object_hash</function>.
   </simpara>
  </refsect1>
 
@@ -58,7 +58,7 @@
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>spl_object_id</function></member>
+   <member><function xlink:href="&url.php.manual.function.spl-object-id;">spl_object_id</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/runkit7/ini.xml b/reference/runkit7/ini.xml
index c22358cb9..179bffc44 100644
--- a/reference/runkit7/ini.xml
+++ b/reference/runkit7/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="runkit7.configuration">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="runkit7.configuration">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -19,13 +19,13 @@
      <row>
       <entry><link linkend="ini.runkit7.superglobal">runkit.superglobal</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_PERDIR</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-perdir;">INI_PERDIR</constant></entry>
       <entry/>
      </row>
      <row>
       <entry><link linkend="ini.runkit7.internal-override">runkit.internal_override</link></entry>
       <entry>"0"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry/>
      </row>
     </tbody>
diff --git a/reference/seaslog/ini.xml b/reference/seaslog/ini.xml
index cb94b2832..d8b58cbad 100644
--- a/reference/seaslog/ini.xml
+++ b/reference/seaslog/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="seaslog.configuration">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.configuration">
  &reftitle.runtime;
  &extension.runtime;
  <table>
@@ -18,145 +18,145 @@
     <row>
      <entry><link linkend="ini.seaslog.appender">seaslog.appender</link></entry>
      <entry>1</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.appender-retry">seaslog.appender_retry</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.level">seaslog.level</link></entry>
      <entry>8</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.remote-host">seaslog.remote_host</link></entry>
      <entry>127.0.0.1</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.remote-port">seaslog.remote_port</link></entry>
      <entry>514</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.remote-timeout">seaslog.remote_timeout</link></entry>
      <entry>1</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.default-basepath">seaslog.default_basepath</link></entry>
      <entry>/var/log/www</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.default-logger">seaslog.default_logger</link></entry>
      <entry>default</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.default-template">seaslog.default_template</link></entry>
      <entry>%T | %L | %P | %Q | %t | %M</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.default-datetime-format">seaslog.default_datetime_format</link></entry>
      <entry>Y-m-d H:i:s</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.trace-error">seaslog.trace_error</link></entry>
      <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.trace-exception">seaslog.trace_exception</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.trace-notice">seaslog.trace_notice</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.trace-warning">seaslog.trace_warning</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.use-buffer">seaslog.use_buffer</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.buffer-size">seaslog.buffer_size</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.buffer-disabled-in-cli">seaslog.buffer_disabled_in_cli</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.disting-type">seaslog.disting_type</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.disting-folder">seaslog.disting_folder</link></entry>
      <entry>1</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.disting-by-hour">seaslog.disting_by_hour</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.recall-depth">seaslog.recall_depth</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.trim-wrap">seaslog.trim_wrap</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.ignore-warning">seaslog.ignore_warning</link></entry>
      <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.seaslog.throw-exception">seaslog.throw_exception</link></entry>
      <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
    </tbody>
diff --git a/reference/seaslog/seaslog/setdatetimeformat.xml b/reference/seaslog/seaslog/setdatetimeformat.xml
index a641455a4..ab8d0d1f8 100644
--- a/reference/seaslog/seaslog/setdatetimeformat.xml
+++ b/reference/seaslog/seaslog/setdatetimeformat.xml
@@ -27,7 +27,7 @@
     <term><parameter>format</parameter></term>
     <listitem>
      <simpara>
-      String. Such as `Y-m-d H:i:s` or `Ymd His`. See also first param `format` at <function>date</function>.
+      String. Such as `Y-m-d H:i:s` or `Ymd His`. See also first param `format` at <function xlink:href="&url.php.manual.function.date;">date</function>.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/simdjson/constants.xml b/reference/simdjson/constants.xml
index 3c85d56de..512721d6d 100644
--- a/reference/simdjson/constants.xml
+++ b/reference/simdjson/constants.xml
@@ -327,7 +327,7 @@
     (&integer;)
    </term>
    <listitem>
-    <simpara>Invalid property name for an <classname>stdClass</classname> when decoding a value
+    <simpara>Invalid property name for an <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname> when decoding a value
     with <function>simdjson_decode</function> or <function>simdjson_key_value</function>
     </simpara>
    </listitem>
diff --git a/reference/simdjson/functions/simdjson-decode.xml b/reference/simdjson/functions/simdjson-decode.xml
index 4c232a53a..9b1fd9a6d 100644
--- a/reference/simdjson/functions/simdjson-decode.xml
+++ b/reference/simdjson/functions/simdjson-decode.xml
@@ -16,7 +16,7 @@
   <simpara>
    Takes a JSON encoded string and converts it into a PHP value.
    This uses a faster Simultaneous Instruction, Multiple Data implementation
-   than <function>json_decode</function> when it is supported by the computer architecture.
+   than <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> when it is supported by the computer architecture.
   </simpara>
  </refsect1>
 
@@ -34,7 +34,7 @@
      </simpara>
      <simpara>
       This function parses valid inputs which
-      <function>json_decode</function> can decode,
+      <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> can decode,
       provided that they are less than 4 GiB long.
      </simpara>
     </listitem>
@@ -58,7 +58,7 @@
 
       Callers should use reasonably small values,
       because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
+      increase the recursion depth, unlike the current <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> implementation.
      </simpara>
     </listitem>
    </varlistentry>
@@ -79,12 +79,12 @@
   &reftitle.errors;
   <simpara>
    If <parameter>json</parameter> is invalid, a <classname>SimdJsonException</classname> is thrown as of PECL simdjson 2.1.0,
-   while previously, a <classname>RuntimeException</classname> was thrown.
+   while previously, a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname> was thrown.
   </simpara>
   <simpara>
    If <parameter>depth</parameter> is outside the allowed range,
    a <classname>SimdJsonValueError</classname> is thrown as of PECL simdjson 3.0.0,
-   while previously, an error of level <constant>E_WARNING</constant> was raised.
+   while previously, an error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> was raised.
   </simpara>
  </refsect1>
 
@@ -275,8 +275,8 @@ object(stdClass)#1 (1) {
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>json_encode</function></member>
-   <member><function>json_decode</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-decode;">json_decode</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/simdjson/functions/simdjson-is-valid.xml b/reference/simdjson/functions/simdjson-is-valid.xml
index e7eff39b3..48a1db29f 100644
--- a/reference/simdjson/functions/simdjson-is-valid.xml
+++ b/reference/simdjson/functions/simdjson-is-valid.xml
@@ -31,7 +31,7 @@
       </simpara>
       <simpara>
        This function validates inputs which
-       <function>json_decode</function> can decode,
+       <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> can decode,
        provided that they are less than 4 GiB long.
       </simpara>
     </listitem>
@@ -46,7 +46,7 @@
 
       Callers should use reasonably small values,
       because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
+      increase the recursion depth, unlike the current <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> implementation.
      </simpara>
     </listitem>
    </varlistentry>
@@ -65,12 +65,12 @@
   &reftitle.errors;
   <simpara>
    If <parameter>json</parameter> is longer than 4 GiB, a <classname>SimdJsonException</classname> is thrown as of PECL simdjson 2.1.0,
-   while previously, a <classname>RuntimeException</classname> was thrown.
+   while previously, a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname> was thrown.
   </simpara>
   <simpara>
    If <parameter>depth</parameter> is outside the allowed range,
    a <classname>SimdJsonValueError</classname> is thrown as of PECL simdjson 3.0.0,
-   while previously, an error of level <constant>E_WARNING</constant> was raised.
+   while previously, an error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> was raised.
   </simpara>
  </refsect1>
 
@@ -159,8 +159,8 @@ bool(false)
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>json_encode</function></member>
-   <member><function>json_decode</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-decode;">json_decode</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/simdjson/functions/simdjson-key-count.xml b/reference/simdjson/functions/simdjson-key-count.xml
index 997d77030..3af261ddb 100644
--- a/reference/simdjson/functions/simdjson-key-count.xml
+++ b/reference/simdjson/functions/simdjson-key-count.xml
@@ -48,7 +48,7 @@
 
       Callers should use reasonably small values,
       because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
+      increase the recursion depth, unlike the current <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> implementation.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/simdjson/functions/simdjson-key-exists.xml b/reference/simdjson/functions/simdjson-key-exists.xml
index e46e1c227..3c8bf006d 100644
--- a/reference/simdjson/functions/simdjson-key-exists.xml
+++ b/reference/simdjson/functions/simdjson-key-exists.xml
@@ -47,7 +47,7 @@
 
       Callers should use reasonably small values,
       because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
+      increase the recursion depth, unlike the current <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> implementation.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/simdjson/functions/simdjson-key-value.xml b/reference/simdjson/functions/simdjson-key-value.xml
index 7d736da45..7b5b3eeb4 100644
--- a/reference/simdjson/functions/simdjson-key-value.xml
+++ b/reference/simdjson/functions/simdjson-key-value.xml
@@ -33,7 +33,7 @@
       </simpara>
       <simpara>
        This function parses valid inputs which
-       <function>json_decode</function> can decode,
+       <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> can decode,
        provided that they are less than 4 GiB long.
       </simpara>
     </listitem>
@@ -65,7 +65,7 @@
 
       Callers should use reasonably small values,
       because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
+      increase the recursion depth, unlike the current <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> implementation.
      </simpara>
     </listitem>
    </varlistentry>
@@ -88,18 +88,18 @@
    If <parameter>json</parameter> or <parameter>key</parameter> is invalid,
    or <parameter>key</parameter> could not be found within <parameter>json</parameter>,
    a <classname>SimdJsonException</classname> is thrown as of PECL simdjson 2.1.0,
-   while previously, a <classname>RuntimeException</classname> was thrown.
+   while previously, a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname> was thrown.
   </simpara>
   <simpara>
    If <parameter>depth</parameter> is outside the allowed range,
    a <classname>SimdJsonValueError</classname> is thrown as of PECL simdjson 3.0.0,
-   while previously, an error of level <constant>E_WARNING</constant> was raised.
+   while previously, an error of level <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> was raised.
   </simpara>
  </refsect1>
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>json_encode</function></member>
+   <member><function xlink:href="&url.php.manual.function.json-encode;">json_encode</function></member>
    <member><function>simdjson_decode</function></member>
   </simplelist>
  </refsect1>
diff --git a/reference/simdjson/simdjsonexception.xml b/reference/simdjson/simdjsonexception.xml
index f182e85cf..465a62c2d 100644
--- a/reference/simdjson/simdjsonexception.xml
+++ b/reference/simdjson/simdjsonexception.xml
@@ -34,13 +34,13 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
+      <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
      </ooclass>
 
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/simdjson/simdjsonvalueerror.xml b/reference/simdjson/simdjsonvalueerror.xml
index 757e6696d..81993cc97 100644
--- a/reference/simdjson/simdjsonvalueerror.xml
+++ b/reference/simdjson/simdjsonvalueerror.xml
@@ -32,15 +32,15 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>ValueError</classname>
+      <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('error.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.error.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
+    &class.error.methods;
 
    </classsynopsis>
 <!-- }}} -->
@@ -61,8 +61,8 @@
       <row>
        <entry>PHP 8.0.0</entry>
        <entry>
-        <classname>SimdJsonValueError</classname> extends <classname>ValueError</classname>
-        now instead of <classname>Error</classname>.
+        <classname>SimdJsonValueError</classname> extends <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname>
+        now instead of <classname xlink:href="&url.php.manual.class.error;">Error</classname>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/solr/solrclientexception.xml b/reference/solr/solrclientexception.xml
index e6346efc5..5c8a3962b 100644
--- a/reference/solr/solrclientexception.xml
+++ b/reference/solr/solrclientexception.xml
@@ -38,14 +38,14 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrclientexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
diff --git a/reference/solr/solrdismaxquery.xml b/reference/solr/solrdismaxquery.xml
index 1df92564c..2e44e4f89 100644
--- a/reference/solr/solrdismaxquery.xml
+++ b/reference/solr/solrdismaxquery.xml
@@ -36,7 +36,7 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/solr/solrdocument.xml b/reference/solr/solrdocument.xml
index 08ed06e8f..4851dcaad 100644
--- a/reference/solr/solrdocument.xml
+++ b/reference/solr/solrdocument.xml
@@ -32,15 +32,15 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/solr/solrexception.xml b/reference/solr/solrexception.xml
index c2079d73b..872bf33d7 100644
--- a/reference/solr/solrexception.xml
+++ b/reference/solr/solrexception.xml
@@ -32,7 +32,7 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -54,13 +54,13 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/solr/solrillegalargumentexception.xml b/reference/solr/solrillegalargumentexception.xml
index f674dac42..e9c1c1de0 100644
--- a/reference/solr/solrillegalargumentexception.xml
+++ b/reference/solr/solrillegalargumentexception.xml
@@ -37,14 +37,14 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
         
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrillegalargumentexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
diff --git a/reference/solr/solrillegaloperationexception.xml b/reference/solr/solrillegaloperationexception.xml
index 68b0d6c70..92d04b1e1 100644
--- a/reference/solr/solrillegaloperationexception.xml
+++ b/reference/solr/solrillegaloperationexception.xml
@@ -37,14 +37,14 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrillegaloperationexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
diff --git a/reference/solr/solrmissingmandatoryparameterexception.xml b/reference/solr/solrmissingmandatoryparameterexception.xml
index 725c676c3..9526c1b40 100644
--- a/reference/solr/solrmissingmandatoryparameterexception.xml
+++ b/reference/solr/solrmissingmandatoryparameterexception.xml
@@ -37,7 +37,7 @@
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
 
     <!-- 
@@ -45,7 +45,7 @@
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmissingmandatoryparameterexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
      -->
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
diff --git a/reference/solr/solrmodifiableparams.xml b/reference/solr/solrmodifiableparams.xml
index 4288151ba..62fe9d1a6 100644
--- a/reference/solr/solrmodifiableparams.xml
+++ b/reference/solr/solrmodifiableparams.xml
@@ -36,7 +36,7 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/solr/solrobject.xml b/reference/solr/solrobject.xml
index 1b348965c..592a5c516 100644
--- a/reference/solr/solrobject.xml
+++ b/reference/solr/solrobject.xml
@@ -32,7 +32,7 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/solr/solrparams.xml b/reference/solr/solrparams.xml
index c8a84f1f6..e85837e70 100644
--- a/reference/solr/solrparams.xml
+++ b/reference/solr/solrparams.xml
@@ -32,7 +32,7 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/solr/solrquery.xml b/reference/solr/solrquery.xml
index 0e9c18ed6..2fa2577d7 100644
--- a/reference/solr/solrquery.xml
+++ b/reference/solr/solrquery.xml
@@ -36,7 +36,7 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Serializable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.serializable;">Serializable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/solr/solrserverexception.xml b/reference/solr/solrserverexception.xml
index d587393e9..481ae7a28 100644
--- a/reference/solr/solrserverexception.xml
+++ b/reference/solr/solrserverexception.xml
@@ -38,14 +38,14 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrserverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
diff --git a/reference/sqlsrv/ini.xml b/reference/sqlsrv/ini.xml
index d1399f268..8ae8b9e88 100644
--- a/reference/sqlsrv/ini.xml
+++ b/reference/sqlsrv/ini.xml
@@ -21,19 +21,19 @@
     <row>
      <entry>sqlsrv.WarningsReturnAsErrors</entry>
      <entry>1 (&true;)</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry>Available since SQLSRV 1.0</entry>
     </row>
     <row>
      <entry>sqlsrv.LogSubsystems</entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry>Available since SQLSRV 1.0</entry>
     </row>
     <row>
      <entry>sqlsrv.LogSeverity</entry>
      <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry>Available since SQLSRV 1.0</entry>
     </row>
    </tbody>
diff --git a/reference/ssh2/functions/ssh2-keepalive-config.xml b/reference/ssh2/functions/ssh2-keepalive-config.xml
index 62bce7d00..7f0b876d2 100644
--- a/reference/ssh2/functions/ssh2-keepalive-config.xml
+++ b/reference/ssh2/functions/ssh2-keepalive-config.xml
@@ -82,7 +82,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   An <constant>E_WARNING</constant> is emitted when
+   An <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is emitted when
    <parameter>interval</parameter> is outside the accepted range, in which
    case the keepalive configuration is left unchanged.
   </simpara>
diff --git a/reference/ssh2/functions/ssh2-scp-recv.xml b/reference/ssh2/functions/ssh2-scp-recv.xml
index eb42d23f0..a461d576f 100644
--- a/reference/ssh2/functions/ssh2-scp-recv.xml
+++ b/reference/ssh2/functions/ssh2-scp-recv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-scp-recv">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-scp-recv">
  <refnamediv>
   <refname>ssh2_scp_recv</refname>
   <refpurpose>Request a file via SCP</refpurpose>
@@ -78,7 +78,7 @@ ssh2_scp_recv($connection, '/remote/filename', '/local/filename');
   &reftitle.seealso;
   <simplelist>
    <member><function>ssh2_scp_send</function></member>
-   <member><function>copy</function></member>
+   <member><function xlink:href="&url.php.manual.function.copy;">copy</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-scp-send.xml b/reference/ssh2/functions/ssh2-scp-send.xml
index 210294f1a..ad1049624 100644
--- a/reference/ssh2/functions/ssh2-scp-send.xml
+++ b/reference/ssh2/functions/ssh2-scp-send.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-scp-send">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-scp-send">
  <refnamediv>
   <refname>ssh2_scp_send</refname>
   <refpurpose>Send a file via SCP</refpurpose>
@@ -88,7 +88,7 @@ ssh2_scp_send($connection, '/local/filename', '/remote/filename', 0644);
   &reftitle.seealso;
   <simplelist>
    <member><function>ssh2_scp_recv</function></member>
-   <member><function>copy</function></member>
+   <member><function xlink:href="&url.php.manual.function.copy;">copy</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-send-signal.xml b/reference/ssh2/functions/ssh2-send-signal.xml
index d907bbc07..d627b8837 100644
--- a/reference/ssh2/functions/ssh2-send-signal.xml
+++ b/reference/ssh2/functions/ssh2-send-signal.xml
@@ -66,7 +66,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   An <constant>E_WARNING</constant> is emitted when
+   An <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is emitted when
    <parameter>channel</parameter> is not an SSH channel stream, and when the
    signal could not be sent.
   </simpara>
diff --git a/reference/ssh2/functions/ssh2-set-timeout.xml b/reference/ssh2/functions/ssh2-set-timeout.xml
index b90e8ec90..077060a38 100644
--- a/reference/ssh2/functions/ssh2-set-timeout.xml
+++ b/reference/ssh2/functions/ssh2-set-timeout.xml
@@ -89,7 +89,7 @@ ssh2_auth_password($connection, 'username', 'password');
   <simplelist>
    <member><function>ssh2_connect</function></member>
    <member><function>ssh2_keepalive_config</function></member>
-   <member><function>stream_set_timeout</function></member>
+   <member><function xlink:href="&url.php.manual.function.stream-set-timeout;">stream_set_timeout</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-sftp-chmod.xml b/reference/ssh2/functions/ssh2-sftp-chmod.xml
index 2c4c01644..13f4df6e1 100644
--- a/reference/ssh2/functions/ssh2-sftp-chmod.xml
+++ b/reference/ssh2/functions/ssh2-sftp-chmod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-chmod">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-sftp-chmod">
  <refnamediv>
   <refname>ssh2_sftp_chmod</refname>
   <refpurpose>Changes file mode</refpurpose>
@@ -43,7 +43,7 @@
     <term><parameter>mode</parameter></term>
     <listitem>
      <simpara>
-      Permissions on the file. See the <function>chmod</function> for more details on this parameter.
+      Permissions on the file. See the <function xlink:href="&url.php.manual.function.chmod;">chmod</function> for more details on this parameter.
      </simpara>
     </listitem>
    </varlistentry>
@@ -78,7 +78,7 @@ ssh2_sftp_chmod($sftp, '/somedir/somefile', 0755);
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>chmod</function></member>
+   <member><function xlink:href="&url.php.manual.function.chmod;">chmod</function></member>
    <member><function>ssh2_sftp</function></member>
    <member><function>ssh2_connect</function></member>
   </simplelist>
diff --git a/reference/ssh2/functions/ssh2-sftp-lstat.xml b/reference/ssh2/functions/ssh2-sftp-lstat.xml
index bb2a629ff..b40c7da48 100644
--- a/reference/ssh2/functions/ssh2-sftp-lstat.xml
+++ b/reference/ssh2/functions/ssh2-sftp-lstat.xml
@@ -18,7 +18,7 @@
    following the link.
   </simpara>
   <simpara>
-   This function is similar to using the <function>lstat</function> function
+   This function is similar to using the <function xlink:href="&url.php.manual.function.lstat;">lstat</function> function
    with the <link xlink:href="&url.php.manual.wrappers.ssh2;">ssh2.sftp://</link> wrapper
    and returns the same values.
   </simpara>
@@ -50,7 +50,7 @@
   &reftitle.returnvalues;
   <simpara>
    Returns an array of statistics for the given symbolic link on success&return.falseforfailure;.
-   See the documentation for <function>stat</function> for details on the
+   See the documentation for <function xlink:href="&url.php.manual.function.stat;">stat</function> for details on the
    values which may be returned.
   </simpara>
  </refsect1>
@@ -84,8 +84,8 @@ $mode = $statinfo['mode'];
   &reftitle.seealso;
   <simplelist>
    <member><function>ssh2_sftp_stat</function></member>
-   <member><function>lstat</function></member>
-   <member><function>stat</function></member>
+   <member><function xlink:href="&url.php.manual.function.lstat;">lstat</function></member>
+   <member><function xlink:href="&url.php.manual.function.stat;">stat</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-sftp-mkdir.xml b/reference/ssh2/functions/ssh2-sftp-mkdir.xml
index f5f9af99f..1f39febfa 100644
--- a/reference/ssh2/functions/ssh2-sftp-mkdir.xml
+++ b/reference/ssh2/functions/ssh2-sftp-mkdir.xml
@@ -20,7 +20,7 @@
    <parameter>mode</parameter>.
   </simpara>
   <simpara>
-   This function is similar to using <function>mkdir</function> with the
+   This function is similar to using <function xlink:href="&url.php.manual.function.mkdir;">mkdir</function> with the
    <link xlink:href="&url.php.manual.wrappers.ssh2;">ssh2.sftp://</link> wrapper.
   </simpara>
  </refsect1>
@@ -94,7 +94,7 @@ ssh2_sftp_mkdir($sftp, '/home/username/newdir');
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>mkdir</function></member>
+   <member><function xlink:href="&url.php.manual.function.mkdir;">mkdir</function></member>
    <member><function>ssh2_sftp_rmdir</function></member>
   </simplelist>
  </refsect1>
diff --git a/reference/ssh2/functions/ssh2-sftp-readlink.xml b/reference/ssh2/functions/ssh2-sftp-readlink.xml
index 6f66e1692..7daa68170 100644
--- a/reference/ssh2/functions/ssh2-sftp-readlink.xml
+++ b/reference/ssh2/functions/ssh2-sftp-readlink.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.ssh2-sftp-readlink" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.ssh2-sftp-readlink" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>ssh2_sftp_readlink</refname>
   <refpurpose>Return the target of a symbolic link</refpurpose>
@@ -69,7 +69,7 @@ $target = ssh2_sftp_readlink($sftp, '/tmp/mysql.sock');
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>readlink</function></member>
+   <member><function xlink:href="&url.php.manual.function.readlink;">readlink</function></member>
    <member><function>ssh2_sftp_symlink</function></member>
   </simplelist>
  </refsect1>
diff --git a/reference/ssh2/functions/ssh2-sftp-realpath.xml b/reference/ssh2/functions/ssh2-sftp-realpath.xml
index cf75d3b00..97a47c09a 100644
--- a/reference/ssh2/functions/ssh2-sftp-realpath.xml
+++ b/reference/ssh2/functions/ssh2-sftp-realpath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.ssh2-sftp-realpath" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.ssh2-sftp-realpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>ssh2_sftp_realpath</refname>
   <refpurpose>Resolve the realpath of a provided path string</refpurpose>
@@ -69,7 +69,7 @@ $realpath = ssh2_sftp_realpath($sftp, '/home/username/../../../..//./usr/../etc/
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>realpath</function></member>
+   <member><function xlink:href="&url.php.manual.function.realpath;">realpath</function></member>
    <member><function>ssh2_sftp_symlink</function></member>
    <member><function>ssh2_sftp_readlink</function></member>
   </simplelist>
diff --git a/reference/ssh2/functions/ssh2-sftp-rename.xml b/reference/ssh2/functions/ssh2-sftp-rename.xml
index e0b4f4109..19b46f5d3 100644
--- a/reference/ssh2/functions/ssh2-sftp-rename.xml
+++ b/reference/ssh2/functions/ssh2-sftp-rename.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-rename">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-sftp-rename">
  <refnamediv>
   <refname>ssh2_sftp_rename</refname>
   <refpurpose>Rename a remote file</refpurpose>
@@ -77,7 +77,7 @@ ssh2_sftp_rename($sftp, '/home/username/oldname', '/home/username/newname');
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>rename</function></member>
+   <member><function xlink:href="&url.php.manual.function.rename;">rename</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-sftp-rmdir.xml b/reference/ssh2/functions/ssh2-sftp-rmdir.xml
index 4c9a4597b..91363e7a4 100644
--- a/reference/ssh2/functions/ssh2-sftp-rmdir.xml
+++ b/reference/ssh2/functions/ssh2-sftp-rmdir.xml
@@ -17,7 +17,7 @@
    Removes a directory from the remote file server.
   </simpara>
   <simpara>
-   This function is similar to using <function>rmdir</function> with the
+   This function is similar to using <function xlink:href="&url.php.manual.function.rmdir;">rmdir</function> with the
    <link xlink:href="&url.php.manual.wrappers.ssh2;">ssh2.sftp://</link> wrapper.
   </simpara>
  </refsect1>
@@ -72,7 +72,7 @@ ssh2_sftp_rmdir($sftp, '/home/username/deltodel');
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>rmdir</function></member>
+   <member><function xlink:href="&url.php.manual.function.rmdir;">rmdir</function></member>
    <member><function>ssh2_sftp_mkdir</function></member>
   </simplelist>
  </refsect1>
diff --git a/reference/ssh2/functions/ssh2-sftp-stat.xml b/reference/ssh2/functions/ssh2-sftp-stat.xml
index 80c8d4299..10e7040e6 100644
--- a/reference/ssh2/functions/ssh2-sftp-stat.xml
+++ b/reference/ssh2/functions/ssh2-sftp-stat.xml
@@ -17,7 +17,7 @@
    Stats a file on the remote filesystem following any symbolic links.
   </simpara>
   <simpara>
-   This function is similar to using the <function>stat</function> function
+   This function is similar to using the <function xlink:href="&url.php.manual.function.stat;">stat</function> function
    with the <link xlink:href="&url.php.manual.wrappers.ssh2;">ssh2.sftp://</link> wrapper
    and returns the same values.
   </simpara>
@@ -48,7 +48,7 @@
   &reftitle.returnvalues;
   <simpara>
    Returns an array of statistics for the given file on success&return.falseforfailure;.
-   See the documentation for <function>stat</function> for details on the
+   See the documentation for <function xlink:href="&url.php.manual.function.stat;">stat</function> for details on the
    values which may be returned.
   </simpara>
  </refsect1>
@@ -82,8 +82,8 @@ $mode = $statinfo['mode'];
   &reftitle.seealso;
   <simplelist>
    <member><function>ssh2_sftp_lstat</function></member>
-   <member><function>lstat</function></member>
-   <member><function>stat</function></member>
+   <member><function xlink:href="&url.php.manual.function.lstat;">lstat</function></member>
+   <member><function xlink:href="&url.php.manual.function.stat;">stat</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-sftp-symlink.xml b/reference/ssh2/functions/ssh2-sftp-symlink.xml
index 347381b91..db5de7897 100644
--- a/reference/ssh2/functions/ssh2-sftp-symlink.xml
+++ b/reference/ssh2/functions/ssh2-sftp-symlink.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-symlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-sftp-symlink">
  <refnamediv>
   <refname>ssh2_sftp_symlink</refname>
   <refpurpose>Create a symlink</refpurpose>
@@ -78,7 +78,7 @@ ssh2_sftp_symlink($sftp, '/var/run/mysql.sock', '/tmp/mysql.sock');
   &reftitle.seealso;
   <simplelist>
    <member><function>ssh2_sftp_readlink</function></member>
-   <member><function>symlink</function></member>
+   <member><function xlink:href="&url.php.manual.function.symlink;">symlink</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-sftp-unlink.xml b/reference/ssh2/functions/ssh2-sftp-unlink.xml
index 18db54488..f4daec4e9 100644
--- a/reference/ssh2/functions/ssh2-sftp-unlink.xml
+++ b/reference/ssh2/functions/ssh2-sftp-unlink.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-unlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-sftp-unlink">
  <refnamediv>
   <refname>ssh2_sftp_unlink</refname>
   <refpurpose>Delete a file</refpurpose>
@@ -67,7 +67,7 @@ ssh2_sftp_unlink($sftp, '/home/username/stale_file');
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><function>unlink</function></member>
+   <member><function xlink:href="&url.php.manual.function.unlink;">unlink</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/functions/ssh2-shell-resize.xml b/reference/ssh2/functions/ssh2-shell-resize.xml
index f130a02a3..ad3702789 100644
--- a/reference/ssh2/functions/ssh2-shell-resize.xml
+++ b/reference/ssh2/functions/ssh2-shell-resize.xml
@@ -94,7 +94,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   An <constant>E_WARNING</constant> is emitted when
+   An <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> is emitted when
    <parameter>channel</parameter> is not an SSH channel stream.
   </simpara>
  </refsect1>
diff --git a/reference/ssh2/functions/ssh2-tunnel.xml b/reference/ssh2/functions/ssh2-tunnel.xml
index bf0b38eca..ad1fed778 100644
--- a/reference/ssh2/functions/ssh2-tunnel.xml
+++ b/reference/ssh2/functions/ssh2-tunnel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-tunnel">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-tunnel">
  <refnamediv>
   <refname>ssh2_tunnel</refname>
   <refpurpose>Open a tunnel through a remote server</refpurpose>
@@ -77,7 +77,7 @@ $tunnel = ssh2_tunnel($connection, '10.0.0.101', 12345);
   &reftitle.seealso;
   <simplelist>
    <member><function>ssh2_connect</function></member>
-   <member><function>fsockopen</function></member>
+   <member><function xlink:href="&url.php.manual.function.fsockopen;">fsockopen</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/ssh2/setup.xml b/reference/ssh2/setup.xml
index d1c341fd2..4e78d6456 100644
--- a/reference/ssh2/setup.xml
+++ b/reference/ssh2/setup.xml
@@ -23,7 +23,7 @@
    with libssh2 &gt;= 1.2.3.
   </simpara>
   <simpara>
-   support for <function>stream_set_timeout</function> to channel streams
+   support for <function xlink:href="&url.php.manual.function.stream-set-timeout;">stream_set_timeout</function> to channel streams
    will only be available with libssh2 &gt;= 1.2.9.
   </simpara>
   <simpara>
diff --git a/reference/stats/functions/stats-standard-deviation.xml b/reference/stats/functions/stats-standard-deviation.xml
index 3ffa3ad8c..af10841cf 100644
--- a/reference/stats/functions/stats-standard-deviation.xml
+++ b/reference/stats/functions/stats-standard-deviation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.stats-standard-deviation" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.stats-standard-deviation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>stats_standard_deviation</refname>
   <refpurpose>Returns the standard deviation</refpurpose>
@@ -52,7 +52,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <simpara>
-   Raises an <constant>E_WARNING</constant> when there are fewer than 2
+   Raises an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> when there are fewer than 2
    values in <parameter>a</parameter>.
   </simpara>
  </refsect1><!-- }}} -->
diff --git a/reference/stomp/ini.xml b/reference/stomp/ini.xml
index 8e0cb0685..3de214511 100644
--- a/reference/stomp/ini.xml
+++ b/reference/stomp/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="stomp.configuration">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.configuration">
  &reftitle.runtime;
  &extension.runtime;
  <table>
@@ -18,32 +18,32 @@
     <row>
      <entry><link linkend="ini.stomp.default-broker">stomp.default_broker</link></entry>
      <entry>tcp://localhost:61613</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.stomp.default-connection-timeout-sec">stomp.default_connection_timeout_sec</link></entry>
      <entry>2</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.stomp.default-connection-timeout-usec">stomp.default_connection_timeout_usec</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
 
     <row>
      <entry><link linkend="ini.stomp.default-read-timeout-sec">stomp.default_read_timeout_sec</link></entry>
      <entry>2</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
     <row>
      <entry><link linkend="ini.stomp.default-read-timeout-usec">stomp.default_read_timeout_usec</link></entry>
      <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
+     <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
     </row>
 </tbody>
diff --git a/reference/stomp/stompexception.xml b/reference/stomp/stompexception.xml
index 30877492c..b8d144703 100644
--- a/reference/stomp/stompexception.xml
+++ b/reference/stomp/stompexception.xml
@@ -31,13 +31,13 @@ Represents an error raised by the stomp extension. See <link xlink:href="&url.ph
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
+    &class.exception.methods;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stompexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
diff --git a/reference/svm/svmexception.xml b/reference/svm/svmexception.xml
index 7ee17a5da..cee04c428 100644
--- a/reference/svm/svmexception.xml
+++ b/reference/svm/svmexception.xml
@@ -31,15 +31,15 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/svn/entities.svn.ent b/reference/svn/entities.svn.ent
index 7d97b10c1..c54700b2e 100644
--- a/reference/svn/entities.svn.ent
+++ b/reference/svn/entities.svn.ent
@@ -11,7 +11,7 @@ See doc-base/scripts/text-entities.php for details.
           xmlns:xlink = "http://www.w3.org/1999/xlink"
           translate   = "yes">
 
-<entity name="svn.relativepath"><note><simpara>Relative paths will be resolved as if the current working directory was the one that contains the PHP binary. To use the calling script&apos;s working directory, use <function>realpath</function> or dirname(__FILE__).</simpara></note></entity>
+<entity name="svn.relativepath"><note><simpara>Relative paths will be resolved as if the current working directory was the one that contains the PHP binary. To use the calling script&apos;s working directory, use <function xlink:href="&url.php.manual.function.realpath;">realpath</function> or dirname(__FILE__).</simpara></note></entity>
 
 <entity name="svn.referto.status">Refer to <link linkend="svn.constants.status">status constants</link> for possible values.</entity>
 
diff --git a/reference/svn/functions/svn-checkout.xml b/reference/svn/functions/svn-checkout.xml
index 0344e7414..704cbdf94 100644
--- a/reference/svn/functions/svn-checkout.xml
+++ b/reference/svn/functions/svn-checkout.xml
@@ -87,7 +87,7 @@ svn_checkout('http://www.example.com/svnroot/calc/trunk', dirname(__FILE__) . '/
    <simpara>
     The <literal>dirname(__FILE__)</literal> call is necessary in order
     to convert the calc relative path into an absolute one. If calc
-    exists, you can also use <function>realpath</function> to retrieve
+    exists, you can also use <function xlink:href="&url.php.manual.function.realpath;">realpath</function> to retrieve
     an absolute path.
    </simpara>
   </example>
diff --git a/reference/svn/functions/svn-cleanup.xml b/reference/svn/functions/svn-cleanup.xml
index 914a1d529..fc94340c4 100644
--- a/reference/svn/functions/svn-cleanup.xml
+++ b/reference/svn/functions/svn-cleanup.xml
@@ -57,7 +57,7 @@ svn_cleanup(realpath('help-me'));
 ]]>
    </programlisting>
    <simpara>
-    The <function>realpath</function> call is necessary due to
+    The <function xlink:href="&url.php.manual.function.realpath;">realpath</function> call is necessary due to
     SVN's quirky handling of relative paths.
    </simpara>
   </example>
diff --git a/reference/svn/functions/svn-diff.xml b/reference/svn/functions/svn-diff.xml
index bdb3d2513..9d5264e25 100644
--- a/reference/svn/functions/svn-diff.xml
+++ b/reference/svn/functions/svn-diff.xml
@@ -82,7 +82,7 @@
   <simpara>
    Returns an array-list consisting of two streams: the first is the diff output
    and the second contains error stream output. The streams can be
-   read using <function>fread</function>. Returns &false; or &null; on
+   read using <function xlink:href="&url.php.manual.function.fread;">fread</function>. Returns &false; or &null; on
    error.
   </simpara>
   <simpara>
@@ -152,7 +152,7 @@ function svn_diff_same_item($path, $rev1, $rev2) {
    <title>Portably diffing two local files</title>
    <simpara>
     This example implements a wrapper function that portably
-    diffs two local files, compensating for the <function>realpath</function>
+    diffs two local files, compensating for the <function xlink:href="&url.php.manual.function.realpath;">realpath</function>
     fix and the backslashes bug:
    </simpara>
    <programlisting role="php">
diff --git a/reference/swoole/ini.xml b/reference/swoole/ini.xml
index 545f63cde..a4ce34a95 100644
--- a/reference/swoole/ini.xml
+++ b/reference/swoole/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="swoole.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="swoole.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,37 +20,37 @@
      <row>
       <entry><link linkend="ini.swoole.enable-library">swoole.enable_library</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.swoole.enable-fiber-mock">swoole.enable_fiber_mock</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.swoole.enable-preemptive-scheduler">swoole.enable_preemptive_scheduler</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.swoole.display-errors">swoole.display_errors</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.swoole.use-shortname">swoole.use_shortname</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.swoole.unixsock-buffer-size">swoole.unixsock_buffer_size</link></entry>
       <entry>8388608</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
diff --git a/reference/swoole/swoole.connection.iterator.xml b/reference/swoole/swoole.connection.iterator.xml
index 606297721..8d7a0d5d8 100644
--- a/reference/swoole/swoole.connection.iterator.xml
+++ b/reference/swoole/swoole.connection.iterator.xml
@@ -31,15 +31,15 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/swoole/swoole.coroutine.mysql.exception.xml b/reference/swoole/swoole.coroutine.mysql.exception.xml
index 5bcff61f2..d444b21e4 100644
--- a/reference/swoole/swoole.coroutine.mysql.exception.xml
+++ b/reference/swoole/swoole.coroutine.mysql.exception.xml
@@ -32,16 +32,16 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/swoole/swoole.exception.xml b/reference/swoole/swoole.exception.xml
index 38bf56259..66e3e057f 100644
--- a/reference/swoole/swoole.exception.xml
+++ b/reference/swoole/swoole.exception.xml
@@ -32,16 +32,16 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/swoole/swoole.mysql.exception.xml b/reference/swoole/swoole.mysql.exception.xml
index d28af0064..010f9054c 100644
--- a/reference/swoole/swoole.mysql.exception.xml
+++ b/reference/swoole/swoole.mysql.exception.xml
@@ -32,16 +32,16 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
 
    </classsynopsis>
diff --git a/reference/swoole/swoole.table.xml b/reference/swoole/swoole.table.xml
index 28d54f8bd..54a35f111 100644
--- a/reference/swoole/swoole.table.xml
+++ b/reference/swoole/swoole.table.xml
@@ -31,11 +31,11 @@
      </ooclass>
 
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/swoole/swoole.timer.xml b/reference/swoole/swoole.timer.xml
index d39a63a9b..5d5b7af3c 100644
--- a/reference/swoole/swoole.timer.xml
+++ b/reference/swoole/swoole.timer.xml
@@ -26,7 +26,7 @@
    <para>
     The underlying system does not support timers with a delay of <literal>0</literal>;
     values below <literal>1</literal> millisecond emit an
-    <constant>E_WARNING</constant> and the call fails. This differs from
+    <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> and the call fails. This differs from
     languages such as Node.js.
     <methodname linkend="swoole-event.defer">Swoole\Event::defer</methodname>
     may be used to achieve similar functionality.
diff --git a/reference/swoole/swoole/timer/after.xml b/reference/swoole/swoole/timer/after.xml
index 7cb5d35b9..26e3b9d66 100644
--- a/reference/swoole/swoole/timer/after.xml
+++ b/reference/swoole/swoole/timer/after.xml
@@ -17,7 +17,7 @@
   </methodsynopsis>
   <simpara>
    Creates a one-shot timer, which is destroyed once its callback has run.
-   Unlike <function>sleep</function>, it does not block the current process.
+   Unlike <function xlink:href="&url.php.manual.function.sleep;">sleep</function>, it does not block the current process.
   </simpara>
  </refsect1>
 
@@ -29,7 +29,7 @@
     <listitem>
      <simpara>
       The delay in milliseconds. Must be greater than or equal to
-      <literal>1</literal>; a lower value emits an <constant>E_WARNING</constant>
+      <literal>1</literal>; a lower value emits an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant>
       and the call fails.
      </simpara>
     </listitem>
diff --git a/reference/swoole/swoole/timer/list.xml b/reference/swoole/swoole/timer/list.xml
index fce061baf..48a483138 100644
--- a/reference/swoole/swoole/timer/list.xml
+++ b/reference/swoole/swoole/timer/list.xml
@@ -24,7 +24,7 @@
   &reftitle.returnvalues;
   <simpara>
    Returns a <classname>Swoole\Timer\Iterator</classname> object, which
-   extends <classname>ArrayIterator</classname> and yields the timer IDs as
+   extends <classname xlink:href="&url.php.manual.class.arrayiterator;">ArrayIterator</classname> and yields the timer IDs as
    <type>int</type> values. The iterator is a snapshot taken when the method is
    called; it is empty when no timer exists.
   </simpara>
diff --git a/reference/swoole/swoole/timer/tick.xml b/reference/swoole/swoole/timer/tick.xml
index 5c8a20bca..28b3ea349 100644
--- a/reference/swoole/swoole/timer/tick.xml
+++ b/reference/swoole/swoole/timer/tick.xml
@@ -31,7 +31,7 @@
     <listitem>
      <simpara>
       The interval in milliseconds. Must be greater than or equal to
-      <literal>1</literal>; a lower value emits an <constant>E_WARNING</constant>
+      <literal>1</literal>; a lower value emits an <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant>
       and the call fails.
      </simpara>
     </listitem>
diff --git a/reference/taint/book.xml b/reference/taint/book.xml
index 74ead3a78..ba046e71c 100644
--- a/reference/taint/book.xml
+++ b/reference/taint/book.xml
@@ -15,8 +15,8 @@
   </simpara>
   <simpara>
    When taint is enabled, strings received from user input —
-   <varname>$_GET</varname>, <varname>$_POST</varname> and
-   <varname>$_COOKIE</varname> — are marked as tainted at request startup,
+   <varname xlink:href="&url.php.manual.reserved.variables.get;">$_GET</varname>, <varname xlink:href="&url.php.manual.reserved.variables.post;">$_POST</varname> and
+   <varname xlink:href="&url.php.manual.reserved.variables.cookies;">$_COOKIE</varname> — are marked as tainted at request startup,
    and the mark is tracked through string operations. When a tainted
    string reaches a dangerous sink (output, SQL query, shell command,
    file path, ...), taint raises a warning pointing at that spot. See
diff --git a/reference/taint/detail.xml b/reference/taint/detail.xml
index 1c2cc8e0f..fcc7fb066 100644
--- a/reference/taint/detail.xml
+++ b/reference/taint/detail.xml
@@ -45,28 +45,28 @@
     <tgroup cols="1">
      <tbody>
       <row>
-       <entry><function>trim</function>, <function>rtrim</function>, <function>ltrim</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.trim;">trim</function>, <function xlink:href="&url.php.manual.function.rtrim;">rtrim</function>, <function xlink:href="&url.php.manual.function.ltrim;">ltrim</function></entry>
       </row>
       <row>
-       <entry><function>substr</function>, <function>strstr</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.substr;">substr</function>, <function xlink:href="&url.php.manual.function.strstr;">strstr</function></entry>
       </row>
       <row>
-       <entry><function>str_replace</function>, <function>str_ireplace</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.str-replace;">str_replace</function>, <function xlink:href="&url.php.manual.function.str-ireplace;">str_ireplace</function></entry>
       </row>
       <row>
-       <entry><function>str_pad</function>, <function>strtolower</function>, <function>strtoupper</function>, <function>strval</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.str-pad;">str_pad</function>, <function xlink:href="&url.php.manual.function.strtolower;">strtolower</function>, <function xlink:href="&url.php.manual.function.strtoupper;">strtoupper</function>, <function xlink:href="&url.php.manual.function.strval;">strval</function></entry>
       </row>
       <row>
-       <entry><function>explode</function> (every element of the resulting array)</entry>
+       <entry><function xlink:href="&url.php.manual.function.explode;">explode</function> (every element of the resulting array)</entry>
       </row>
       <row>
-       <entry><function>implode</function>/<function>join</function> (a tainted separator taints the result as well)</entry>
+       <entry><function xlink:href="&url.php.manual.function.implode;">implode</function>/<function xlink:href="&url.php.manual.function.join;">join</function> (a tainted separator taints the result as well)</entry>
       </row>
       <row>
-       <entry><function>sprintf</function>, <function>vsprintf</function> (only the <literal>%s</literal> specifier carries the mark; <literal>sprintf("%d", $t)</literal> returns a clean string)</entry>
+       <entry><function xlink:href="&url.php.manual.function.sprintf;">sprintf</function>, <function xlink:href="&url.php.manual.function.vsprintf;">vsprintf</function> (only the <literal>%s</literal> specifier carries the mark; <literal>sprintf("%d", $t)</literal> returns a clean string)</entry>
       </row>
       <row>
-       <entry><function>dirname</function>, <function>basename</function>, <function>pathinfo</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.dirname;">dirname</function>, <function xlink:href="&url.php.manual.function.basename;">basename</function>, <function xlink:href="&url.php.manual.function.pathinfo;">pathinfo</function></entry>
       </row>
      </tbody>
     </tgroup>
@@ -75,7 +75,7 @@
   <simpara>
    Any function taint does not explicitly understand returns a fresh,
    unmarked string — including escaping helpers such as
-   <function>htmlspecialchars</function>, <function>htmlentities</function> or
+   <function xlink:href="&url.php.manual.function.htmlspecialchars;">htmlspecialchars</function>, <function xlink:href="&url.php.manual.function.htmlentities;">htmlentities</function> or
    <function>mysqli_real_escape_string</function>. This is deliberate: taint
    over-reports rather than trying to decide whether a value is
    <quote>safe</quote> for a particular output context. Use
@@ -88,7 +88,7 @@
   <title>Where taint raises warnings</title>
   <simpara>
    When a tainted string reaches one of the sinks below, taint raises a
-   warning (by default an <constant>E_USER_WARNING</constant>; the level is
+   warning (by default an <constant xlink:href="&url.php.manual.constant.e-user-warning;">E_USER_WARNING</constant>; the level is
    configurable via <link linkend="ini.taint.error-level">taint.error_level</link>).
    Only top-level string arguments are inspected; dumping an array that
    merely contains tainted values does not warn.
@@ -106,11 +106,11 @@
        <entry>the echoed/printed expression</entry>
       </row>
       <row>
-       <entry><function>printf</function>, <function>vprintf</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.printf;">printf</function>, <function xlink:href="&url.php.manual.function.vprintf;">vprintf</function></entry>
        <entry>the format string and the substituted values</entry>
       </row>
       <row>
-       <entry><function>print_r</function>, <function>var_dump</function>, <function>var_export</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.print-r;">print_r</function>, <function xlink:href="&url.php.manual.function.var-dump;">var_dump</function>, <function xlink:href="&url.php.manual.function.var-export;">var_export</function></entry>
        <entry>the value being dumped, when it is a string</entry>
       </row>
       <row>
@@ -118,7 +118,7 @@
        <entry>the message</entry>
       </row>
       <row>
-       <entry><function>file_put_contents</function>, <function>fwrite</function>, <function>fputs</function> to <literal>php://output</literal></entry>
+       <entry><function xlink:href="&url.php.manual.function.file-put-contents;">file_put_contents</function>, <function xlink:href="&url.php.manual.function.fwrite;">fwrite</function>, <function xlink:href="&url.php.manual.function.fputs;">fputs</function> to <literal>php://output</literal></entry>
        <entry>the data being written</entry>
       </row>
      </tbody>
@@ -134,19 +134,19 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>fopen</function>, <function>opendir</function>, <function>unlink</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.fopen;">fopen</function>, <function xlink:href="&url.php.manual.function.opendir;">opendir</function>, <function xlink:href="&url.php.manual.function.unlink;">unlink</function></entry>
        <entry>the path</entry>
       </row>
       <row>
-       <entry><function>file</function>, <function>readfile</function>, <function>file_get_contents</function>, <function>highlight_file</function>/<function>show_source</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.file;">file</function>, <function xlink:href="&url.php.manual.function.readfile;">readfile</function>, <function xlink:href="&url.php.manual.function.file-get-contents;">file_get_contents</function>, <function xlink:href="&url.php.manual.function.highlight-file;">highlight_file</function>/<function xlink:href="&url.php.manual.function.show-source;">show_source</function></entry>
        <entry>the path</entry>
       </row>
       <row>
-       <entry><function>copy</function>, <function>rename</function>, <function>move_uploaded_file</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.copy;">copy</function>, <function xlink:href="&url.php.manual.function.rename;">rename</function>, <function xlink:href="&url.php.manual.function.move-uploaded-file;">move_uploaded_file</function></entry>
        <entry>both the source and destination paths</entry>
       </row>
       <row>
-       <entry><function>mkdir</function>, <function>rmdir</function>, <function>touch</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.mkdir;">mkdir</function>, <function xlink:href="&url.php.manual.function.rmdir;">rmdir</function>, <function xlink:href="&url.php.manual.function.touch;">touch</function></entry>
        <entry>the path</entry>
       </row>
       <row>
@@ -170,19 +170,19 @@
        <entry>the query string</entry>
       </row>
       <row>
-       <entry><function>mysql_query</function>, <function>sqlite_query</function>, <function>sqlite_single_query</function>, <function>oci_parse</function>, <function>pg_query</function>, <function>pg_send_query</function></entry>
+       <entry><function>mysql_query</function>, <function>sqlite_query</function>, <function>sqlite_single_query</function>, <function xlink:href="&url.php.manual.function.oci-parse;">oci_parse</function>, <function xlink:href="&url.php.manual.function.pg-query;">pg_query</function>, <function xlink:href="&url.php.manual.function.pg-send-query;">pg_send_query</function></entry>
        <entry>the query string</entry>
       </row>
       <row>
-       <entry><methodname>mysqli::query</methodname>, <methodname>mysqli::prepare</methodname>, <methodname>mysqli::real_query</methodname>, <methodname>mysqli::multi_query</methodname></entry>
+       <entry><methodname xlink:href="&url.php.manual.mysqli.query;">mysqli::query</methodname>, <methodname xlink:href="&url.php.manual.mysqli.prepare;">mysqli::prepare</methodname>, <methodname xlink:href="&url.php.manual.mysqli.real-query;">mysqli::real_query</methodname>, <methodname xlink:href="&url.php.manual.mysqli.multi-query;">mysqli::multi_query</methodname></entry>
        <entry>the query string</entry>
       </row>
       <row>
-       <entry><methodname>PDO::query</methodname>, <methodname>PDO::prepare</methodname>, <methodname>PDO::exec</methodname></entry>
+       <entry><methodname xlink:href="&url.php.manual.pdo.query;">PDO::query</methodname>, <methodname xlink:href="&url.php.manual.pdo.prepare;">PDO::prepare</methodname>, <methodname xlink:href="&url.php.manual.pdo.exec;">PDO::exec</methodname></entry>
        <entry>the query string</entry>
       </row>
       <row>
-       <entry><methodname>SQLite3::query</methodname>, <methodname>SQLite3::prepare</methodname>, <methodname>SQLite3::exec</methodname>, <methodname>SQLiteDatabase::query</methodname>, <methodname>SQLiteDatabase::singleQuery</methodname></entry>
+       <entry><methodname xlink:href="&url.php.manual.sqlite3.query;">SQLite3::query</methodname>, <methodname xlink:href="&url.php.manual.sqlite3.prepare;">SQLite3::prepare</methodname>, <methodname xlink:href="&url.php.manual.sqlite3.exec;">SQLite3::exec</methodname>, <methodname>SQLiteDatabase::query</methodname>, <methodname>SQLiteDatabase::singleQuery</methodname></entry>
        <entry>the query string</entry>
       </row>
      </tbody>
@@ -198,11 +198,11 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>exec</function>, <function>system</function>, <function>passthru</function>, <function>shell_exec</function> (including the backtick operator)</entry>
+       <entry><function xlink:href="&url.php.manual.function.exec;">exec</function>, <function xlink:href="&url.php.manual.function.system;">system</function>, <function xlink:href="&url.php.manual.function.passthru;">passthru</function>, <function xlink:href="&url.php.manual.function.shell-exec;">shell_exec</function> (including the backtick operator)</entry>
        <entry>the command string</entry>
       </row>
       <row>
-       <entry><function>proc_open</function>, <function>popen</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.proc-open;">proc_open</function>, <function xlink:href="&url.php.manual.function.popen;">popen</function></entry>
        <entry>the command string</entry>
       </row>
       <row>
@@ -210,12 +210,12 @@
        <entry>the evaluated code</entry>
       </row>
       <row>
-       <entry>dynamic calls such as <literal>$func()</literal>, <literal>$obj-&gt;$method()</literal>, <function>call_user_func</function>, array callables</entry>
+       <entry>dynamic calls such as <literal>$func()</literal>, <literal>$obj-&gt;$method()</literal>, <function xlink:href="&url.php.manual.function.call-user-func;">call_user_func</function>, array callables</entry>
        <entry>the function/method/class name being resolved</entry>
       </row>
       <row>
-       <entry><function>preg_match</function>, <function>preg_match_all</function>, <function>preg_replace</function>, <function>preg_split</function>, <function>preg_grep</function>, <function>preg_replace_callback</function></entry>
-       <entry>the pattern (and the callback name for <function>preg_replace_callback</function>)</entry>
+       <entry><function xlink:href="&url.php.manual.function.preg-match;">preg_match</function>, <function xlink:href="&url.php.manual.function.preg-match-all;">preg_match_all</function>, <function xlink:href="&url.php.manual.function.preg-replace;">preg_replace</function>, <function xlink:href="&url.php.manual.function.preg-split;">preg_split</function>, <function xlink:href="&url.php.manual.function.preg-grep;">preg_grep</function>, <function xlink:href="&url.php.manual.function.preg-replace-callback;">preg_replace_callback</function></entry>
+       <entry>the pattern (and the callback name for <function xlink:href="&url.php.manual.function.preg-replace-callback;">preg_replace_callback</function>)</entry>
       </row>
      </tbody>
     </tgroup>
@@ -230,11 +230,11 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>header</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.header;">header</function></entry>
        <entry>the header string</entry>
       </row>
       <row>
-       <entry><function>setcookie</function>, <function>setrawcookie</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.setcookie;">setcookie</function>, <function xlink:href="&url.php.manual.function.setrawcookie;">setrawcookie</function></entry>
        <entry>the cookie name and value</entry>
       </row>
      </tbody>
@@ -250,11 +250,11 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>unserialize</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.unserialize;">unserialize</function></entry>
        <entry>the serialized string</entry>
       </row>
       <row>
-       <entry><function>mail</function></entry>
+       <entry><function xlink:href="&url.php.manual.function.mail;">mail</function></entry>
        <entry>to, subject, additional parameters and additional headers (the message body is content and is not checked)</entry>
       </row>
      </tbody>
diff --git a/reference/taint/ini.xml b/reference/taint/ini.xml
index 8e2b3824e..7687c989e 100644
--- a/reference/taint/ini.xml
+++ b/reference/taint/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="taint.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="taint.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,13 +20,13 @@
      <row>
       <entry><link linkend="ini.taint.enable">taint.enable</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.taint.error-level">taint.error_level</link></entry>
       <entry>512 (E_USER_WARNING)</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
@@ -46,8 +46,8 @@
      <listitem>
       <simpara>
        Master switch. When enabled, taint hooks the executor and marks
-       strings from <varname>$_GET</varname>, <varname>$_POST</varname> and
-       <varname>$_COOKIE</varname> as tainted at request startup.
+       strings from <varname xlink:href="&url.php.manual.reserved.variables.get;">$_GET</varname>, <varname xlink:href="&url.php.manual.reserved.variables.post;">$_POST</varname> and
+       <varname xlink:href="&url.php.manual.reserved.variables.cookies;">$_COOKIE</varname> as tainted at request startup.
       </simpara>
       <simpara>
        This is an &php.ini;-only directive: enabling it requires a process
@@ -70,10 +70,10 @@
      <listitem>
       <simpara>
        The error level used when taint reports a possibly tainted string.
-       Defaults to <constant>E_USER_WARNING</constant> (512).
+       Defaults to <constant xlink:href="&url.php.manual.constant.e-user-warning;">E_USER_WARNING</constant> (512).
       </simpara>
       <simpara>
-       Because this directive is <constant>INI_ALL</constant>, it can be
+       Because this directive is <constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant>, it can be
        changed at runtime. For example, to silence taint warnings for the
        current script:
       </simpara>
diff --git a/reference/trader/ini.xml b/reference/trader/ini.xml
index 49e83dc02..91b4427e8 100644
--- a/reference/trader/ini.xml
+++ b/reference/trader/ini.xml
@@ -20,13 +20,13 @@
      <row>
       <entry><link linkend="ini.trader.real-precision">trader.real_precision</link></entry>
       <entry>3</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Since trader 0.2.1</entry>
      </row>
      <row>
       <entry><link linkend="ini.trader.real-round-mode">trader.real_round_mode</link></entry>
       <entry>HALF_DOWN</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Since trader 0.3.0</entry>
      </row>
     </tbody>
diff --git a/reference/ui/ui.exception.invalidargumentexception.xml b/reference/ui/ui.exception.invalidargumentexception.xml
index 434da197d..dfb8b58fb 100644
--- a/reference/ui/ui.exception.invalidargumentexception.xml
+++ b/reference/ui/ui.exception.invalidargumentexception.xml
@@ -32,19 +32,19 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>InvalidArgumentException</classname>
+      <classname xlink:href="&url.php.manual.class.invalidargumentexception;">InvalidArgumentException</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/ui/ui.exception.runtimeexception.xml b/reference/ui/ui.exception.runtimeexception.xml
index 89f379417..0e3316efb 100644
--- a/reference/ui/ui.exception.runtimeexception.xml
+++ b/reference/ui/ui.exception.runtimeexception.xml
@@ -32,19 +32,19 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
+      <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
      </ooclass>
      
      <oointerface>
-      <interfacename>Throwable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.throwable;">Throwable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/uopz/functions/uopz-add-function.xml b/reference/uopz/functions/uopz-add-function.xml
index 86b4f3525..f87ade909 100644
--- a/reference/uopz/functions/uopz-add-function.xml
+++ b/reference/uopz/functions/uopz-add-function.xml
@@ -12,14 +12,14 @@
   <methodsynopsis role="procedural">
    <type>bool</type><methodname>uopz_add_function</methodname>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>handler</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter role="reference">flags</parameter><initializer>ZEND_ACC_PUBLIC</initializer></methodparam>
   </methodsynopsis>
   <methodsynopsis role="procedural">
    <type>bool</type><methodname>uopz_add_function</methodname>
    <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>handler</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter role="reference">flags</parameter><initializer>ZEND_ACC_PUBLIC</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter role="reference">all</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
@@ -51,7 +51,7 @@
     <term><parameter>handler</parameter></term>
     <listitem>
      <para>
-      The <classname>Closure</classname> that defines the new function or method.
+      The <classname xlink:href="&url.php.manual.class.closure;">Closure</classname> that defines the new function or method.
      </para>
     </listitem>
    </varlistentry>
@@ -85,7 +85,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <function>uopz_add_function</function> throws a <classname>RuntimeException</classname>
+   <function>uopz_add_function</function> throws a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
    if the function or method to add already exists.
   </para>
  </refsect1>
diff --git a/reference/uopz/functions/uopz-allow-exit.xml b/reference/uopz/functions/uopz-allow-exit.xml
index 9039fcf4e..f95cc9261 100644
--- a/reference/uopz/functions/uopz-allow-exit.xml
+++ b/reference/uopz/functions/uopz-allow-exit.xml
@@ -14,7 +14,7 @@
    <methodparam><type>bool</type><parameter>allow</parameter></methodparam>
   </methodsynopsis>
   <para>
-   By default uopz disables the exit opcode, so <function>exit</function> calls
+   By default uopz disables the exit opcode, so <function xlink:href="&url.php.manual.function.exit;">exit</function> calls
    are practically ignored. <function>uopz_allow_exit</function>
    allows to control this behavior.
   </para>
diff --git a/reference/uopz/functions/uopz-copy.xml b/reference/uopz/functions/uopz-copy.xml
index ea9e85a69..105d639fc 100644
--- a/reference/uopz/functions/uopz-copy.xml
+++ b/reference/uopz/functions/uopz-copy.xml
@@ -14,11 +14,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>Closure</type><methodname>uopz_copy</methodname>
+   <type xlink:href="&url.php.manual.class.closure;">Closure</type><methodname>uopz_copy</methodname>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis>
-   <type>Closure</type><methodname>uopz_copy</methodname>
+   <type xlink:href="&url.php.manual.class.closure;">Closure</type><methodname>uopz_copy</methodname>
    <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/uopz/functions/uopz-del-function.xml b/reference/uopz/functions/uopz-del-function.xml
index 4215982be..f1193ad91 100644
--- a/reference/uopz/functions/uopz-del-function.xml
+++ b/reference/uopz/functions/uopz-del-function.xml
@@ -65,7 +65,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <function>uopz_del_function</function> throws a <classname>RuntimeException</classname>
+   <function>uopz_del_function</function> throws a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
    if the function or method to delete has not been added by <function>uopz_add_function</function>.
   </para>
  </refsect1>
diff --git a/reference/uopz/functions/uopz-extend.xml b/reference/uopz/functions/uopz-extend.xml
index aeaede09f..c00fb7019 100644
--- a/reference/uopz/functions/uopz-extend.xml
+++ b/reference/uopz/functions/uopz-extend.xml
@@ -51,7 +51,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   As of PHP 7.4.0, <function>uopz_extend</function> throws a <classname>RuntimeException</classname>,
+   As of PHP 7.4.0, <function>uopz_extend</function> throws a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>,
    if <link xlink:href="&url.php.manual.book.opcache;">OPcache</link> is enabled,
    and the class entry of either <parameter>class</parameter>
    or <parameter>parent</parameter> (if it is a trait) is immutable.
diff --git a/reference/uopz/functions/uopz-flags.xml b/reference/uopz/functions/uopz-flags.xml
index aa37db539..cdacf5bbf 100644
--- a/reference/uopz/functions/uopz-flags.xml
+++ b/reference/uopz/functions/uopz-flags.xml
@@ -70,7 +70,7 @@
   &reftitle.errors;
   <simpara>
    As of PHP 7.4.0, if the parameter <parameter>flags</parameter> is passed,
-   <function>uopz_flags</function> throws a <classname>RuntimeException</classname>,
+   <function>uopz_flags</function> throws a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>,
    if <link xlink:href="&url.php.manual.book.opcache;">OPcache</link> is enabled,
    and the class entry of <parameter>class</parameter>
    or the function entry of <parameter>function</parameter> is immutable.
diff --git a/reference/uopz/functions/uopz-function.xml b/reference/uopz/functions/uopz-function.xml
index 79b208885..0da6c34ab 100644
--- a/reference/uopz/functions/uopz-function.xml
+++ b/reference/uopz/functions/uopz-function.xml
@@ -16,14 +16,14 @@
   <methodsynopsis>
    <type>void</type><methodname>uopz_function</methodname>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>handler</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>modifiers</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis>
    <type>void</type><methodname>uopz_function</methodname>
    <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>handler</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>modifiers</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/uopz/functions/uopz-get-exit-status.xml b/reference/uopz/functions/uopz-get-exit-status.xml
index 7833874ee..5ce92d561 100644
--- a/reference/uopz/functions/uopz-get-exit-status.xml
+++ b/reference/uopz/functions/uopz-get-exit-status.xml
@@ -15,7 +15,7 @@
   </methodsynopsis>
   <para>
    Retrieves the last set exit status, i.e. the value passed to
-   <function>exit</function>.
+   <function xlink:href="&url.php.manual.function.exit;">exit</function>.
   </para>
  </refsect1><!-- }}} -->
 
@@ -27,7 +27,7 @@
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
   <para>
-   This function returns the last exit status, or &null; if <function>exit</function>
+   This function returns the last exit status, or &null; if <function xlink:href="&url.php.manual.function.exit;">exit</function>
    has not been called.
   </para>
  </refsect1><!-- }}} -->
diff --git a/reference/uopz/functions/uopz-get-hook.xml b/reference/uopz/functions/uopz-get-hook.xml
index 2b3bc2385..718f95f4b 100644
--- a/reference/uopz/functions/uopz-get-hook.xml
+++ b/reference/uopz/functions/uopz-get-hook.xml
@@ -10,11 +10,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="procedural">
-   <type>Closure</type><methodname>uopz_get_hook</methodname>
+   <type xlink:href="&url.php.manual.class.closure;">Closure</type><methodname>uopz_get_hook</methodname>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis role="procedural">
-   <type>Closure</type><methodname>uopz_get_hook</methodname>
+   <type xlink:href="&url.php.manual.class.closure;">Closure</type><methodname>uopz_get_hook</methodname>
    <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/uopz/functions/uopz-get-static.xml b/reference/uopz/functions/uopz-get-static.xml
index 93ce34b94..c1d885e2c 100644
--- a/reference/uopz/functions/uopz-get-static.xml
+++ b/reference/uopz/functions/uopz-get-static.xml
@@ -88,7 +88,7 @@ array(1) {
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member><methodname>ReflectionFunctionAbstract::getStaticVariables</methodname></member>
+   <member><methodname xlink:href="&url.php.manual.reflectionfunctionabstract.getstaticvariables;">ReflectionFunctionAbstract::getStaticVariables</methodname></member>
    <member><function>uopz_set_static</function></member>
   </simplelist>
  </refsect1>
diff --git a/reference/uopz/functions/uopz-implement.xml b/reference/uopz/functions/uopz-implement.xml
index fc8722d0c..6ad4a3b42 100644
--- a/reference/uopz/functions/uopz-implement.xml
+++ b/reference/uopz/functions/uopz-implement.xml
@@ -52,7 +52,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   As of PHP 7.4.0, <function>uopz_implement</function> throws a <classname>RuntimeException</classname>,
+   As of PHP 7.4.0, <function>uopz_implement</function> throws a <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>,
    if <link xlink:href="&url.php.manual.book.opcache;">OPcache</link> is enabled,
    and the class entry of <parameter>class</parameter> is immutable.
   </simpara>
diff --git a/reference/uopz/functions/uopz-set-hook.xml b/reference/uopz/functions/uopz-set-hook.xml
index 6cf4041c6..9ded4386f 100644
--- a/reference/uopz/functions/uopz-set-hook.xml
+++ b/reference/uopz/functions/uopz-set-hook.xml
@@ -12,13 +12,13 @@
   <methodsynopsis role="procedural">
    <type>bool</type><methodname>uopz_set_hook</methodname>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>hook</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>hook</parameter></methodparam>
   </methodsynopsis>
   <methodsynopsis role="procedural">
    <type>bool</type><methodname>uopz_set_hook</methodname>
    <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>hook</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.closure;">Closure</type><parameter>hook</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets a hook to execute when entering a function or method.
diff --git a/reference/uopz/functions/uopz-unset-mock.xml b/reference/uopz/functions/uopz-unset-mock.xml
index fc83562a0..4237f6c1e 100644
--- a/reference/uopz/functions/uopz-unset-mock.xml
+++ b/reference/uopz/functions/uopz-unset-mock.xml
@@ -42,7 +42,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>RuntimeException</classname> is thrown, if no mock was previously
+   A <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname> is thrown, if no mock was previously
    set for <parameter>class</parameter>.
   </para>
  </refsect1>
diff --git a/reference/uopz/setup.xml b/reference/uopz/setup.xml
index 2eb2c9891..d8243853f 100644
--- a/reference/uopz/setup.xml
+++ b/reference/uopz/setup.xml
@@ -48,19 +48,19 @@
       <row>
        <entry><link linkend="ini.uopz.disable">uopz.disable</link></entry>
        <entry>"0"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
+       <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
        <entry>Available as of uopz 5.0.2</entry>
       </row>
       <row>
        <entry><link linkend="ini.uopz.exit">uopz.exit</link></entry>
        <entry>"0"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
+       <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
        <entry>Available as of uopz 6.0.1</entry>
       </row>
       <row>
        <entry><link linkend="ini.uopz.overloads">uopz.overloads</link></entry>
        <entry>"1"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
+       <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
        <entry>Available as of uopz 2.0.2. Removed as of uopz 5.0.0.</entry>
       </row>
      </tbody>
diff --git a/reference/v8js/ini.xml b/reference/v8js/ini.xml
index 636ece675..1287ecc88 100644
--- a/reference/v8js/ini.xml
+++ b/reference/v8js/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="v8js.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="v8js.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,13 +20,13 @@
      <row>
       <entry><link linkend="ini.v8js.max-disposed-contexts">v8js.max_disposed_contexts</link></entry>
       <entry>25</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.v8js.flags">v8js.flags</link></entry>
       <entry></entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
diff --git a/reference/v8js/v8jsexception.xml b/reference/v8js/v8jsexception.xml
index 4e5cb3c7c..e7e1be0fa 100644
--- a/reference/v8js/v8jsexception.xml
+++ b/reference/v8js/v8jsexception.xml
@@ -32,7 +32,7 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -55,13 +55,13 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.v8jsexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/var_representation/book.xml b/reference/var_representation/book.xml
index 3ba88d19a..83128e982 100644
--- a/reference/var_representation/book.xml
+++ b/reference/var_representation/book.xml
@@ -7,7 +7,7 @@
  <preface xml:id="intro.var_representation">
   &reftitle.intro;
   <simpara>
-   The var_representation extension provides a compact alternative to <function>var_export</function> that properly escapes control characters.
+   The var_representation extension provides a compact alternative to <function xlink:href="&url.php.manual.function.var-export;">var_export</function> that properly escapes control characters.
   </simpara>
  </preface>
 
diff --git a/reference/var_representation/functions/var-representation.xml b/reference/var_representation/functions/var-representation.xml
index 92dfd18e3..470d2a954 100644
--- a/reference/var_representation/functions/var-representation.xml
+++ b/reference/var_representation/functions/var-representation.xml
@@ -14,7 +14,7 @@
   </methodsynopsis>
   <simpara>
    <function>var_representation</function> (from the var_representation PECL) returns a string with structured information about the 
-   given variable. It is similar to <function>var_export</function> with differences in indentation, string escaping, and array representations.
+   given variable. It is similar to <function xlink:href="&url.php.manual.function.var-export;">var_export</function> with differences in indentation, string escaping, and array representations.
   </simpara>
  </refsect1>
 
@@ -99,7 +99,7 @@ echo var_representation("Content-Length: 123\r\n");
   </para>
   <para>
    <example>
-    <title>Exporting <classname>stdClass</classname></title>
+    <title>Exporting <classname xlink:href="&url.php.manual.class.stdclass;">stdClass</classname></title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -195,7 +195,7 @@ object(A)#2 (2) {
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>var_export</function></member>
+    <member><function xlink:href="&url.php.manual.function.var-export;">var_export</function></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/varnish/varnishexception.xml b/reference/varnish/varnishexception.xml
index 008f90297..b626ffe98 100644
--- a/reference/varnish/varnishexception.xml
+++ b/reference/varnish/varnishexception.xml
@@ -32,15 +32,15 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/wddx/book.xml b/reference/wddx/book.xml
index a28344adf..1b3d49404 100644
--- a/reference/wddx/book.xml
+++ b/reference/wddx/book.xml
@@ -22,7 +22,7 @@
     Unserialization can result in code being loaded and executed due to object
     instantiation and autoloading, and a malicious user may be able to exploit
     this. Use a safe, standard data interchange format such as JSON (via
-    <function>json_decode</function> and <function>json_encode</function>) if
+    <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> and <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function>) if
     you need to pass serialized data to the user.
    </para>
   </warning>
diff --git a/reference/wddx/examples.xml b/reference/wddx/examples.xml
index 8a595728a..de8bf7d8e 100644
--- a/reference/wddx/examples.xml
+++ b/reference/wddx/examples.xml
@@ -67,8 +67,8 @@ echo $packet;
   <note>
    <para>
     Strings should be encoded in UTF-8; to handle other encodings, convert
-    the string first using <function>mb_convert_encoding</function>,
-    <methodname>UConverter::transcode</methodname>, or <function>iconv</function>.
+    the string first using <function xlink:href="&url.php.manual.function.mb-convert-encoding;">mb_convert_encoding</function>,
+    <methodname xlink:href="&url.php.manual.uconverter.transcode;">UConverter::transcode</methodname>, or <function xlink:href="&url.php.manual.function.iconv;">iconv</function>.
    </para>
   </note>
  </section>
diff --git a/reference/wddx/functions/wddx-deserialize.xml b/reference/wddx/functions/wddx-deserialize.xml
index 79b516f4c..b917c920b 100644
--- a/reference/wddx/functions/wddx-deserialize.xml
+++ b/reference/wddx/functions/wddx-deserialize.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.wddx-deserialize" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.wddx-deserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>wddx_deserialize</refname>
   <refpurpose>Unserializes a WDDX packet</refpurpose>
@@ -25,7 +25,7 @@
     Unserialization can result in code being loaded and executed due to object
     instantiation and autoloading, and a malicious user may be able to exploit
     this. Use a safe, standard data interchange format such as JSON (via
-    <function>json_decode</function> and <function>json_encode</function>) if
+    <function xlink:href="&url.php.manual.function.json-decode;">json_decode</function> and <function xlink:href="&url.php.manual.function.json-encode;">json_encode</function>) if
     you need to pass serialized data to the user.
    </para>
   </warning>
diff --git a/reference/win32service/functions/win32-add-right-access-service.xml b/reference/win32service/functions/win32-add-right-access-service.xml
index e84d0afc7..87deefae1 100644
--- a/reference/win32service/functions/win32-add-right-access-service.xml
+++ b/reference/win32service/functions/win32-add-right-access-service.xml
@@ -74,11 +74,11 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>username</parameter> parameter is empty.
   </para>
   <para>
diff --git a/reference/win32service/functions/win32-add-service-env-var.xml b/reference/win32service/functions/win32-add-service-env-var.xml
index 7e74e366a..076172381 100644
--- a/reference/win32service/functions/win32-add-service-env-var.xml
+++ b/reference/win32service/functions/win32-add-service-env-var.xml
@@ -63,11 +63,11 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>varname</parameter> parameter is empty.
   </para>
   <para>
diff --git a/reference/win32service/functions/win32-continue-service.xml b/reference/win32service/functions/win32-continue-service.xml
index 1cbe70a50..d40be7a18 100644
--- a/reference/win32service/functions/win32-continue-service.xml
+++ b/reference/win32service/functions/win32-continue-service.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-continue-service" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-continue-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_continue_service</refname>
   <refpurpose>Resumes a paused service</refpurpose>
@@ -57,7 +57,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>servicename</parameter> parameter is empty.
   </para>
    <para>
@@ -80,7 +80,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-create-service.xml b/reference/win32service/functions/win32-create-service.xml
index 8b0af1524..66c4a39d9 100644
--- a/reference/win32service/functions/win32-create-service.xml
+++ b/reference/win32service/functions/win32-create-service.xml
@@ -305,48 +305,48 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>path</parameter> parameter is missing or empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>svc_type</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>start_type</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>error_control</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>base_priority</parameter> parameter  is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>recovery_delay</parameter> parameter is not between 
    0 and PHP_INT_MAX.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>recovery_action_1</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>recovery_action_2</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>recovery_action_3</parameter> parameter is wrong.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>recovery_reset_period</parameter> parameter is not 
    between 0 and PHP_INT_MAX.
   </para>
@@ -370,7 +370,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-delete-service.xml b/reference/win32service/functions/win32-delete-service.xml
index 380ff4262..97d14990f 100644
--- a/reference/win32service/functions/win32-delete-service.xml
+++ b/reference/win32service/functions/win32-delete-service.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-delete-service" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-delete-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_delete_service</refname>
   <refpurpose>Deletes a service entry from the SCM database</refpurpose>
@@ -65,7 +65,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-    A <classname>ValueError</classname> is thrown if the
+    A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
 
@@ -89,7 +89,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-get-last-control-message.xml b/reference/win32service/functions/win32-get-last-control-message.xml
index 473d8945e..0d35ad453 100644
--- a/reference/win32service/functions/win32-get-last-control-message.xml
+++ b/reference/win32service/functions/win32-get-last-control-message.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.win32-get-last-control-message" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-get-last-control-message" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_get_last_control_message</refname>
   <refpurpose>Returns the last control message that was sent to this service</refpurpose>
@@ -62,7 +62,7 @@
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
-<constant>E_ERROR</constant> level error.
+<constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error.
   </para>
    <para>
     As of version 1.0.0, will throw a 
@@ -86,7 +86,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-get-service-env-vars.xml b/reference/win32service/functions/win32-get-service-env-vars.xml
index d435793a5..15dfecee7 100644
--- a/reference/win32service/functions/win32-get-service-env-vars.xml
+++ b/reference/win32service/functions/win32-get-service-env-vars.xml
@@ -45,7 +45,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
diff --git a/reference/win32service/functions/win32-pause-service.xml b/reference/win32service/functions/win32-pause-service.xml
index 9e3d13078..0ceb11f00 100644
--- a/reference/win32service/functions/win32-pause-service.xml
+++ b/reference/win32service/functions/win32-pause-service.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-pause-service" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-pause-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_pause_service</refname>
   <refpurpose>Pauses a service</refpurpose>
@@ -58,7 +58,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-    A <classname>ValueError</classname> is thrown if the
+    A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
 
@@ -82,7 +82,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-query-service-status.xml b/reference/win32service/functions/win32-query-service-status.xml
index 1a58ac640..92cef3937 100644
--- a/reference/win32service/functions/win32-query-service-status.xml
+++ b/reference/win32service/functions/win32-query-service-status.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-query-service-status" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-query-service-status" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_query_service_status</refname>
   <refpurpose>Queries the status of a service</refpurpose>
@@ -146,7 +146,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-    A <classname>ValueError</classname> is thrown if the
+    A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
  </refsect1><!-- }}} -->
@@ -166,7 +166,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-read-all-rights-access-service.xml b/reference/win32service/functions/win32-read-all-rights-access-service.xml
index 07681a7d3..87d251014 100644
--- a/reference/win32service/functions/win32-read-all-rights-access-service.xml
+++ b/reference/win32service/functions/win32-read-all-rights-access-service.xml
@@ -55,7 +55,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
diff --git a/reference/win32service/functions/win32-read-right-access-service.xml b/reference/win32service/functions/win32-read-right-access-service.xml
index 23da1a35d..5da069101 100644
--- a/reference/win32service/functions/win32-read-right-access-service.xml
+++ b/reference/win32service/functions/win32-read-right-access-service.xml
@@ -64,11 +64,11 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>username</parameter> parameter is empty.
   </para>
   <para>
diff --git a/reference/win32service/functions/win32-remove-right-access-service.xml b/reference/win32service/functions/win32-remove-right-access-service.xml
index cf1fc520f..8037b8f0f 100644
--- a/reference/win32service/functions/win32-remove-right-access-service.xml
+++ b/reference/win32service/functions/win32-remove-right-access-service.xml
@@ -64,11 +64,11 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>username</parameter> parameter is empty.
   </para>
   <para>
diff --git a/reference/win32service/functions/win32-remove-service-env-var.xml b/reference/win32service/functions/win32-remove-service-env-var.xml
index 459feecd5..bfdc0542b 100644
--- a/reference/win32service/functions/win32-remove-service-env-var.xml
+++ b/reference/win32service/functions/win32-remove-service-env-var.xml
@@ -54,11 +54,11 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>service</parameter> parameter is empty.
   </para>
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>varname</parameter> parameter is empty.
   </para>
   <para>
diff --git a/reference/win32service/functions/win32-send-custom-control.xml b/reference/win32service/functions/win32-send-custom-control.xml
index c86677f54..201c5759f 100644
--- a/reference/win32service/functions/win32-send-custom-control.xml
+++ b/reference/win32service/functions/win32-send-custom-control.xml
@@ -66,14 +66,14 @@
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the control value is not between 128 and 255, this function emits an
-   <constant>E_ERROR</constant> level error.
+   <constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error.
   </para>
   <para>
-    A <classname>ValueError</classname> is thrown if the
+    A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
     value of <parameter>servicename</parameter> parameter is empty.
   </para>
   <para>
-    A <classname>ValueError</classname> is thrown if the
+    A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
     value of <parameter>control</parameter> parameter is not between 128 and 255.
   </para>
    <para>
@@ -96,7 +96,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-set-service-exit-code.xml b/reference/win32service/functions/win32-set-service-exit-code.xml
index 166be1209..6a0a7d508 100644
--- a/reference/win32service/functions/win32-set-service-exit-code.xml
+++ b/reference/win32service/functions/win32-set-service-exit-code.xml
@@ -54,7 +54,7 @@
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an
-   <constant>E_ERROR</constant> level error.
+   <constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error.
   </para>
    <para>
     As of version 1.0.0, will throw a 
@@ -78,7 +78,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-set-service-exit-mode.xml b/reference/win32service/functions/win32-set-service-exit-mode.xml
index 2618d713f..b19e65ee2 100644
--- a/reference/win32service/functions/win32-set-service-exit-mode.xml
+++ b/reference/win32service/functions/win32-set-service-exit-mode.xml
@@ -52,7 +52,7 @@ with the <function>win32_set_service_exit_code</function> function.
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an
-   <constant>E_ERROR</constant> level error.
+   <constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error.
   </para>
 
    <para>
@@ -78,7 +78,7 @@ with the <function>win32_set_service_exit_code</function> function.
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-set-service-pause-resume-state.xml b/reference/win32service/functions/win32-set-service-pause-resume-state.xml
index 5d31e740c..69273da7d 100644
--- a/reference/win32service/functions/win32-set-service-pause-resume-state.xml
+++ b/reference/win32service/functions/win32-set-service-pause-resume-state.xml
@@ -51,7 +51,7 @@ is changed.
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an
-   <constant>E_ERROR</constant> level error.
+   <constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error.
   </para>
 
    <para>
@@ -77,7 +77,7 @@ is changed.
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-set-service-status.xml b/reference/win32service/functions/win32-set-service-status.xml
index 99b3151d1..59a84d1a8 100644
--- a/reference/win32service/functions/win32-set-service-status.xml
+++ b/reference/win32service/functions/win32-set-service-status.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-set-service-status" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-set-service-status" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_set_service_status</refname>
   <refpurpose>Update the service status</refpurpose>
@@ -82,7 +82,7 @@
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
-<constant>E_ERROR</constant> level error.
+<constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error.
   </para>
    <para>
     As of version 1.0.0, will throw a 
@@ -106,7 +106,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml b/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
index 8110a9ee1..c7a91acff 100644
--- a/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
+++ b/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-start-service-ctrl-dispatcher" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-start-service-ctrl-dispatcher" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_start_service_ctrl_dispatcher</refname>
   <refpurpose>Registers the script with the SCM, so that it can act as the service with the given name</refpurpose>
@@ -82,7 +82,7 @@
   &reftitle.errors;
   <para>
    Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
-   <constant>E_ERROR</constant> level error.
+   <constant xlink:href="&url.php.manual.constant.e-error;">E_ERROR</constant> level error.
   </para>
    <para>
     As of version 1.0.0, will throw a 
@@ -106,7 +106,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-start-service.xml b/reference/win32service/functions/win32-start-service.xml
index 74c9dabf1..7000d93d3 100644
--- a/reference/win32service/functions/win32-start-service.xml
+++ b/reference/win32service/functions/win32-start-service.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-start-service" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-start-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_start_service</refname>
   <refpurpose>Starts a service</refpurpose>
@@ -57,7 +57,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>servicename</parameter> parameter is empty.
   </para>
    <para>
@@ -80,7 +80,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/functions/win32-stop-service.xml b/reference/win32service/functions/win32-stop-service.xml
index 18b24139b..f9c2ca76b 100644
--- a/reference/win32service/functions/win32-stop-service.xml
+++ b/reference/win32service/functions/win32-stop-service.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="function.win32-stop-service" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.win32-stop-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>win32_stop_service</refname>
   <refpurpose>Stops a service</refpurpose>
@@ -57,7 +57,7 @@
  <refsect1 role="errors"><!-- {{{ -->
   &reftitle.errors;
   <para>
-   A <classname>ValueError</classname> is thrown if the
+   A <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> is thrown if the
    value of <parameter>servicename</parameter> parameter is empty.
   </para>
    <para>
@@ -80,7 +80,7 @@
       <row>
        <entry>PECL win32service 1.0.0</entry>
        <entry>
-        Throws a <classname>ValueError</classname> on invalid data in parameters,
+        Throws a <classname xlink:href="&url.php.manual.class.valueerror;">ValueError</classname> on invalid data in parameters,
         previously &false; was returned.
        </entry>
       </row>
diff --git a/reference/win32service/win32serviceexception.xml b/reference/win32service/win32serviceexception.xml
index 57d56dd22..ff264c9fd 100644
--- a/reference/win32service/win32serviceexception.xml
+++ b/reference/win32service/win32serviceexception.xml
@@ -38,13 +38,13 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
 <!-- Comment this section out if the exception does not contain any methods -->
 <!--
@@ -53,7 +53,7 @@
 -->
 <!-- If the exception extends another exception use this -->
    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/wincache/ini.xml b/reference/wincache/ini.xml
index 4125bcd7c..fe87e8b98 100644
--- a/reference/wincache/ini.xml
+++ b/reference/wincache/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xml:id="wincache.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="wincache.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -27,7 +27,7 @@
       <entry>"1"</entry>
       <entry>"0"</entry>
       <entry>"1"</entry>      
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -35,7 +35,7 @@
       <entry>"NULL"</entry>
       <entry>"NULL"</entry>
       <entry>"NULL"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -43,7 +43,7 @@
       <entry>"24"</entry>
       <entry>"5"</entry>
       <entry>"255"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -51,7 +51,7 @@
       <entry>"1"</entry>
       <entry>"0"</entry>
       <entry>"1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.1.0</entry>
      </row>
      <row>
@@ -59,7 +59,7 @@
       <entry>"256"</entry>
       <entry>"10"</entry>
       <entry>"2048"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -67,7 +67,7 @@
       <entry>"1"</entry>
       <entry>"0"</entry>
       <entry>"1"</entry>      
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of WinCache 1.0.0. Removed as of 2.0.0.0</entry>
      </row> 
      <row>
@@ -75,7 +75,7 @@
       <entry>"NULL"</entry>
       <entry>"NULL"</entry>
       <entry>"NULL"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0. Removed as of 2.0.0.0</entry>
      </row>     
      <row>
@@ -83,7 +83,7 @@
       <entry>"96"</entry>
       <entry>"15"</entry>
       <entry>"255"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0. Removed as of 2.0.0.0</entry>
      </row>
      <row>
@@ -91,7 +91,7 @@
       <entry>"4096"</entry>
       <entry>"1024"</entry>
       <entry>"16384"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -99,7 +99,7 @@
       <entry>"30"</entry>
       <entry>"0"</entry>
       <entry>"300"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -107,7 +107,7 @@
       <entry>"1200"</entry>
       <entry>"0"</entry>
       <entry>"7200"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -115,7 +115,7 @@
       <entry>0</entry>
       <entry>0</entry>
       <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -123,7 +123,7 @@
       <entry>NULL</entry>
       <entry>NULL</entry>
       <entry>NULL</entry>      
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -131,7 +131,7 @@
       <entry>NULL</entry>
       <entry>NULL</entry>
       <entry>NULL</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.0.0</entry>
      </row>
      <row>
@@ -139,7 +139,7 @@
       <entry>1</entry>
       <entry>0</entry>
       <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.1.0</entry>
      </row>
      <row>
@@ -147,7 +147,7 @@
       <entry>8</entry>
       <entry>5</entry>
       <entry>85</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.1.0</entry>
      </row>
      <row>
@@ -155,7 +155,7 @@
       <entry>8</entry>
       <entry>5</entry>
       <entry>85</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.1.0</entry>
      </row>
      <row>
@@ -163,7 +163,7 @@
       <entry>NULL</entry>
       <entry>NULL</entry>
       <entry>NULL</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.2.0. Removed as of 1.3.7</entry>
      </row>
      <row>
@@ -171,7 +171,7 @@
       <entry>1</entry>
       <entry>0</entry>
       <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant>|<constant>INI_PERDIR</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant>|<constant xlink:href="&url.php.manual.constant.ini-perdir;">INI_PERDIR</constant></entry>
       <entry>Available as of WinCache 1.3.7</entry>
      </row>
      <row>
@@ -179,7 +179,7 @@
       <entry>1</entry>
       <entry>0</entry>
       <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.3.6.3. Removed as of 2.0.0.0</entry>
      </row>
      <row>
@@ -187,7 +187,7 @@
       <entry>NULL</entry>
       <entry>NULL</entry>
       <entry>NULL</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry>Available as of WinCache 1.3.7.4</entry>
      </row>
     </tbody>
diff --git a/reference/wincache/setup.xml b/reference/wincache/setup.xml
index e92be0c70..844ca2cda 100644
--- a/reference/wincache/setup.xml
+++ b/reference/wincache/setup.xml
@@ -296,7 +296,7 @@ wincache.rerouteini = C:\PHP\reroute.ini
    <literal>&lt;PHP function name&gt;:[&lt;number of function parameters&gt;]=&lt;wincache function name&gt;</literal>
   </simpara>
   <para>
-   The example of the file is shown below. In this example the calls to PHP function <function>file_get_contents</function>
+   The example of the file is shown below. In this example the calls to PHP function <function xlink:href="&url.php.manual.function.file-get-contents;">file_get_contents</function>
    will be replaced with calls to <function>wincache_file_get_contents</function> only if the number of parameters passed to
    the function is less than or equals to 2. Specifying the number of parameters is useful when replacement function
    does not handle all the function's parameters.
diff --git a/reference/wkhtmltox/ini.xml b/reference/wkhtmltox/ini.xml
index fbdce8e2e..f88675dcd 100644
--- a/reference/wkhtmltox/ini.xml
+++ b/reference/wkhtmltox/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xml:id="wkhtmltox.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="wkhtmltox.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -19,7 +19,7 @@
    <row>
     <entry><link linkend="ini.wkhtmltox.graphics">wkhtmltox.graphics</link></entry>
     <entry>Off</entry>
-    <entry><constant>INI_SYSTEM</constant>|<constant>INI_PERDIR</constant></entry>
+    <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant>|<constant xlink:href="&url.php.manual.constant.ini-perdir;">INI_PERDIR</constant></entry>
     <entry>&gt;= 0.3.2</entry>
    </row>
   </tbody>
diff --git a/reference/xhprof/functions/xhprof-enable.xml b/reference/xhprof/functions/xhprof-enable.xml
index fea835695..94e5313ef 100644
--- a/reference/xhprof/functions/xhprof-enable.xml
+++ b/reference/xhprof/functions/xhprof-enable.xml
@@ -110,8 +110,8 @@ xhprof_enable(
   <simplelist>
    <member><function>xhprof_disable</function></member>
    <member><function>xhprof_sample_enable</function></member>
-   <member><function>memory_get_usage</function></member>
-   <member><function>getrusage</function></member>
+   <member><function xlink:href="&url.php.manual.function.memory-get-usage;">memory_get_usage</function></member>
+   <member><function xlink:href="&url.php.manual.function.getrusage;">getrusage</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/xhprof/functions/xhprof-sample-enable.xml b/reference/xhprof/functions/xhprof-sample-enable.xml
index 143eaef6a..4322b415f 100644
--- a/reference/xhprof/functions/xhprof-sample-enable.xml
+++ b/reference/xhprof/functions/xhprof-sample-enable.xml
@@ -40,8 +40,8 @@
   <simplelist>
    <member><function>xhprof_sample_disable</function></member>
    <member><function>xhprof_enable</function></member>
-   <member><function>memory_get_usage</function></member>
-   <member><function>getrusage</function></member>
+   <member><function xlink:href="&url.php.manual.function.memory-get-usage;">memory_get_usage</function></member>
+   <member><function xlink:href="&url.php.manual.function.getrusage;">getrusage</function></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/reference/xhprof/ini.xml b/reference/xhprof/ini.xml
index 544dbff18..68edb16ae 100644
--- a/reference/xhprof/ini.xml
+++ b/reference/xhprof/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="xhprof.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="xhprof.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,7 +20,7 @@
      <row>
       <entry><link linkend="ini.xhprof.output-dir">xhprof.output_dir</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry></entry>
      </row>
     </tbody>
diff --git a/reference/xmldiff/xmldiff-dom/diff.xml b/reference/xmldiff/xmldiff-dom/diff.xml
index 0b6910112..d30795351 100644
--- a/reference/xmldiff/xmldiff-dom/diff.xml
+++ b/reference/xmldiff/xmldiff-dom/diff.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>DOMDocument</type><methodname>XMLDiff\DOM::diff</methodname>
-   <methodparam><type>DOMDocument</type><parameter>from</parameter></methodparam>
-   <methodparam><type>DOMDocument</type><parameter>to</parameter></methodparam>
+   <modifier>public</modifier> <type xlink:href="&url.php.manual.class.domdocument;">DOMDocument</type><methodname>XMLDiff\DOM::diff</methodname>
+   <methodparam><type xlink:href="&url.php.manual.class.domdocument;">DOMDocument</type><parameter>from</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.domdocument;">DOMDocument</type><parameter>to</parameter></methodparam>
   </methodsynopsis>
   <para>
    Diff two DOMDocument instances and produce the new one containing the diff information.
diff --git a/reference/xmldiff/xmldiff-dom/merge.xml b/reference/xmldiff/xmldiff-dom/merge.xml
index 9e34e6d2f..fe9898b0c 100644
--- a/reference/xmldiff/xmldiff-dom/merge.xml
+++ b/reference/xmldiff/xmldiff-dom/merge.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>DOMDocument</type><methodname>XMLDiff\DOM::merge</methodname>
-   <methodparam><type>DOMDocument</type><parameter>src</parameter></methodparam>
-   <methodparam><type>DOMDocument</type><parameter>diff</parameter></methodparam>
+   <modifier>public</modifier> <type xlink:href="&url.php.manual.class.domdocument;">DOMDocument</type><methodname>XMLDiff\DOM::merge</methodname>
+   <methodparam><type xlink:href="&url.php.manual.class.domdocument;">DOMDocument</type><parameter>src</parameter></methodparam>
+   <methodparam><type xlink:href="&url.php.manual.class.domdocument;">DOMDocument</type><parameter>diff</parameter></methodparam>
   </methodsynopsis>
   <para>
    Create new DOMDocument based on the diff.
diff --git a/reference/xmldiff/xmldiff.exception.xml b/reference/xmldiff/xmldiff.exception.xml
index bb0783cb7..6eff41cf8 100644
--- a/reference/xmldiff/xmldiff.exception.xml
+++ b/reference/xmldiff/xmldiff.exception.xml
@@ -32,16 +32,16 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
 
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/xmlrpc/functions/xmlrpc-encode-request.xml b/reference/xmlrpc/functions/xmlrpc-encode-request.xml
index 751079d06..85a5dbbc8 100644
--- a/reference/xmlrpc/functions/xmlrpc-encode-request.xml
+++ b/reference/xmlrpc/functions/xmlrpc-encode-request.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-encode-request" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.xmlrpc-encode-request" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>xmlrpc_encode_request</refname>
   <refpurpose>Generates XML for a method request</refpurpose>
@@ -98,8 +98,8 @@ if ($response && xmlrpc_is_fault($response)) {
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>stream_context_create</function></member>
-    <member><function>file_get_contents</function></member>
+    <member><function xlink:href="&url.php.manual.function.stream-context-create;">stream_context_create</function></member>
+    <member><function xlink:href="&url.php.manual.function.file-get-contents;">file_get_contents</function></member>
     <member><function>xmlrpc_decode</function></member>
    </simplelist>
   </para>
diff --git a/reference/xpass/constants.xml b/reference/xpass/constants.xml
index fe9989e0c..0a5b70baa 100644
--- a/reference/xpass/constants.xml
+++ b/reference/xpass/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<appendix xml:id="xpass.constants" xmlns="http://docbook.org/ns/docbook">
+<appendix xml:id="xpass.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.constants;
  &extension.constants;
 
@@ -11,7 +11,7 @@
   Error codes (<constant>CRYPT_SALT_<replaceable>*</replaceable></constant>) returned by
   <function>crypt_checksalt</function>.
   Password algorithms (<constant>PASSWORD_<replaceable>*</replaceable></constant>) for
-  <function>password_hash</function> algo parameter.
+  <function xlink:href="&url.php.manual.function.password-hash;">password_hash</function> algo parameter.
  </simpara>
 
  <variablelist xml:id="xpass.constants.algo">
diff --git a/reference/xpass/functions/crypt-gensalt.xml b/reference/xpass/functions/crypt-gensalt.xml
index fa837c031..6d6ec8cdd 100644
--- a/reference/xpass/functions/crypt-gensalt.xml
+++ b/reference/xpass/functions/crypt-gensalt.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>int</type><parameter>count</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <simpara>
-   Compile a string for use as the salt argument to <function>crypt</function>.
+   Compile a string for use as the salt argument to <function xlink:href="&url.php.manual.function.crypt;">crypt</function>.
   </simpara>
  </refsect1>
 
@@ -85,8 +85,8 @@ bool(true)
   &reftitle.seealso;
   <simplelist>
    <member><function>crypt_preferred_method</function></member>
-   <member><function>crypt</function></member>
-   <member><function>hash_equals</function></member>
+   <member><function xlink:href="&url.php.manual.function.crypt;">crypt</function></member>
+   <member><function xlink:href="&url.php.manual.function.hash-equals;">hash_equals</function></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/yac/book.xml b/reference/yac/book.xml
index eb137f716..ce11e5acb 100644
--- a/reference/yac/book.xml
+++ b/reference/yac/book.xml
@@ -37,7 +37,7 @@
   </simpara>
   <simpara>
    As of yac 2.4.0, small scalar values —
-   <constant>NULL</constant>, booleans, most integers (those that fit in
+   <constant xlink:href="&url.php.manual.constant.null;">NULL</constant>, booleans, most integers (those that fit in
    60 signed bits on 64-bit builds), strings of up to 7 bytes and empty
    arrays — are stored directly inside the hash slot
    instead of in a separate value block ("embedded values"), which
diff --git a/reference/yac/ini.xml b/reference/yac/ini.xml
index cbf54bbd0..eb7e7bec6 100644
--- a/reference/yac/ini.xml
+++ b/reference/yac/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="yac.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="yac.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,43 +20,43 @@
      <row>
       <entry><link linkend="ini.yac.compress-threshold">yac.compress_threshold</link></entry>
       <entry>4K</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yac.debug">yac.debug</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yac.enable">yac.enable</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yac.enable-cli">yac.enable_cli</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yac.keys-memory-size">yac.keys_memory_size</link></entry>
       <entry>8M</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yac.serializer">yac.serializer</link></entry>
       <entry>php</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yac.values-memory-size">yac.values_memory_size</link></entry>
       <entry>64M</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
diff --git a/reference/yac/yac/construct.xml b/reference/yac/yac/construct.xml
index 87b4a3e6d..8483f3abc 100644
--- a/reference/yac/yac/construct.xml
+++ b/reference/yac/yac/construct.xml
@@ -38,7 +38,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simpara>
-   Throws an <exceptionname>Exception</exceptionname> if the cache is disabled
+   Throws an <exceptionname xlink:href="&url.php.manual.class.exception;">Exception</exceptionname> if the cache is disabled
    (<literal>yac.enable=0</literal>), or if <parameter>prefix</parameter> is
    longer than 48 bytes.
   </simpara>
diff --git a/reference/yac/yac/dump.xml b/reference/yac/yac/dump.xml
index 68b3843b3..bb4ccc835 100644
--- a/reference/yac/yac/dump.xml
+++ b/reference/yac/yac/dump.xml
@@ -144,7 +144,7 @@
     <listitem><simpara>
      Whether the value is stored directly inside the slot instead of in a
      separate value block (as of yac 2.4.0). Small values —
-     <constant>NULL</constant>, booleans, small integers, strings of up to
+     <constant xlink:href="&url.php.manual.constant.null;">NULL</constant>, booleans, small integers, strings of up to
      7 bytes and empty arrays — are embedded this way and allocate no value
      memory at all; for them <literal>crc</literal> and
      <literal>size</literal> are reported as <literal>0</literal>.
diff --git a/reference/yaconf/ini.xml b/reference/yaconf/ini.xml
index 420d19f5b..70b89aac7 100644
--- a/reference/yaconf/ini.xml
+++ b/reference/yaconf/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="yaconf.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="yaconf.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,13 +20,13 @@
      <row>
       <entry><link linkend="ini.yaconf.directory">yaconf.directory</link></entry>
       <entry><literal>""</literal></entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaconf.check-delay">yaconf.check_delay</link></entry>
       <entry><literal>300</literal></entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
diff --git a/reference/yaf/appconfig.xml b/reference/yaf/appconfig.xml
index 6ebd14dde..ea43db39f 100644
--- a/reference/yaf/appconfig.xml
+++ b/reference/yaf/appconfig.xml
@@ -399,7 +399,7 @@ $app = new Yaf_Application(Yaconf::get("application"));
        <link linkend="ini.yaf.lowcase-path">application.system.lowcase_path</link>
        <note>
         <simpara>
-        only those <constant>INI_ALL</constant> configures can be set in this way
+        only those <constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant> configures can be set in this way
        </simpara>
        </note>
       </para>
diff --git a/reference/yaf/ini.xml b/reference/yaf/ini.xml
index ce4624f2f..99eac451a 100644
--- a/reference/yaf/ini.xml
+++ b/reference/yaf/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="yaf.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="yaf.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,55 +20,55 @@
      <row>
       <entry><link linkend="ini.yaf.library">yaf.library</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.environ">yaf.environ</link></entry>
       <entry>"product"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.forward-limit">yaf.forward_limit</link></entry>
       <entry>5</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.use-namespace">yaf.use_namespace</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.action-prefer">yaf.action_prefer</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.lowcase-path">yaf.lowcase_path</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.use-spl-autoload">yaf.use_spl_autoload</link></entry>
       <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.name-suffix">yaf.name_suffix</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yaf.name-separator">yaf.name_separator</link></entry>
       <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
diff --git a/reference/yaf/yaf-config-ini.xml b/reference/yaf/yaf-config-ini.xml
index 2a0a98dd8..6daf15c03 100644
--- a/reference/yaf/yaf-config-ini.xml
+++ b/reference/yaf/yaf-config-ini.xml
@@ -26,7 +26,7 @@
    <note>
     <simpara>
      <classname>Yaf_Config_Ini</classname> utilizes the
-     <function>parse_ini_file</function> PHP function. Please review this
+     <function xlink:href="&url.php.manual.function.parse-ini-file;">parse_ini_file</function> PHP function. Please review this
      documentation to be aware of its specific behaviors, which propagate
      to <classname>Yaf_Config_Ini</classname>, such as how the special
      values of "&true;", "&false;", "yes", "no", and "&null;" are handled.
@@ -72,15 +72,15 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-config-simple.xml b/reference/yaf/yaf-config-simple.xml
index 5f6f0d22f..12b66d450 100644
--- a/reference/yaf/yaf-config-simple.xml
+++ b/reference/yaf/yaf-config-simple.xml
@@ -41,15 +41,15 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-exception.xml b/reference/yaf/yaf-exception.xml
index 5c3a1fad0..53de1c8f0 100644
--- a/reference/yaf/yaf-exception.xml
+++ b/reference/yaf/yaf-exception.xml
@@ -16,8 +16,8 @@
     thrown by Yaf. Every other Yaf exception class extends it.
    </simpara>
    <simpara>
-    It extends <exceptionname>RuntimeException</exceptionname> when the SPL extension is
-    loaded, and the built-in <exceptionname>Exception</exceptionname> otherwise.
+    It extends <exceptionname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</exceptionname> when the SPL extension is
+    loaded, and the built-in <exceptionname xlink:href="&url.php.manual.class.exception;">Exception</exceptionname> otherwise.
     Exceptions raised by Yaf carry an error code that identifies the type of
     failure.
    </simpara>
@@ -39,19 +39,19 @@
      
      <ooclass>
       <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
+      <classname xlink:href="&url.php.manual.class.runtimeexception;">RuntimeException</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-session.xml b/reference/yaf/yaf-session.xml
index 2f43b69af..145cffa19 100644
--- a/reference/yaf/yaf-session.xml
+++ b/reference/yaf/yaf-session.xml
@@ -44,15 +44,15 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.iterator;">Iterator</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>ArrayAccess</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.arrayaccess;">ArrayAccess</interfacename>
      </oointerface>
 
      <oointerface>
-      <interfacename>Countable</interfacename>
+      <interfacename xlink:href="&url.php.manual.class.countable;">Countable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/yaf/yaf_application/bootstrap.xml b/reference/yaf/yaf_application/bootstrap.xml
index cd5fe13ba..a26c58559 100644
--- a/reference/yaf/yaf_application/bootstrap.xml
+++ b/reference/yaf/yaf_application/bootstrap.xml
@@ -50,7 +50,7 @@
    Triggers a <constant>YAF_ERR_TYPE_ERROR</constant> error if the found
    class is not a subclass of
    <classname>Yaf_Bootstrap_Abstract</classname>, or an
-   <constant>E_WARNING</constant> if the bootstrap file or the
+   <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> if the bootstrap file or the
    <literal>Bootstrap</literal> class cannot be found.
   </simpara>
  </refsect1>
diff --git a/reference/yaf/yaf_dispatcher/seterrorhandler.xml b/reference/yaf/yaf_dispatcher/seterrorhandler.xml
index c003418de..b68a65015 100644
--- a/reference/yaf/yaf_dispatcher/seterrorhandler.xml
+++ b/reference/yaf/yaf_dispatcher/seterrorhandler.xml
@@ -20,7 +20,7 @@
    is off, Yaf triggers catchable errors when unexpected errors occur.
   </simpara>
   <simpara>
-   This method is a wrapper of <function>set_error_handler</function>;
+   This method is a wrapper of <function xlink:href="&url.php.manual.function.set-error-handler;">set_error_handler</function>;
    the handler is called whenever such an error is raised.
   </simpara>
  </refsect1>
@@ -33,7 +33,7 @@
     <listitem>
      <simpara>
       A callable callback, with the same semantics as the callback passed
-      to <function>set_error_handler</function>.     </simpara>
+      to <function xlink:href="&url.php.manual.function.set-error-handler;">set_error_handler</function>.     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -42,7 +42,7 @@
      <simpara>
       The error types to handle, same as the
       <parameter>error_levels</parameter> parameter of
-      <function>set_error_handler</function>. Defaults to handling all error types.
+      <function xlink:href="&url.php.manual.function.set-error-handler;">set_error_handler</function>. Defaults to handling all error types.
      </simpara>
     </listitem>
    </varlistentry>
@@ -53,7 +53,7 @@
   &reftitle.returnvalues;
   <simpara>
    Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, &false; if calling <function>set_error_handler</function> failed,
+   success, &false; if calling <function xlink:href="&url.php.manual.function.set-error-handler;">set_error_handler</function> failed,
    or &null; if the application is not initialized.
   </simpara>
  </refsect1>
diff --git a/reference/yaf/yaf_exception/construct.xml b/reference/yaf/yaf_exception/construct.xml
index d8927e5ee..6421076ba 100644
--- a/reference/yaf/yaf_exception/construct.xml
+++ b/reference/yaf/yaf_exception/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>string</type><parameter>message</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>code</parameter><initializer>0</initializer></methodparam>
   </constructorsynopsis>
-  <simpara>Constructs a new <exceptionname>Yaf_Exception</exceptionname>. The <parameter>code</parameter> carries the Yaf error code that identifies the type of failure, and is exposed via <methodname>Exception::getCode</methodname>.</simpara>
+  <simpara>Constructs a new <exceptionname>Yaf_Exception</exceptionname>. The <parameter>code</parameter> carries the Yaf error code that identifies the type of failure, and is exposed via <methodname xlink:href="&url.php.manual.exception.getcode;">Exception::getCode</methodname>.</simpara>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/yaf/yaf_exception/getprevious.xml b/reference/yaf/yaf_exception/getprevious.xml
index 35e8f181a..658cca7a5 100644
--- a/reference/yaf/yaf_exception/getprevious.xml
+++ b/reference/yaf/yaf_exception/getprevious.xml
@@ -10,10 +10,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>Throwable</type><methodname>Yaf_Exception::getPrevious</methodname>
+   <modifier>public</modifier> <type xlink:href="&url.php.manual.class.throwable;">Throwable</type><methodname>Yaf_Exception::getPrevious</methodname>
    <void />
   </methodsynopsis>
-  <simpara>This method is inherited from the base <exceptionname>Throwable</exceptionname> hierarchy and returns the exception that was chained as the previous one, if any.</simpara>
+  <simpara>This method is inherited from the base <exceptionname xlink:href="&url.php.manual.class.throwable;">Throwable</exceptionname> hierarchy and returns the exception that was chained as the previous one, if any.</simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -23,7 +23,7 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <simpara>Returns the previous <exceptionname>Throwable</exceptionname> if available, &null; otherwise.</simpara>
+  <simpara>Returns the previous <exceptionname xlink:href="&url.php.manual.class.throwable;">Throwable</exceptionname> if available, &null; otherwise.</simpara>
  </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/yaf/yaf_request_abstract/getexception.xml b/reference/yaf/yaf_request_abstract/getexception.xml
index f09d3650a..dd60c5d46 100644
--- a/reference/yaf/yaf_request_abstract/getexception.xml
+++ b/reference/yaf/yaf_request_abstract/getexception.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Exception</type><type>null</type></type><methodname>Yaf_Request_Abstract::getException</methodname>
+   <modifier>public</modifier> <type class="union"><type xlink:href="&url.php.manual.class.exception;">Exception</type><type>null</type></type><methodname>Yaf_Request_Abstract::getException</methodname>
    <void />
   </methodsynopsis>
   <simpara>Retrieve the exception caught during dispatching.</simpara>
@@ -22,7 +22,7 @@
  </refsect1>
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <simpara>The <exceptionname>Exception</exceptionname> caught during dispatching, or &null; if none.</simpara>
+  <simpara>The <exceptionname xlink:href="&url.php.manual.class.exception;">Exception</exceptionname> caught during dispatching, or &null; if none.</simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/yaml/functions/yaml-parse-file.xml b/reference/yaml/functions/yaml-parse-file.xml
index a4897ac8e..e12924b08 100644
--- a/reference/yaml/functions/yaml-parse-file.xml
+++ b/reference/yaml/functions/yaml-parse-file.xml
@@ -86,7 +86,7 @@
   <warning>
    <para>
     Processing untrusted user input with <function>yaml_parse_file</function>
-    is dangerous if the use of <function>unserialize</function> is enabled for
+    is dangerous if the use of <function xlink:href="&url.php.manual.function.unserialize;">unserialize</function> is enabled for
     nodes using the <literal>!php/object</literal> tag. This behavior can be
     disabled by using the <literal>yaml.decode_php</literal> ini setting.
    </para>
diff --git a/reference/yaml/functions/yaml-parse-url.xml b/reference/yaml/functions/yaml-parse-url.xml
index 1d05f9f73..a057fb669 100644
--- a/reference/yaml/functions/yaml-parse-url.xml
+++ b/reference/yaml/functions/yaml-parse-url.xml
@@ -84,7 +84,7 @@
   <warning>
    <para>
     Processing untrusted user input with <function>yaml_parse_url</function>
-    is dangerous if the use of <function>unserialize</function> is enabled for
+    is dangerous if the use of <function xlink:href="&url.php.manual.function.unserialize;">unserialize</function> is enabled for
     nodes using the <literal>!php/object</literal> tag. This behavior can be
     disabled by using the <literal>yaml.decode_php</literal> ini setting.
    </para>
diff --git a/reference/yaml/functions/yaml-parse.xml b/reference/yaml/functions/yaml-parse.xml
index 2b50be4c6..3d4cb91c1 100644
--- a/reference/yaml/functions/yaml-parse.xml
+++ b/reference/yaml/functions/yaml-parse.xml
@@ -208,7 +208,7 @@ array(8) {
   <warning>
    <para>
     Processing untrusted user input with <function>yaml_parse</function>
-    is dangerous if the use of <function>unserialize</function> is enabled for
+    is dangerous if the use of <function xlink:href="&url.php.manual.function.unserialize;">unserialize</function> is enabled for
     nodes using the <literal>!php/object</literal> tag. This behavior can be
     disabled by using the <literal>yaml.decode_php</literal> ini setting.
    </para>
diff --git a/reference/yaml/ini.xml b/reference/yaml/ini.xml
index f9ee5172b..5b8f2523f 100644
--- a/reference/yaml/ini.xml
+++ b/reference/yaml/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="yaml.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="yaml.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
   &reftitle.runtime;
   &extension.runtime;
   <para>
@@ -20,37 +20,37 @@
           <row>
             <entry><link linkend="ini.yaml.decode-binary">yaml.decode_binary</link></entry>
             <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
+            <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
             <entry><!-- leave empty, this will be filled by an automatic script --></entry>
           </row>
           <row>
             <entry><link linkend="ini.yaml.decode-php">yaml.decode_php</link></entry>
             <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
+            <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
             <entry>Added in 1.2.0, before 2.0.0 the default was 1</entry>
           </row>
           <row>
             <entry><link linkend="ini.yaml.decode-timestamp">yaml.decode_timestamp</link></entry>
             <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
+            <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
             <entry><!-- leave empty, this will be filled by an automatic script --></entry>
           </row>
           <row>
             <entry><link linkend="ini.yaml.output-canonical">yaml.output_canonical</link></entry>
             <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
+            <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
             <entry><!-- leave empty, this will be filled by an automatic script --></entry>
           </row>
           <row>
             <entry><link linkend="ini.yaml.output-indent">yaml.output_indent</link></entry>
             <entry>2</entry>
-            <entry><constant>INI_ALL</constant></entry>
+            <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
             <entry><!-- leave empty, this will be filled by an automatic script --></entry>
           </row>
           <row>
             <entry><link linkend="ini.yaml.output-width">yaml.output_width</link></entry>
             <entry>80</entry>
-            <entry><constant>INI_ALL</constant></entry>
+            <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
             <entry><!-- leave empty, this will be filled by an automatic script --></entry>
           </row>
         </tbody>
@@ -91,7 +91,7 @@
         </term>
         <listitem>
           <para>
-            Controls the decoding of both implicit and explicit "tag:yaml.org,2002:timestamp" scalars in the YAML document stream. The default setting of <literal>0</literal> will not apply any decoding. A setting of <literal>1</literal> will use <function>strtotime</function> to parse the timestamp value as a Unix timestamp. A setting of <literal>2</literal> will use <function>date_create</function> to parse the timestamp value as <type>DateTime</type> object.
+            Controls the decoding of both implicit and explicit "tag:yaml.org,2002:timestamp" scalars in the YAML document stream. The default setting of <literal>0</literal> will not apply any decoding. A setting of <literal>1</literal> will use <function xlink:href="&url.php.manual.function.strtotime;">strtotime</function> to parse the timestamp value as a Unix timestamp. A setting of <literal>2</literal> will use <function xlink:href="&url.php.manual.function.date-create;">date_create</function> to parse the timestamp value as <type xlink:href="&url.php.manual.class.datetime;">DateTime</type> object.
           </para>
         </listitem>
       </varlistentry>
diff --git a/reference/yar/constants.xml b/reference/yar/constants.xml
index 0a0919244..cd83d139b 100644
--- a/reference/yar/constants.xml
+++ b/reference/yar/constants.xml
@@ -148,7 +148,7 @@
      Client option to override hostname resolution for HTTP calls. The
      value must be an array of strings in the format
      <literal>HOST:PORT:ADDRESS</literal>, following the curl
-     <constant>CURLOPT_RESOLVE</constant> syntax. Requires libcurl
+     <constant xlink:href="&url.php.manual.constant.curlopt-resolve;">CURLOPT_RESOLVE</constant> syntax. Requires libcurl
      &gt;= 7.21.3. Available as of Yar 2.1.0.
     </simpara>
    </listitem>
diff --git a/reference/yar/ini.xml b/reference/yar/ini.xml
index 297fec1c0..07d2a0c47 100644
--- a/reference/yar/ini.xml
+++ b/reference/yar/ini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="yar.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="yar.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -20,43 +20,43 @@
      <row>
       <entry><link linkend="ini.yar.connect-timeout">yar.connect_timeout</link></entry>
       <entry>1000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yar.content-type">yar.content_type</link></entry>
       <entry>application/octet-stream</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yar.debug">yar.debug</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yar.expose-info">yar.expose_info</link></entry>
       <entry>On</entry>
-      <entry><constant>INI_PERDIR</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-perdir;">INI_PERDIR</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yar.packager">yar.packager</link></entry>
       <entry>php</entry>
-      <entry><constant>INI_PERDIR</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-perdir;">INI_PERDIR</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yar.ssl-verify">yar.ssl_verify</link></entry>
       <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
      <row>
       <entry><link linkend="ini.yar.timeout">yar.timeout</link></entry>
       <entry>5000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry><!-- leave empty, this will be filled by an automatic script --></entry>
      </row>
     </tbody>
@@ -110,7 +110,7 @@
      <listitem>
       <simpara>
        Enables debug mode. When on, Yar emits
-       <constant>E_WARNING</constant> messages with protocol-level
+       <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant> messages with protocol-level
        details for every request and response, prefixed with
        <literal>[Debug Yar_Server]</literal> or
        <literal>[Debug Yar_Client]</literal> and a timestamp.
@@ -163,8 +163,8 @@
       <simpara>
        Whether to verify the TLS certificate of HTTPS servers. When on,
        the curl transport sets
-       <constant>CURLOPT_SSL_VERIFYPEER</constant> and
-       <constant>CURLOPT_SSL_VERIFYHOST</constant>, and requests to
+       <constant xlink:href="&url.php.manual.constant.curlopt-ssl-verifypeer;">CURLOPT_SSL_VERIFYPEER</constant> and
+       <constant xlink:href="&url.php.manual.constant.curlopt-ssl-verifyhost;">CURLOPT_SSL_VERIFYHOST</constant>, and requests to
        servers with invalid certificates fail. Off by default for
        backward compatibility. Available as of Yar 2.4.0.
       </simpara>
diff --git a/reference/yar/yar-client-exception.xml b/reference/yar/yar-client-exception.xml
index f32f4cde6..aaf881250 100644
--- a/reference/yar/yar-client-exception.xml
+++ b/reference/yar/yar-client-exception.xml
@@ -31,18 +31,17 @@
 
     <ooclass>
      <modifier>extends</modifier>
-     <classname>Exception</classname>
+     <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/yar/yar-client-packager-exception.xml b/reference/yar/yar-client-packager-exception.xml
index 3c5fe3ae4..cbc700848 100644
--- a/reference/yar/yar-client-packager-exception.xml
+++ b/reference/yar/yar-client-packager-exception.xml
@@ -29,12 +29,11 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 
   </section>
diff --git a/reference/yar/yar-client-protocol-exception.xml b/reference/yar/yar-client-protocol-exception.xml
index 6020b8001..6e52b3396 100644
--- a/reference/yar/yar-client-protocol-exception.xml
+++ b/reference/yar/yar-client-protocol-exception.xml
@@ -37,12 +37,11 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 
   </section>
diff --git a/reference/yar/yar-client-transport-exception.xml b/reference/yar/yar-client-transport-exception.xml
index 8b5679d6a..a8e20ad54 100644
--- a/reference/yar/yar-client-transport-exception.xml
+++ b/reference/yar/yar-client-transport-exception.xml
@@ -29,12 +29,11 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 
   </section>
diff --git a/reference/yar/yar-server-exception.xml b/reference/yar/yar-server-exception.xml
index c77aeeb17..36ea44fa6 100644
--- a/reference/yar/yar-server-exception.xml
+++ b/reference/yar/yar-server-exception.xml
@@ -32,7 +32,7 @@
 
     <ooclass>
      <modifier>extends</modifier>
-     <classname>Exception</classname>
+     <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
     </ooclass>
 
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
@@ -44,14 +44,13 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/yar/yar-server-output-exception.xml b/reference/yar/yar-server-output-exception.xml
index 37fb140c2..c1139559d 100644
--- a/reference/yar/yar-server-output-exception.xml
+++ b/reference/yar/yar-server-output-exception.xml
@@ -29,12 +29,11 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 
   </section>
diff --git a/reference/yar/yar-server-packager-exception.xml b/reference/yar/yar-server-packager-exception.xml
index 192d4e519..3ca1c00a1 100644
--- a/reference/yar/yar-server-packager-exception.xml
+++ b/reference/yar/yar-server-packager-exception.xml
@@ -29,12 +29,11 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 
   </section>
diff --git a/reference/yar/yar-server-protocol-exception.xml b/reference/yar/yar-server-protocol-exception.xml
index 52d5aa9f6..b1af9222f 100644
--- a/reference/yar/yar-server-protocol-exception.xml
+++ b/reference/yar/yar-server-protocol-exception.xml
@@ -29,12 +29,11 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 
   </section>
diff --git a/reference/yar/yar-server-request-exception.xml b/reference/yar/yar-server-request-exception.xml
index f2eae9ff6..0aa050d0a 100644
--- a/reference/yar/yar-server-request-exception.xml
+++ b/reference/yar/yar-server-request-exception.xml
@@ -29,12 +29,11 @@
     </ooclass>
 
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
+    &class.exception.properties;
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
+    &class.exception.methods;
    </classsynopsis>
 
   </section>
diff --git a/reference/yar/yar_client_exception/gettype.xml b/reference/yar/yar_client_exception/gettype.xml
index 9b664bb3b..90bd31c3d 100644
--- a/reference/yar/yar_client_exception/gettype.xml
+++ b/reference/yar/yar_client_exception/gettype.xml
@@ -18,7 +18,7 @@
    the client itself (transport failures, protocol errors and so on), so
    the type is always the fixed string
    <literal>"Yar_Exception_Client"</literal>. Use
-   <methodname>Exception::getCode</methodname> to tell the individual
+   <methodname xlink:href="&url.php.manual.exception.getcode;">Exception::getCode</methodname> to tell the individual
    failure apart; the code is one of the <literal>YAR_ERR_*</literal>
    constants.
   </simpara>
diff --git a/reference/yar/yar_concurrent_client/reset.xml b/reference/yar/yar_concurrent_client/reset.xml
index c05960ff6..460a4955f 100644
--- a/reference/yar/yar_concurrent_client/reset.xml
+++ b/reference/yar/yar_concurrent_client/reset.xml
@@ -37,7 +37,7 @@
   <simpara>
    Returns &true;, or &false; when the concurrent client is currently inside
    <methodname>Yar_Concurrent_Client::loop</methodname>, in which case an
-   <constant>E_WARNING</constant>-level error is raised.
+   <constant xlink:href="&url.php.manual.constant.e-warning;">E_WARNING</constant>-level error is raised.
   </simpara>
  </refsect1>
 
diff --git a/reference/zmq/zmqcontextexception.xml b/reference/zmq/zmqcontextexception.xml
index 8e744abec..e1ff6a1f9 100644
--- a/reference/zmq/zmqcontextexception.xml
+++ b/reference/zmq/zmqcontextexception.xml
@@ -40,7 +40,7 @@
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/zmq/zmqdeviceexception.xml b/reference/zmq/zmqdeviceexception.xml
index e95f91086..3a091787a 100644
--- a/reference/zmq/zmqdeviceexception.xml
+++ b/reference/zmq/zmqdeviceexception.xml
@@ -40,7 +40,7 @@
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/zmq/zmqexception.xml b/reference/zmq/zmqexception.xml
index 3e13057ef..755c14d0d 100644
--- a/reference/zmq/zmqexception.xml
+++ b/reference/zmq/zmqexception.xml
@@ -32,7 +32,7 @@
 
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -40,7 +40,7 @@
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/zmq/zmqpollexception.xml b/reference/zmq/zmqpollexception.xml
index ef8a93989..bed675d88 100644
--- a/reference/zmq/zmqpollexception.xml
+++ b/reference/zmq/zmqpollexception.xml
@@ -40,7 +40,7 @@
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/zmq/zmqsocketexception.xml b/reference/zmq/zmqsocketexception.xml
index edd00f49f..f8b1c8158 100644
--- a/reference/zmq/zmqsocketexception.xml
+++ b/reference/zmq/zmqsocketexception.xml
@@ -40,7 +40,7 @@
 
 
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/zookeeper/ini.xml b/reference/zookeeper/ini.xml
index 93fd72812..f7e8e29e8 100644
--- a/reference/zookeeper/ini.xml
+++ b/reference/zookeeper/ini.xml
@@ -21,19 +21,19 @@
      <row>
       <entry><link linkend="ini.zookeeper.recv_timeout">zookeeper.recv_timeout</link></entry>
       <entry>10000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.zookeeper.session_lock">zookeeper.session_lock</link></entry>
       <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-system;">INI_SYSTEM</constant></entry>
       <entry></entry>
      </row>
      <row>
       <entry><link linkend="ini.zookeeper.sess_lock_wait">zookeeper.sess_lock_wait</link></entry>
       <entry>150000</entry>
-      <entry><constant>INI_ALL</constant></entry>
+      <entry><constant xlink:href="&url.php.manual.constant.ini-all;">INI_ALL</constant></entry>
       <entry></entry>
      </row>
     </tbody>
diff --git a/reference/zookeeper/zookeeperauthenticationexception.xml b/reference/zookeeper/zookeeperauthenticationexception.xml
index 7a4f3e6aa..4b552f28a 100644
--- a/reference/zookeeper/zookeeperauthenticationexception.xml
+++ b/reference/zookeeper/zookeeperauthenticationexception.xml
@@ -38,9 +38,9 @@
      </ooclass>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/zookeeper/zookeeperconnectionexception.xml b/reference/zookeeper/zookeeperconnectionexception.xml
index ad72686a2..6d9987560 100644
--- a/reference/zookeeper/zookeeperconnectionexception.xml
+++ b/reference/zookeeper/zookeeperconnectionexception.xml
@@ -38,9 +38,9 @@
      </ooclass>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 
 <!-- }}} -->
diff --git a/reference/zookeeper/zookeeperexception.xml b/reference/zookeeper/zookeeperexception.xml
index df657076b..b670a1547 100644
--- a/reference/zookeeper/zookeeperexception.xml
+++ b/reference/zookeeper/zookeeperexception.xml
@@ -34,13 +34,13 @@
      </ooclass>
      <ooclass>
       <modifier>extends</modifier>
-      <classname>Exception</classname>
+      <classname xlink:href="&url.php.manual.class.exception;">Exception</classname>
      </ooclass>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 
 <!-- }}} -->
diff --git a/reference/zookeeper/zookeepermarshallingexception.xml b/reference/zookeeper/zookeepermarshallingexception.xml
index 8eb8816f8..79657101c 100644
--- a/reference/zookeeper/zookeepermarshallingexception.xml
+++ b/reference/zookeeper/zookeepermarshallingexception.xml
@@ -38,9 +38,9 @@
      </ooclass>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 
 <!-- }}} -->
diff --git a/reference/zookeeper/zookeepernonodeexception.xml b/reference/zookeeper/zookeepernonodeexception.xml
index eade14e4c..1cdf990a8 100644
--- a/reference/zookeeper/zookeepernonodeexception.xml
+++ b/reference/zookeeper/zookeepernonodeexception.xml
@@ -38,9 +38,9 @@
      </ooclass>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 
 <!-- }}} -->
diff --git a/reference/zookeeper/zookeeperoperationtimeoutexception.xml b/reference/zookeeper/zookeeperoperationtimeoutexception.xml
index f7421e26f..5e2909940 100644
--- a/reference/zookeeper/zookeeperoperationtimeoutexception.xml
+++ b/reference/zookeeper/zookeeperoperationtimeoutexception.xml
@@ -38,9 +38,9 @@
      </ooclass>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 
 <!-- }}} -->
diff --git a/reference/zookeeper/zookeepersessionexception.xml b/reference/zookeeper/zookeepersessionexception.xml
index a41274735..0708dfd5e 100644
--- a/reference/zookeeper/zookeepersessionexception.xml
+++ b/reference/zookeeper/zookeepersessionexception.xml
@@ -38,9 +38,9 @@
      </ooclass>
     </classsynopsisinfo>
     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
+    &class.exception.properties;
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    &class.exception.methods;
    </classsynopsis>
 
 <!-- }}} -->