[DOC-CVS] [doc-en] master: ffi: fix XML by converting para to simpara tags via script (#5140)

[email protected] (Gina Peter Banyard via GitHub)
Newsgroups php.doc.cvs
Message-ID <[email protected]>
Author: Gina Peter Banyard (Girgias)
Committer: GitHub (web-flow)
Pusher: Girgias
Date: 2026-01-18T21:59:46Z

Commit: https://github.com/php/doc-en/commit/e14fdcab82e89bfb4ee221b1de9f4764c93abcf5
Raw diff: https://github.com/php/doc-en/commit/e14fdcab82e89bfb4ee221b1de9f4764c93abcf5.diff

ffi: fix XML by converting para to simpara tags via script (#5140)

Changed paths:
  M  reference/ffi/book.xml
  M  reference/ffi/configure.xml
  M  reference/ffi/ctype/getalignment.xml
  M  reference/ffi/ctype/getarrayelementtype.xml
  M  reference/ffi/ctype/getarraylength.xml
  M  reference/ffi/ctype/getattributes.xml
  M  reference/ffi/ctype/getenumkind.xml
  M  reference/ffi/ctype/getfuncabi.xml
  M  reference/ffi/ctype/getfuncparametercount.xml
  M  reference/ffi/ctype/getfuncparametertype.xml
  M  reference/ffi/ctype/getfuncreturntype.xml
  M  reference/ffi/ctype/getkind.xml
  M  reference/ffi/ctype/getname.xml
  M  reference/ffi/ctype/getpointertype.xml
  M  reference/ffi/ctype/getsize.xml
  M  reference/ffi/ctype/getstructfieldnames.xml
  M  reference/ffi/ctype/getstructfieldoffset.xml
  M  reference/ffi/ctype/getstructfieldtype.xml
  M  reference/ffi/examples.xml
  M  reference/ffi/ffi.ctype.xml
  M  reference/ffi/ffi.exception.xml
  M  reference/ffi/ffi.parserexception.xml
  M  reference/ffi/ffi.xml
  M  reference/ffi/ffi/addr.xml
  M  reference/ffi/ffi/alignof.xml
  M  reference/ffi/ffi/arraytype.xml
  M  reference/ffi/ffi/cast.xml
  M  reference/ffi/ffi/cdef.xml
  M  reference/ffi/ffi/free.xml
  M  reference/ffi/ffi/isnull.xml
  M  reference/ffi/ffi/load.xml
  M  reference/ffi/ffi/memcmp.xml
  M  reference/ffi/ffi/memcpy.xml
  M  reference/ffi/ffi/memset.xml
  M  reference/ffi/ffi/new.xml
  M  reference/ffi/ffi/scope.xml
  M  reference/ffi/ffi/sizeof.xml
  M  reference/ffi/ffi/string.xml
  M  reference/ffi/ffi/type.xml
  M  reference/ffi/ffi/typeof.xml
  M  reference/ffi/setup.xml


Diff:

diff --git a/reference/ffi/book.xml b/reference/ffi/book.xml
index 09842b21324e..19e81250a01b 100644
--- a/reference/ffi/book.xml
+++ b/reference/ffi/book.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<book xml:id="book.ffi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.ffi">
  <?phpdoc extension-membership="bundled" ?>
  <title>Foreign Function Interface</title>
  <titleabbrev>FFI</titleabbrev>
 
  <preface xml:id="intro.ffi">
   &reftitle.intro;
-  <para>
+  <simpara>
    This extension allows the loading of shared libraries (<filename>.DLL</filename> or
    <filename>.so</filename>), calling of C functions and accessing of C data structures
    in pure PHP, without having to have deep knowledge of the Zend extension API, and
@@ -16,28 +15,28 @@
    The public API is implemented as a single class <classname>FFI</classname> with
    several static methods (some of them may be called dynamically), and overloaded object
    methods, which perform the actual interaction with C data.
-  </para>
+  </simpara>
   <caution>
-   <para>
+   <simpara>
     FFI is dangerous, since it allows to interface with the system on a very low level.
     The FFI extension should only be used by developers having a working knowledge of C
     and the used C APIs. To minimize the risk, the FFI API usage may be restricted
     with the <link linkend="ini.ffi.enable">ffi.enable</link> &php.ini; directive.
-   </para>
+   </simpara>
   </caution>
   <note>
-   <para>
+   <simpara>
     The FFI extension does not render the classic PHP extension API obsolete; it is merely
     provided for ad-hoc interfacing with C functions and data structures.
-   </para>
+   </simpara>
   </note>
   <tip>
-   <para>
+   <simpara>
     Currently, accessing FFI data structures is significantly (about 2 times) slower
     than accessing native PHP arrays and objects. Therefore, it makes no sense to use
     the FFI extension for speed; however, it may make sense to use it to reduce memory
     consumption.
-   </para>
+   </simpara>
   </tip>
  </preface>
 
@@ -49,7 +48,6 @@
  &reference.ffi.ffi.exception;
  &reference.ffi.ffi.parserexception;
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ffi/configure.xml b/reference/ffi/configure.xml
index 86d09df0b5be..644e7108d2fb 100644
--- a/reference/ffi/configure.xml
+++ b/reference/ffi/configure.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<section xml:id="ffi.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.installation">
  &reftitle.install;
 
- <para>
+ <simpara>
   To enable the FFI extension, PHP has to be configured with
   <option role="configure">--with-ffi</option>.
- </para>
+ </simpara>
 
- <para>
+ <simpara>
   Windows users have to include <filename>php_ffi.dll</filename> into &php.ini;
   to enable the FFI extension.
- </para>
+ </simpara>
 
 </section>
-
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ffi/ctype/getalignment.xml b/reference/ffi/ctype/getalignment.xml
index 33a9dc0e5864..66abe9f270a9 100644
--- a/reference/ffi/ctype/getalignment.xml
+++ b/reference/ffi/ctype/getalignment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getalignment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getalignment">
  <refnamediv>
   <refname>FFI\CType::getAlignment</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getAlignment</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getarrayelementtype.xml b/reference/ffi/ctype/getarrayelementtype.xml
index d05a33c99447..9875e0a3e1a6 100644
--- a/reference/ffi/ctype/getarrayelementtype.xml
+++ b/reference/ffi/ctype/getarrayelementtype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getarrayelementtype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getarrayelementtype">
  <refnamediv>
   <refname>FFI\CType::getArrayElementType</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>FFI\CType</type><methodname>FFI\CType::getArrayElementType</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getarraylength.xml b/reference/ffi/ctype/getarraylength.xml
index 33c1f9c00b29..a5e944197053 100644
--- a/reference/ffi/ctype/getarraylength.xml
+++ b/reference/ffi/ctype/getarraylength.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getarraylength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getarraylength">
  <refnamediv>
   <refname>FFI\CType::getArrayLength</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getArrayLength</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getattributes.xml b/reference/ffi/ctype/getattributes.xml
index bf63ca6c6e9e..481c3442b3e7 100644
--- a/reference/ffi/ctype/getattributes.xml
+++ b/reference/ffi/ctype/getattributes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getattributes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getattributes">
  <refnamediv>
   <refname>FFI\CType::getAttributes</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getAttributes</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getenumkind.xml b/reference/ffi/ctype/getenumkind.xml
index eb9da5d5742c..8d25a8804003 100644
--- a/reference/ffi/ctype/getenumkind.xml
+++ b/reference/ffi/ctype/getenumkind.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getenumkind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getenumkind">
  <refnamediv>
   <refname>FFI\CType::getEnumKind</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getEnumKind</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getfuncabi.xml b/reference/ffi/ctype/getfuncabi.xml
index 6a31d9730a55..b34bd4965644 100644
--- a/reference/ffi/ctype/getfuncabi.xml
+++ b/reference/ffi/ctype/getfuncabi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getfuncabi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getfuncabi">
  <refnamediv>
   <refname>FFI\CType::getFuncABI</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getFuncABI</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getfuncparametercount.xml b/reference/ffi/ctype/getfuncparametercount.xml
index 40c65d213b80..94fa9d5a3379 100644
--- a/reference/ffi/ctype/getfuncparametercount.xml
+++ b/reference/ffi/ctype/getfuncparametercount.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getfuncparametercount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getfuncparametercount">
  <refnamediv>
   <refname>FFI\CType::getFuncParameterCount</refname>
   <refpurpose>Retrieve the count of parameters of a function type</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getFuncParameterCount</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,11 +24,11 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the number of parameters for the underlying function type.
    If the underlying type is not a function, an
    <exceptionname>FFI\Exception</exceptionname> is thrown.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getfuncparametertype.xml b/reference/ffi/ctype/getfuncparametertype.xml
index 3b5dcf8c7604..8ba0f2b26183 100644
--- a/reference/ffi/ctype/getfuncparametertype.xml
+++ b/reference/ffi/ctype/getfuncparametertype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getfuncparametertype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getfuncparametertype">
  <refnamediv>
   <refname>FFI\CType::getFuncParameterType</refname>
   <refpurpose>Retrieve the type of a function parameter</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>FFI\CType</type><methodname>FFI\CType::getFuncParameterType</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Returns the type of a parameter for the underlying function type.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -23,9 +23,9 @@
    <varlistentry>
     <term><parameter>index</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Index of the function parameter, zero-based.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -33,12 +33,12 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the type of a parameter for the underlying function type.
    If the underlying type is not a function, or the given index is outside
    of the range of parameters of the function, an
    <exceptionname>FFI\Exception</exceptionname> is thrown.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getfuncreturntype.xml b/reference/ffi/ctype/getfuncreturntype.xml
index 03ee7961bb3c..9be35f25fab7 100644
--- a/reference/ffi/ctype/getfuncreturntype.xml
+++ b/reference/ffi/ctype/getfuncreturntype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getfuncreturntype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getfuncreturntype">
  <refnamediv>
   <refname>FFI\CType::getFuncReturnType</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>FFI\CType</type><methodname>FFI\CType::getFuncReturnType</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getkind.xml b/reference/ffi/ctype/getkind.xml
index e2aea253acd9..b0fdedac719e 100644
--- a/reference/ffi/ctype/getkind.xml
+++ b/reference/ffi/ctype/getkind.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getkind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getkind">
  <refnamediv>
   <refname>FFI\CType::getKind</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getKind</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getname.xml b/reference/ffi/ctype/getname.xml
index cf865468138f..facd46ed9dfa 100644
--- a/reference/ffi/ctype/getname.xml
+++ b/reference/ffi/ctype/getname.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getname">
  <refnamediv>
   <refname>FFI\CType::getName</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>string</type><methodname>FFI\CType::getName</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getpointertype.xml b/reference/ffi/ctype/getpointertype.xml
index f258d965cd7a..67770f1600db 100644
--- a/reference/ffi/ctype/getpointertype.xml
+++ b/reference/ffi/ctype/getpointertype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getpointertype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getpointertype">
  <refnamediv>
   <refname>FFI\CType::getPointerType</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>FFI\CType</type><methodname>FFI\CType::getPointerType</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getsize.xml b/reference/ffi/ctype/getsize.xml
index d9994cf1db14..b33116572a2b 100644
--- a/reference/ffi/ctype/getsize.xml
+++ b/reference/ffi/ctype/getsize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getsize">
  <refnamediv>
   <refname>FFI\CType::getSize</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getSize</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getstructfieldnames.xml b/reference/ffi/ctype/getstructfieldnames.xml
index 7643e298d1c4..fc1c0a172fd5 100644
--- a/reference/ffi/ctype/getstructfieldnames.xml
+++ b/reference/ffi/ctype/getstructfieldnames.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getstructfieldnames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getstructfieldnames">
  <refnamediv>
   <refname>FFI\CType::getStructFieldNames</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>array</type><methodname>FFI\CType::getStructFieldNames</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getstructfieldoffset.xml b/reference/ffi/ctype/getstructfieldoffset.xml
index 59bc6814df3a..291bcfc6f230 100644
--- a/reference/ffi/ctype/getstructfieldoffset.xml
+++ b/reference/ffi/ctype/getstructfieldoffset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getstructfieldoffset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getstructfieldoffset">
  <refnamediv>
   <refname>FFI\CType::getStructFieldOffset</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>int</type><methodname>FFI\CType::getStructFieldOffset</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -25,9 +25,9 @@
    <varlistentry>
     <term><parameter>name</parameter></term>
     <listitem>
-     <para>
-      
-     </para>
+     <simpara>
+
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -35,9 +35,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/ctype/getstructfieldtype.xml b/reference/ffi/ctype/getstructfieldtype.xml
index b1bc4db70121..5ded7c8d91fb 100644
--- a/reference/ffi/ctype/getstructfieldtype.xml
+++ b/reference/ffi/ctype/getstructfieldtype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ffi-ctype.getstructfieldtype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi-ctype.getstructfieldtype">
  <refnamediv>
   <refname>FFI\CType::getStructFieldType</refname>
   <refpurpose>Description</refpurpose>
@@ -11,9 +11,9 @@
    <modifier>public</modifier> <type>FFI\CType</type><methodname>FFI\CType::getStructFieldType</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
   &warn.undocumented.func;
 
@@ -25,9 +25,9 @@
    <varlistentry>
     <term><parameter>name</parameter></term>
     <listitem>
-     <para>
-      
-     </para>
+     <simpara>
+
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -35,9 +35,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   
-  </para>
+  <simpara>
+
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/ffi/examples.xml b/reference/ffi/examples.xml
index a86673b89b7a..a289fe4575c3 100644
--- a/reference/ffi/examples.xml
+++ b/reference/ffi/examples.xml
@@ -4,15 +4,15 @@
  &reftitle.examples;
  <section xml:id="ffi.examples-basic">
   <title>Basic FFI usage</title>
-  <para>
+  <simpara>
    Before diving into the details of the FFI API, lets take a look at a few examples
    demonstrating the simplicity of the FFI API usage for regular tasks.
-  </para>
+  </simpara>
   <note>
-   <para>
+   <simpara>
     Some of these examples require <filename>libc.so.6</filename> and as such will
     not work on systems where it is not available.
-   </para>
+   </simpara>
   </note>
   <example xml:id="ffi.examples.function">
    <title>Calling a function from shared library</title>
@@ -36,10 +36,10 @@ Hello world!
    </screen>
   </example>
     <note>
-   <para>
+   <simpara>
     Note that some C functions need specific calling conventions, e.g. <literal>__fastcall</literal>,
     <literal>__stdcall</literal> or <literal>,__vectorcall</literal>.
-   </para>
+   </simpara>
   </note>
   <example xml:id="ffi.examples.structure">
    <title>Calling a function, returning a structure through an argument</title>
diff --git a/reference/ffi/ffi.ctype.xml b/reference/ffi/ffi.ctype.xml
index 6591992f329e..3746f2245dfa 100644
--- a/reference/ffi/ffi.ctype.xml
+++ b/reference/ffi/ffi.ctype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xml:id="class.ffi-ctype" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.ffi-ctype" role="class">
 
  <title>C Type Handles</title>
  <titleabbrev>FFI\CType</titleabbrev>
@@ -10,9 +10,9 @@
 <!-- {{{ FFI\CType intro -->
   <section xml:id="ffi-ctype.intro">
    &reftitle.intro;
-   <para>
+   <simpara>
 
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
 
@@ -271,266 +271,266 @@
     <varlistentry xml:id="ffi-ctype.constants.type-void">
      <term><constant>FFI\CType::TYPE_VOID</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-float">
      <term><constant>FFI\CType::TYPE_FLOAT</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-double">
      <term><constant>FFI\CType::TYPE_DOUBLE</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-longdouble">
      <term><constant>FFI\CType::TYPE_LONGDOUBLE</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-uint8">
      <term><constant>FFI\CType::TYPE_UINT8</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-sint8">
      <term><constant>FFI\CType::TYPE_SINT8</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-uint16">
      <term><constant>FFI\CType::TYPE_UINT16</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-sint16">
      <term><constant>FFI\CType::TYPE_SINT16</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-uint32">
      <term><constant>FFI\CType::TYPE_UINT32</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-sint32">
      <term><constant>FFI\CType::TYPE_SINT32</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-uint64">
      <term><constant>FFI\CType::TYPE_UINT64</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-sint64">
      <term><constant>FFI\CType::TYPE_SINT64</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-enum">
      <term><constant>FFI\CType::TYPE_ENUM</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-bool">
      <term><constant>FFI\CType::TYPE_BOOL</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-char">
      <term><constant>FFI\CType::TYPE_CHAR</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-pointer">
      <term><constant>FFI\CType::TYPE_POINTER</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-func">
      <term><constant>FFI\CType::TYPE_FUNC</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-array">
      <term><constant>FFI\CType::TYPE_ARRAY</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.type-struct">
      <term><constant>FFI\CType::TYPE_STRUCT</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-const">
      <term><constant>FFI\CType::ATTR_CONST</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-incomplete-tag">
      <term><constant>FFI\CType::ATTR_INCOMPLETE_TAG</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-variadic">
      <term><constant>FFI\CType::ATTR_VARIADIC</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-incomplete-array">
      <term><constant>FFI\CType::ATTR_INCOMPLETE_ARRAY</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-vla">
      <term><constant>FFI\CType::ATTR_VLA</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-union">
      <term><constant>FFI\CType::ATTR_UNION</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-packed">
      <term><constant>FFI\CType::ATTR_PACKED</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-ms-struct">
      <term><constant>FFI\CType::ATTR_MS_STRUCT</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.attr-gcc-struct">
      <term><constant>FFI\CType::ATTR_GCC_STRUCT</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-default">
      <term><constant>FFI\CType::ABI_DEFAULT</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-cdecl">
      <term><constant>FFI\CType::ABI_CDECL</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-fastcall">
      <term><constant>FFI\CType::ABI_FASTCALL</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-thiscall">
      <term><constant>FFI\CType::ABI_THISCALL</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-stdcall">
      <term><constant>FFI\CType::ABI_STDCALL</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-pascal">
      <term><constant>FFI\CType::ABI_PASCAL</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-register">
      <term><constant>FFI\CType::ABI_REGISTER</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-ms">
      <term><constant>FFI\CType::ABI_MS</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-sysv">
      <term><constant>FFI\CType::ABI_SYSV</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="ffi-ctype.constants.abi-vectorcall">
      <term><constant>FFI\CType::ABI_VECTORCALL</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
    </variablelist>
diff --git a/reference/ffi/ffi.exception.xml b/reference/ffi/ffi.exception.xml
index c0c026c15513..38704188f47f 100644
--- a/reference/ffi/ffi.exception.xml
+++ b/reference/ffi/ffi.exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xml:id="class.ffi-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.ffi-exception" role="class">
 
  <title>FFI Exceptions</title>
  <titleabbrev>FFI\Exception</titleabbrev>
@@ -10,9 +10,9 @@
 <!-- {{{ FFI\Exception intro -->
   <section xml:id="ffi-exception.intro">
    &reftitle.intro;
-   <para>
+   <simpara>
 
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
 
diff --git a/reference/ffi/ffi.parserexception.xml b/reference/ffi/ffi.parserexception.xml
index c54d1dd6f33f..631751e4ea8c 100644
--- a/reference/ffi/ffi.parserexception.xml
+++ b/reference/ffi/ffi.parserexception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xml:id="class.ffi-parserexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.ffi-parserexception" role="class">
 
  <title>FFI Parser Exceptions</title>
  <titleabbrev>FFI\ParserException</titleabbrev>
@@ -10,9 +10,9 @@
 <!-- {{{ FFI\ParserException intro -->
   <section xml:id="ffi-parserexception.intro">
    &reftitle.intro;
-   <para>
+   <simpara>
 
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
 
diff --git a/reference/ffi/ffi.xml b/reference/ffi/ffi.xml
index 3a9fcc758f8f..d81711894fa7 100644
--- a/reference/ffi/ffi.xml
+++ b/reference/ffi/ffi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xml:id="class.ffi" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.ffi" role="class">
 
  <title>Main interface to C code and data</title>
  <titleabbrev>FFI</titleabbrev>
@@ -10,14 +10,14 @@
 <!-- {{{ FFI intro -->
   <section xml:id="ffi.intro">
    &reftitle.intro;
-   <para>
+   <simpara>
     Objects of this class are created by the factory methods <methodname>FFI::cdef</methodname>,
     <methodname>FFI::load</methodname> or <methodname>FFI::scope</methodname>. Defined C variables
     are made available as properties of the FFI instance, and defined C functions are made available
     as methods of the FFI instance. Declared C types can be used to create new C data structures
     using <methodname>FFI::new</methodname> and <methodname>FFI::type</methodname>.
-   </para>
-   <para>
+   </simpara>
+   <simpara>
     FFI definition parsing and shared library loading may take significant time. It is not useful
     to do it on each HTTP request in a Web environment. However, it is possible to preload FFI definitions
     and libraries at PHP startup, and to instantiate FFI objects when necessary. Header files
@@ -27,10 +27,10 @@
     requests through <methodname>FFI::scope</methodname>.
     Refer to the <link linkend="ffi.examples-complete">complete PHP/FFI/preloading example</link>
     for details.
-   </para>
-   <para>
+   </simpara>
+   <simpara>
     It is possible to preload more than one C header file into the same scope.
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
 
@@ -67,7 +67,7 @@
     <varlistentry xml:id="ffi.constants.biggest-alignment">
      <term><constant>FFI::__BIGGEST_ALIGNMENT__</constant></term>
      <listitem>
-      <para/>
+      <simpara/>
      </listitem>
     </varlistentry>
    </variablelist>
diff --git a/reference/ffi/ffi/addr.xml b/reference/ffi/ffi/addr.xml
index 752bced4599f..a83e066b8279 100644
--- a/reference/ffi/ffi/addr.xml
+++ b/reference/ffi/ffi/addr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.addr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.addr">
  <refnamediv>
   <refname>FFI::addr</refname>
   <refpurpose>Creates an unmanaged pointer to C data</refpurpose>
@@ -12,11 +12,11 @@
    <modifier>public</modifier> <modifier>static</modifier> <type>FFI\CData</type><methodname>FFI::addr</methodname>
    <methodparam><type>FFI\CData</type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Creates an unmanaged pointer to the C data represented by the given
    <classname>FFI\CData</classname>. The source <parameter>ptr</parameter> must survive the
    resulting pointer. This function is mainly useful to pass arguments to C functions by pointer.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,9 +25,9 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The handle of the pointer to a C data structure.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -35,9 +35,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI\CData</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/alignof.xml b/reference/ffi/ffi/alignof.xml
index 055a4a0008ac..8c13cde23124 100644
--- a/reference/ffi/ffi/alignof.xml
+++ b/reference/ffi/ffi/alignof.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.alignof" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.alignof">
  <refnamediv>
   <refname>FFI::alignof</refname>
   <refpurpose>Gets the alignment</refpurpose>
@@ -12,10 +12,10 @@
    <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>FFI::alignof</methodname>
    <methodparam><type class="union"><type>FFI\CData</type><type>FFI\CType</type></type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Gets the alignment of the given <classname>FFI\CData</classname> or
    <classname>FFI\CType</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,9 +24,9 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The handle of the C data or type.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -34,10 +34,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the alignment of the given <classname>FFI\CData</classname> or
    <classname>FFI\CType</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/arraytype.xml b/reference/ffi/ffi/arraytype.xml
index 085268535c33..59156ccec124 100644
--- a/reference/ffi/ffi/arraytype.xml
+++ b/reference/ffi/ffi/arraytype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.arraytype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.arraytype">
  <refnamediv>
   <refname>FFI::arrayType</refname>
   <refpurpose>Dynamically constructs a new C array type</refpurpose>
@@ -36,18 +36,18 @@ $t2 = FFI::arrayType(FFI::type("int"), [2, 3]);
    <varlistentry>
     <term><parameter>type</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       A valid C declaration as <type>string</type>, or an instance of <classname>FFI\CType</classname>
       which has already been created.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>dimensions</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The dimensions of the type as <type>array</type>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -55,9 +55,9 @@ $t2 = FFI::arrayType(FFI::type("int"), [2, 3]);
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI\CType</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/cast.xml b/reference/ffi/ffi/cast.xml
index 3c4ab46fd4ca..5db68e345d89 100644
--- a/reference/ffi/ffi/cast.xml
+++ b/reference/ffi/ffi/cast.xml
@@ -13,14 +13,14 @@
    <methodparam><type class="union"><type>FFI\CType</type><type>string</type></type><parameter>type</parameter></methodparam>
    <methodparam><type class="union"><type>FFI\CData</type><type>int</type><type>float</type><type>bool</type><type>null</type></type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    <methodname>FFI::cast</methodname> creates a new <classname>FFI\CData</classname>
    object, that references the same C data structure, but is associated with a different type.
    The resulting object does not own the C data, and the source <parameter>ptr</parameter>
    must survive the result. The C type may be specified as a <type>string</type> with any
    valid C type declaration or as <classname>FFI\CType</classname> object, created before.
    Any type declared for the instance is allowed.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,18 +29,18 @@
    <varlistentry>
     <term><parameter>type</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       A valid C declaration as <type>string</type>, or an instance of <classname>FFI\CType</classname>
       which has already been created.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The handle of the pointer to a C data structure.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -48,9 +48,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI\CData</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/ffi/ffi/cdef.xml b/reference/ffi/ffi/cdef.xml
index 05b82e3fd49b..e0c28719356d 100644
--- a/reference/ffi/ffi/cdef.xml
+++ b/reference/ffi/ffi/cdef.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.cdef" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.cdef">
  <refnamediv>
   <refname>FFI::cdef</refname>
   <refpurpose>Creates a new FFI object</refpurpose>
@@ -13,9 +13,9 @@
    <methodparam choice="opt"><type>string</type><parameter>code</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>lib</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Creates a new FFI object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,32 +24,32 @@
    <varlistentry>
     <term><parameter>code</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       A string containing a sequence of declarations in regular C language
       (types, structures, functions, variables, etc). Actually, this string may
       be copy-pasted from C header files.
-     </para>
+     </simpara>
      <note>
-      <para>
+      <simpara>
        C preprocessor directives are not supported, i.e. <code>#include</code>,
        <code>#define</code> and CPP macros do not work.
-      </para>
+      </simpara>
      </note>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>lib</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The name of a shared library file, to be loaded and linked with the
       definitions.
-     </para>
+     </simpara>
      <note>
-      <para>
+      <simpara>
        If <parameter>lib</parameter> is omitted or &null;, platforms supporting <literal>RTLD_DEFAULT</literal>
        attempt to lookup symbols declared in <parameter>code</parameter> in the normal global
        scope. Other systems will fail to resolve these symbols.
-      </para>
+      </simpara>
      </note>
     </listitem>
    </varlistentry>
@@ -58,9 +58,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog"><!-- {{{ -->
diff --git a/reference/ffi/ffi/free.xml b/reference/ffi/ffi/free.xml
index 4ae176cb8fbf..d2f593ccf3b2 100644
--- a/reference/ffi/ffi/free.xml
+++ b/reference/ffi/ffi/free.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.free" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.free">
  <refnamediv>
   <refname>FFI::free</refname>
   <refpurpose>Releases an unmanaged data structure</refpurpose>
@@ -12,9 +12,9 @@
    <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>FFI::free</methodname>
    <methodparam><type>FFI\CData</type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Manually releases a previously created unmanaged data structure.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -23,9 +23,9 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The handle of the unmanaged pointer to a C data structure.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -33,9 +33,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.void;
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/isnull.xml b/reference/ffi/ffi/isnull.xml
index 526856d8361a..c37b048696bc 100644
--- a/reference/ffi/ffi/isnull.xml
+++ b/reference/ffi/ffi/isnull.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.isnull" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.isnull">
  <refnamediv>
   <refname>FFI::isNull</refname>
   <refpurpose>Checks whether a FFI\CData is a null pointer</refpurpose>
@@ -12,9 +12,9 @@
    <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>FFI::isNull</methodname>
    <methodparam><type>FFI\CData</type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Checks whether a FFI\CData is a null pointer.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -23,9 +23,9 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The handle of the pointer to a C data structure.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -33,9 +33,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns whether a <classname>FFI\CData</classname> is a null pointer.
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/load.xml b/reference/ffi/ffi/load.xml
index e0421b59485b..91e1b9f2bdd2 100644
--- a/reference/ffi/ffi/load.xml
+++ b/reference/ffi/ffi/load.xml
@@ -12,10 +12,10 @@
    <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>FFI</type><type>null</type></type><methodname>FFI::load</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Loads C declarations from a C header file. It is possible to specify shared libraries that should be loaded,
    using special <literal>FFI_LIB</literal> defines in the loaded C header file.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,26 +24,26 @@
    <varlistentry>
     <term><parameter>filename</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The name of a C header file.
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       C preprocessor directives are not supported, i.e. <literal>#include</literal>,
       <literal>#define</literal> and CPP macros do not work, except for special cases
       listed below.
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       The header file <emphasis>should</emphasis> contain a <literal>#define</literal> statement for the
       <literal>FFI_SCOPE</literal> variable, e.g.: <code>#define FFI_SCOPE "MYLIB"</code>.
       Refer to the <link linkend="ffi.intro">class introduction</link> for details.
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       The header file <emphasis>may</emphasis> contain a <literal>#define</literal> statement for the
       <literal>FFI_LIB</literal> variable to specify the library it exposes. If it is
       a system library only the file name is required, e.g.: <code>#define FFI_LIB
       "libc.so.6"</code>.  If it is a custom library, a relative path is required,
       e.g.: <code>#define FFI_LIB "./mylib.so"</code>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -51,9 +51,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI</classname> object, or &null; on failure.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/ffi/ffi/memcmp.xml b/reference/ffi/ffi/memcmp.xml
index 73dfef444596..d6e30147579b 100644
--- a/reference/ffi/ffi/memcmp.xml
+++ b/reference/ffi/ffi/memcmp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.memcmp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.memcmp">
  <refnamediv>
   <refname>FFI::memcmp</refname>
   <refpurpose>Compares memory areas</refpurpose>
@@ -14,12 +14,12 @@
    <methodparam><type class="union"><type>string</type><type>FFI\CData</type></type><parameter role="reference">ptr2</parameter></methodparam>
    <methodparam><type>int</type><parameter>size</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Compares <parameter>size</parameter> bytes from the memory areas <parameter>ptr1</parameter> and
    <parameter>ptr2</parameter>. Both <parameter>ptr1</parameter> and <parameter>ptr2</parameter>
    can be any native data structures (<classname>FFI\CData</classname>) or PHP
    <type>string</type>s.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,25 +28,25 @@
    <varlistentry>
     <term><parameter>ptr1</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The start of one memory area.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>ptr2</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The start of another memory area.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>size</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of bytes to compare.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -54,12 +54,12 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns a value less than <literal>0</literal> if the contents of the memory area starting at <parameter>ptr1</parameter>
    are considered less than the contents of the memory area starting at <parameter>ptr2</parameter>,
    a value greater than <literal>0</literal> if the contents of the first memory area are considered greater than the second,
    and <literal>0</literal> if they are equal.
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/memcpy.xml b/reference/ffi/ffi/memcpy.xml
index 46a33146768a..f67d6a1827d5 100644
--- a/reference/ffi/ffi/memcpy.xml
+++ b/reference/ffi/ffi/memcpy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.memcpy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.memcpy">
  <refnamediv>
   <refname>FFI::memcpy</refname>
   <refpurpose>Copies one memory area to another</refpurpose>
@@ -14,10 +14,10 @@
    <methodparam><type class="union"><type>FFI\CData</type><type>string</type></type><parameter role="reference">from</parameter></methodparam>
    <methodparam><type>int</type><parameter>size</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Copies <parameter>size</parameter> bytes from the memory area <parameter>from</parameter>
    to the memory area <parameter>to</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -26,25 +26,25 @@
    <varlistentry>
     <term><parameter>to</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The start of the memory area to copy to.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>from</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The start of the memory area to copy from.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>size</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of bytes to copy.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -52,9 +52,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.void;
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/memset.xml b/reference/ffi/ffi/memset.xml
index be4d30406922..ab8f9fc3eb48 100644
--- a/reference/ffi/ffi/memset.xml
+++ b/reference/ffi/ffi/memset.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.memset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.memset">
  <refnamediv>
   <refname>FFI::memset</refname>
   <refpurpose>Fills a memory area</refpurpose>
@@ -14,10 +14,10 @@
    <methodparam><type>int</type><parameter>value</parameter></methodparam>
    <methodparam><type>int</type><parameter>size</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Fills <parameter>size</parameter> bytes of the memory area pointed to by
    <parameter>ptr</parameter> with the given byte <parameter>value</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -26,25 +26,25 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The start of the memory area to fill.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>value</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The byte to fill with.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>size</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of bytes to fill.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -52,9 +52,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.void;
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/new.xml b/reference/ffi/ffi/new.xml
index 40e38a0de32a..f46fef1ab0b1 100644
--- a/reference/ffi/ffi/new.xml
+++ b/reference/ffi/ffi/new.xml
@@ -14,10 +14,10 @@
    <methodparam choice="opt"><type>bool</type><parameter>owned</parameter><initializer>&true;</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>persistent</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Creates a native data structure of the given C type.
    Any type declared for the instance is allowed.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -26,31 +26,31 @@
    <varlistentry>
     <term><parameter>type</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       <parameter>type</parameter> is a valid C declaration as <type>string</type>, or an
       instance of <classname>FFI\CType</classname> which has already been created.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>owned</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Whether to create owned (i.e. managed) or unmanaged data. Managed data lives together
       with the returned <classname>FFI\CData</classname> object, and is released when the
       last reference to that object is released by regular PHP reference counting or GC.
       Unmanaged data should be released by calling <methodname>FFI::free</methodname>,
       when no longer needed.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>persistent</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Whether to allocate the C data structure permanently on the system heap (using
       <function>malloc</function>), or on the PHP request heap (using <function>emalloc</function>).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -58,10 +58,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI\CData</classname> object,
    or &null; on failure.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/ffi/ffi/scope.xml b/reference/ffi/ffi/scope.xml
index 71184e81f063..dccc24ba9975 100644
--- a/reference/ffi/ffi/scope.xml
+++ b/reference/ffi/ffi/scope.xml
@@ -12,13 +12,13 @@
    <modifier>public</modifier> <modifier>static</modifier> <type>FFI</type><methodname>FFI::scope</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Instantiates an FFI object with C declarations parsed during preloading.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    The <methodname>FFI::scope</methodname> method is safe to call multiple times for the same scope. Multiple references to the
    same scope may be loaded at the same time.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,9 +27,9 @@
    <varlistentry>
     <term><parameter>name</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The scope name defined by a special <literal>FFI_SCOPE</literal> define.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -37,9 +37,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/ffi/ffi/sizeof.xml b/reference/ffi/ffi/sizeof.xml
index aab10c3ebfe2..7974a965e1d5 100644
--- a/reference/ffi/ffi/sizeof.xml
+++ b/reference/ffi/ffi/sizeof.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.sizeof" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.sizeof">
  <refnamediv>
   <refname>FFI::sizeof</refname>
   <refpurpose>Gets the size of C data or types</refpurpose>
@@ -12,10 +12,10 @@
    <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>FFI::sizeof</methodname>
    <methodparam><type class="union"><type>FFI\CData</type><type>FFI\CType</type></type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Returns the size of the given <classname>FFI\CData</classname> or
    <classname>FFI\CType</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,9 +24,9 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The handle of the C data or type.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -34,9 +34,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    The size of the memory area pointed at by <parameter>ptr</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/ffi/string.xml b/reference/ffi/ffi/string.xml
index 33fb19cbf865..9b49ba0f2d5b 100644
--- a/reference/ffi/ffi/string.xml
+++ b/reference/ffi/ffi/string.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.string" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.string">
  <refnamediv>
   <refname>FFI::string</refname>
   <refpurpose>Creates a PHP string from a memory area</refpurpose>
@@ -13,10 +13,10 @@
    <methodparam><type>FFI\CData</type><parameter role="reference">ptr</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>size</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Creates a PHP <type>string</type> from <parameter>size</parameter> bytes of the memory area
    pointed to by <parameter>ptr</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,19 +25,19 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The start of the memory area from which to create a <type>string</type>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>size</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of bytes to copy to the <type>string</type>.
       If <parameter>size</parameter> is omitted or &null;, <parameter>ptr</parameter> must be a zero terminated
       array of C <literal>char</literal>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -45,9 +45,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    The freshly created PHP <type>string</type>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/ffi/ffi/type.xml b/reference/ffi/ffi/type.xml
index 5fd4ad86b4df..802a1fb32360 100644
--- a/reference/ffi/ffi/type.xml
+++ b/reference/ffi/ffi/type.xml
@@ -12,11 +12,11 @@
    <modifier>public</modifier> <type class="union"><type>FFI\CType</type><type>null</type></type><methodname>FFI::type</methodname>
    <methodparam><type>string</type><parameter>type</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    This function creates and returns a <classname>FFI\CType</classname> object for the
    given <type>string</type> containing a C type declaration.
    Any type declared for the instance is allowed.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,9 +25,9 @@
    <varlistentry>
     <term><parameter>type</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       A valid C declaration as <type>string</type>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -35,10 +35,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the freshly created <classname>FFI\CType</classname> object,
    or &null; on failure.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/ffi/ffi/typeof.xml b/reference/ffi/ffi/typeof.xml
index 778faa8e2a1f..2b87ed99aaf6 100644
--- a/reference/ffi/ffi/typeof.xml
+++ b/reference/ffi/ffi/typeof.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="ffi.typeof" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ffi.typeof">
  <refnamediv>
   <refname>FFI::typeof</refname>
   <refpurpose>Gets the FFI\CType of FFI\CData</refpurpose>
@@ -12,10 +12,10 @@
    <modifier>public</modifier> <modifier>static</modifier> <type>FFI\CType</type><methodname>FFI::typeof</methodname>
    <methodparam><type>FFI\CData</type><parameter role="reference">ptr</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Gets the <classname>FFI\CType</classname> object representing the type of the given
    <classname>FFI\CData</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,9 +24,9 @@
    <varlistentry>
     <term><parameter>ptr</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The handle of the pointer to a C data structure.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -34,10 +34,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns the <classname>FFI\CType</classname> object representing the type of the given
    <classname>FFI\CData</classname> object.
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/ffi/setup.xml b/reference/ffi/setup.xml
index aae320c1a1a6..357c213901b9 100644
--- a/reference/ffi/setup.xml
+++ b/reference/ffi/setup.xml
@@ -5,10 +5,10 @@
 
  <section xml:id="ffi.requirements">
   &reftitle.required;
-  <para>
+  <simpara>
    This extension requires the <link xlink:href="&url.libffi;">libffi library</link>
    to be installed.
-  </para>
+  </simpara>
  </section>
 
  <!-- {{{ Installation -->
@@ -58,17 +58,17 @@
      <type>string</type>
     </term>
     <listitem>
-     <para>
+     <simpara>
       Allows enabling (<literal>"true"</literal>) or disabling
       (<literal>"false"</literal>) FFI API usage, or restricting it only to
       the CLI SAPI and preloaded files (<literal>"preload"</literal>).
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       The FFI API restrictions only affect the <classname>FFI</classname> class,
       but not overloaded functions of <classname>FFI\CData</classname> objects.
       This means that it is possible to create some <classname>FFI\CData</classname>
       objects in preloaded files, and then to use these directly in PHP scripts.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry xml:id="ini.ffi.preload">
@@ -77,12 +77,12 @@
      <type>string</type>
     </term>
     <listitem>
-     <para>
+     <simpara>
       Allows preloading of FFI bindings during startup, which is not possible with <methodname>FFI::load</methodname>
       if <link linkend="ini.opcache.preload-user">opcache.preload_user</link> is set.
       This directive accepts a <constant>DIRECTORY_SEPARATOR</constant> delimited list of filenames.
       The preloaded bindings can be accessed by calling <methodname>FFI::scope</methodname>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.