[DOC-CVS] [doc-en] master: pthreads: fix XML to remove useless wrapping para tags via script

[email protected] (Gina Peter Banyard)
Newsgroups php.doc.cvs
Message-ID <[email protected]>
Author: Gina Peter Banyard (Girgias)
Date: 2026-01-19T03:19:51Z

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

pthreads: fix XML to remove useless wrapping para tags via script

Changed paths:
  M  reference/pthreads/collectable/isgarbage.xml
  M  reference/pthreads/constants.xml
  M  reference/pthreads/pool/collect.xml
  M  reference/pthreads/pool/construct.xml
  M  reference/pthreads/pool/shutdown.xml
  M  reference/pthreads/pool/submit.xml
  M  reference/pthreads/pool/submitTo.xml
  M  reference/pthreads/thread/getcreatorid.xml
  M  reference/pthreads/thread/getcurrentthread.xml
  M  reference/pthreads/thread/getcurrentthreadid.xml
  M  reference/pthreads/thread/getthreadid.xml
  M  reference/pthreads/thread/isjoined.xml
  M  reference/pthreads/thread/isstarted.xml
  M  reference/pthreads/thread/join.xml
  M  reference/pthreads/thread/start.xml
  M  reference/pthreads/threaded/chunk.xml
  M  reference/pthreads/threaded/count.xml
  M  reference/pthreads/threaded/extend.xml
  M  reference/pthreads/threaded/isrunning.xml
  M  reference/pthreads/threaded/isterminated.xml
  M  reference/pthreads/threaded/merge.xml
  M  reference/pthreads/threaded/notify.xml
  M  reference/pthreads/threaded/notifyone.xml
  M  reference/pthreads/threaded/pop.xml
  M  reference/pthreads/threaded/shift.xml
  M  reference/pthreads/threaded/synchronized.xml
  M  reference/pthreads/threaded/wait.xml
  M  reference/pthreads/worker/collect.xml
  M  reference/pthreads/worker/getstacked.xml
  M  reference/pthreads/worker/isshutdown.xml
  M  reference/pthreads/worker/shutdown.xml
  M  reference/pthreads/worker/stack.xml
  M  reference/pthreads/worker/unstack.xml


Diff:

diff --git a/reference/pthreads/collectable/isgarbage.xml b/reference/pthreads/collectable/isgarbage.xml
index cf2beef09c41..c43b1bf5137a 100644
--- a/reference/pthreads/collectable/isgarbage.xml
+++ b/reference/pthreads/collectable/isgarbage.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="collectable.isgarbage" 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="collectable.isgarbage">
  <refnamediv>
   <refname>Collectable::isGarbage</refname>
   <refpurpose>Determine whether an object has been marked as garbage</refpurpose>
@@ -32,34 +31,29 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &return.type.true;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &return.type.true;
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Pool::collect</methodname></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><methodname>Pool::collect</methodname></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/constants.xml b/reference/pthreads/constants.xml
index 3d879fdabc6b..ebcdb94c2ed5 100644
--- a/reference/pthreads/constants.xml
+++ b/reference/pthreads/constants.xml
@@ -1,114 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<appendix xml:id="pthreads.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pthreads.constants">
  &reftitle.constants;
  &extension.constants;
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.pthreads-inherit-all">
-    <term>
-     <constant>PTHREADS_INHERIT_ALL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     The default options for all Threads, causes pthreads to copy the environment when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-inherit-none">
-    <term>
-     <constant>PTHREADS_INHERIT_NONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Do not inherit anything when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-inherit-ini">
-    <term>
-     <constant>PTHREADS_INHERIT_INI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Inherit INI entries when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-inherit-constants">
-    <term>
-     <constant>PTHREADS_INHERIT_CONSTANTS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Inherit user declared constants when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-inherit-classes">
-    <term>
-     <constant>PTHREADS_INHERIT_CLASSES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Inherit user declared classes when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-inherit-functions">
-    <term>
-     <constant>PTHREADS_INHERIT_FUNCTIONS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Inherit user declared functions when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-inherit-includes">
-    <term>
-     <constant>PTHREADS_INHERIT_INCLUDES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Inherit included file information when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-inherit-comments">
-    <term>
-     <constant>PTHREADS_INHERIT_COMMENTS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Inherit all comments when new Threads are started
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.pthreads-allow-headers">
-    <term>
-     <constant>PTHREADS_ALLOW_HEADERS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     Allow new Threads to send headers to standard output (normally prohibited)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
+ <variablelist>
+  <varlistentry xml:id="constant.pthreads-inherit-all">
+   <term>
+    <constant>PTHREADS_INHERIT_ALL</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    The default options for all Threads, causes pthreads to copy the environment when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-inherit-none">
+   <term>
+    <constant>PTHREADS_INHERIT_NONE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Do not inherit anything when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-inherit-ini">
+   <term>
+    <constant>PTHREADS_INHERIT_INI</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Inherit INI entries when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-inherit-constants">
+   <term>
+    <constant>PTHREADS_INHERIT_CONSTANTS</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Inherit user declared constants when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-inherit-classes">
+   <term>
+    <constant>PTHREADS_INHERIT_CLASSES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Inherit user declared classes when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-inherit-functions">
+   <term>
+    <constant>PTHREADS_INHERIT_FUNCTIONS</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Inherit user declared functions when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-inherit-includes">
+   <term>
+    <constant>PTHREADS_INHERIT_INCLUDES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Inherit included file information when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-inherit-comments">
+   <term>
+    <constant>PTHREADS_INHERIT_COMMENTS</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Inherit all comments when new Threads are started
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.pthreads-allow-headers">
+   <term>
+    <constant>PTHREADS_ALLOW_HEADERS</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    Allow new Threads to send headers to standard output (normally prohibited)
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
 </appendix>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/pool/collect.xml b/reference/pthreads/pool/collect.xml
index 9095d03cb984..798821d0e3e3 100644
--- a/reference/pthreads/pool/collect.xml
+++ b/reference/pthreads/pool/collect.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="pool.collect" 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="pool.collect">
  <refnamediv>
   <refname>Pool::collect</refname>
   <refpurpose>Collect references to completed tasks</refpurpose>
@@ -44,35 +43,32 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL pthreads 3.0.0</entry>
-       <entry>
-        An integer is now returned, and the <parameter>collector</parameter>
-        parameter is now optional.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>PECL pthreads 3.0.0</entry>
+      <entry>
+       An integer is now returned, and the <parameter>collector</parameter>
+       parameter is now optional.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>A basic example of <methodname>Pool::collect</methodname></title>
-    <programlisting role="php">
+  <example>
+   <title>A basic example of <methodname>Pool::collect</methodname></title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $pool = new Pool(4);
@@ -85,13 +81,11 @@ while ($pool->collect()); // blocks until all tasks have finished executing
 
 $pool->shutdown();
 ]]>
-    </programlisting>
-   </example>
-  </para>
+   </programlisting>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/pool/construct.xml b/reference/pthreads/pool/construct.xml
index 3be698b9ed62..e4cce10d2a23 100644
--- a/reference/pthreads/pool/construct.xml
+++ b/reference/pthreads/pool/construct.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="pool.construct" 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="pool.construct">
  <refnamediv>
   <refname>Pool::__construct</refname>
   <refpurpose>Creates a new Pool of Workers</refpurpose>
@@ -55,18 +54,17 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating Pools</title>
-    <programlisting role="php">
+  <example>
+   <title>Creating Pools</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class MyWorker extends Worker {
-    
+
     public function __construct(Something $something) {
         $this->something = $something;
     }
-    
+
     public function run() {
         /** ... **/
     }
@@ -77,9 +75,9 @@ $pool = new Pool(8, \MyWorker::class, [new Something()]);
 var_dump($pool);
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 object(Pool)#1 (6) {
   ["size":protected]=>
@@ -100,13 +98,11 @@ object(Pool)#1 (6) {
   int(0)
 }
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/pool/shutdown.xml b/reference/pthreads/pool/shutdown.xml
index 98067af51ba5..b5f4eeece000 100644
--- a/reference/pthreads/pool/shutdown.xml
+++ b/reference/pthreads/pool/shutdown.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="pool.shutdown" 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="pool.shutdown">
  <refnamediv>
   <refname>Pool::shutdown</refname>
   <refpurpose>Shutdown all workers</refpurpose>
@@ -33,10 +32,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Shutting down a pool</title>
-    <programlisting role="php">
+  <example>
+   <title>Shutting down a pool</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class Task extends Threaded
@@ -55,12 +53,10 @@ for ($i = 0; $i < 10; ++$i) {
 
 $pool->shutdown(); // blocks until all submitted tasks have finished executing
 ]]>
-    </programlisting>
-   </example>
-  </para>
+   </programlisting>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/pool/submit.xml b/reference/pthreads/pool/submit.xml
index 14757310d04b..0ca877d54a32 100644
--- a/reference/pthreads/pool/submit.xml
+++ b/reference/pthreads/pool/submit.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="pool.submit" 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="pool.submit">
  <refnamediv>
   <refname>Pool::submit</refname>
   <refpurpose>Submits an object for execution</refpurpose>
@@ -41,25 +40,24 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Submitting Tasks</title>
-    <programlisting role="php">
+  <example>
+   <title>Submitting Tasks</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class MyWork extends Threaded {
-    
+
     public function run() {
         /* ... */
     }
 }
 
 class MyWorker extends Worker {
-    
+
     public function __construct(Something $something) {
         $this->something = $something;
     }
-    
+
     public function run() {
         /** ... **/
     }
@@ -70,9 +68,9 @@ $pool->submit(new MyWork());
 var_dump($pool);
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 object(Pool)#1 (6) {
   ["size":protected]=>
@@ -110,13 +108,11 @@ object(Pool)#1 (6) {
   int(1)
 }
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/pool/submitTo.xml b/reference/pthreads/pool/submitTo.xml
index 60c8354c4137..976c2fb8e349 100644
--- a/reference/pthreads/pool/submitTo.xml
+++ b/reference/pthreads/pool/submitTo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="pool.submitTo" 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="pool.submitTo">
  <refnamediv>
   <refname>Pool::submitTo</refname>
   <refpurpose>Submits a task to a specific worker for execution</refpurpose>
@@ -52,10 +51,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Submitting tasks to a specific worker</title>
-    <programlisting role="php">
+  <example>
+   <title>Submitting tasks to a specific worker</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class Task extends Threaded {
@@ -76,9 +74,9 @@ $pool->submitTo(1, new Task()); // cannot stack the task onto the second worker
 
 $pool->shutdown();
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 int(4475011072)
 int(4475011072)
@@ -89,13 +87,11 @@ int(4475011072)
 
 Fatal error: Uncaught Exception: The selected worker (1) does not exist in %s:%d
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/getcreatorid.xml b/reference/pthreads/thread/getcreatorid.xml
index 21ce13c9e89d..a68032dbfff1 100644
--- a/reference/pthreads/thread/getcreatorid.xml
+++ b/reference/pthreads/thread/getcreatorid.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.getcreatorid" 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="thread.getcreatorid">
  <refnamediv>
   <refname>Thread::getCreatorId</refname>
   <refpurpose>Identification</refpurpose>
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Return the identity of the Thread or Process that created the referenced Thread</title>
-    <programlisting role="php">
+  <example>
+   <title>Return the identity of the Thread or Process that created the referenced Thread</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -47,19 +45,17 @@ $my = new My();
 $my->start();
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 My created by Thread #123456778899
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/getcurrentthread.xml b/reference/pthreads/thread/getcurrentthread.xml
index 10f2ec6b0c3c..e6a85433cdc4 100644
--- a/reference/pthreads/thread/getcurrentthread.xml
+++ b/reference/pthreads/thread/getcurrentthread.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.getcurrentthread" 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="thread.getcurrentthread">
  <refnamediv>
   <refname>Thread::getCurrentThread</refname>
   <refpurpose>Identification</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>Thread</type><methodname>Thread::getCurrentThread</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
  Return a reference to the currently executing Thread
@@ -30,13 +29,12 @@
  An object representing the currently executing Thread
   </para>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Return the currently executing Thread</title>
-    <programlisting role="php">
+  <example>
+   <title>Return the currently executing Thread</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -48,21 +46,19 @@ $my = new My();
 $my->start();
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 object(My)#2 (0) {
 }
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/getcurrentthreadid.xml b/reference/pthreads/thread/getcurrentthreadid.xml
index 7b12d3babff7..df28cbece34c 100644
--- a/reference/pthreads/thread/getcurrentthreadid.xml
+++ b/reference/pthreads/thread/getcurrentthreadid.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.getcurrentthreadid" 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="thread.getcurrentthreadid">
  <refnamediv>
   <refname>Thread::getCurrentThreadId</refname>
   <refpurpose>Identification</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Thread::getCurrentThreadId</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Will return the identity of the currently executing Thread
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Return the identity of the currently executing Thread</title>
-    <programlisting role="php">
+  <example>
+   <title>Return the identity of the currently executing Thread</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -47,19 +45,17 @@ $my = new My();
 $my->start();
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 My is Thread #123456778899
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/getthreadid.xml b/reference/pthreads/thread/getthreadid.xml
index afab3b2f97c0..c3197cbb0dc1 100644
--- a/reference/pthreads/thread/getthreadid.xml
+++ b/reference/pthreads/thread/getthreadid.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.getthreadid" 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="thread.getthreadid">
  <refnamediv>
   <refname>Thread::getThreadId</refname>
   <refpurpose>Identification</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>int</type><methodname>Thread::getThreadId</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Will return the identity of the referenced Thread
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Return the identity of the referenced Thread</title>
-    <programlisting role="php">
+  <example>
+   <title>Return the identity of the referenced Thread</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -47,19 +45,17 @@ $my = new My();
 $my->start();
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 My is Thread #123456778899
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/isjoined.xml b/reference/pthreads/thread/isjoined.xml
index e97d1d32599c..fd953dc49ee9 100644
--- a/reference/pthreads/thread/isjoined.xml
+++ b/reference/pthreads/thread/isjoined.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.isjoined" 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="thread.isjoined">
  <refnamediv>
   <refname>Thread::isJoined</refname>
   <refpurpose>State Detection</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Thread::isJoined</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Tell if the referenced Thread has been joined
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Detect the state of the referenced Thread</title>
-    <programlisting role="php">
+  <example>
+   <title>Detect the state of the referenced Thread</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -55,18 +53,16 @@ $my->synchronized(function($thread){
 }, $my);
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(false)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/isstarted.xml b/reference/pthreads/thread/isstarted.xml
index 554822d58269..2c6cf9746550 100644
--- a/reference/pthreads/thread/isstarted.xml
+++ b/reference/pthreads/thread/isstarted.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.isstarted" 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="thread.isstarted">
  <refnamediv>
   <refname>Thread::isStarted</refname>
   <refpurpose>State Detection</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Thread::isStarted</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
  Tell if the referenced Thread was started
@@ -30,13 +29,12 @@
    &return.success;
   </para>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Tell if the referenced Thread was started</title>
-    <programlisting role="php">
+  <example>
+   <title>Tell if the referenced Thread was started</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $worker = new Worker();
@@ -44,19 +42,17 @@ $worker->start();
 var_dump($worker->isStarted());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/join.xml b/reference/pthreads/thread/join.xml
index 036c80fe2ffb..3132ec645f65 100644
--- a/reference/pthreads/thread/join.xml
+++ b/reference/pthreads/thread/join.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.join" 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="thread.join">
  <refnamediv>
   <refname>Thread::join</refname>
   <refpurpose>Synchronization</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Thread::join</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Causes the calling context to wait for the referenced Thread to finish executing
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Join with the referenced Thread</title>
-    <programlisting role="php">
+  <example>
+   <title>Join with the referenced Thread</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -50,19 +48,17 @@ var_dump($my->join());
 /* ... */
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/thread/start.xml b/reference/pthreads/thread/start.xml
index 08b38cb0e3bd..46594cde8eb3 100644
--- a/reference/pthreads/thread/start.xml
+++ b/reference/pthreads/thread/start.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.start" 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="thread.start">
  <refnamediv>
   <refname>Thread::start</refname>
   <refpurpose>Execution</refpurpose>
@@ -41,10 +40,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Starting Threads</title>
-    <programlisting role="php">
+  <example>
+   <title>Starting Threads</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -56,19 +54,17 @@ $my = new My();
 var_dump($my->start());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/chunk.xml b/reference/pthreads/threaded/chunk.xml
index 23f71bf649f4..08acfe958c60 100644
--- a/reference/pthreads/threaded/chunk.xml
+++ b/reference/pthreads/threaded/chunk.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.chunk" 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="threaded.chunk">
  <refnamediv>
   <refname>Threaded::chunk</refname>
   <refpurpose>Manipulation</refpurpose>
@@ -18,7 +17,7 @@
   Fetches a chunk of the objects property table of the given size, optionally preserving keys
   </para>
  </refsect1>
- 
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <variablelist>
@@ -50,10 +49,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Fetch a chunk of the property table</title>
-    <programlisting role="php">
+  <example>
+   <title>Fetch a chunk of the property table</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $safe = new Threaded();
@@ -65,9 +63,9 @@ while (count($safe) < 10) {
 var_dump($safe->chunk(5));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 array(5) {
   [0]=>
@@ -82,13 +80,11 @@ array(5) {
   int(4)
 }
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/count.xml b/reference/pthreads/threaded/count.xml
index 00e85828fbb8..ba9fbc472b0b 100644
--- a/reference/pthreads/threaded/count.xml
+++ b/reference/pthreads/threaded/count.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.count" 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="threaded.count">
  <refnamediv>
   <refname>Threaded::count</refname>
   <refpurpose>Manipulation</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>int</type><methodname>Threaded::count</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
  Returns the number of properties for this object
@@ -27,16 +26,15 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-  
+
   </para>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Counting the properties of an object</title>
-    <programlisting role="php">
+  <example>
+   <title>Counting the properties of an object</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $safe = new Threaded();
@@ -48,19 +46,17 @@ while (count($safe) < 10) {
 var_dump(count($safe));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 int(10)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/extend.xml b/reference/pthreads/threaded/extend.xml
index 4397e684a798..672d760dec9b 100644
--- a/reference/pthreads/threaded/extend.xml
+++ b/reference/pthreads/threaded/extend.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.extend" 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="threaded.extend">
  <refnamediv>
   <refname>Threaded::extend</refname>
   <refpurpose>Runtime Manipulation</refpurpose>
@@ -17,7 +16,7 @@
   Makes thread safe standard class at runtime
   </para>
  </refsect1>
- 
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <variablelist>
@@ -41,10 +40,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Runtime inheritance</title>
-    <programlisting role="php">
+  <example>
+   <title>Runtime inheritance</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My {}
@@ -56,19 +54,17 @@ $my = new My();
 var_dump($my instanceof Threaded);
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/isrunning.xml b/reference/pthreads/threaded/isrunning.xml
index f395a71cf3f4..ff9d944df729 100644
--- a/reference/pthreads/threaded/isrunning.xml
+++ b/reference/pthreads/threaded/isrunning.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="thread.isrunning" 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="thread.isrunning">
  <refnamediv>
   <refname>Threaded::isRunning</refname>
   <refpurpose>State Detection</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Threaded::isRunning</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Tell if the referenced object is executing
@@ -37,10 +36,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Detect the state of the referenced object</title>
-    <programlisting role="php">
+  <example>
+   <title>Detect the state of the referenced object</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -60,18 +58,16 @@ $my->synchronized(function($thread){
 }, $my);
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/isterminated.xml b/reference/pthreads/threaded/isterminated.xml
index 7e3648e79439..f8259d18c2e8 100644
--- a/reference/pthreads/threaded/isterminated.xml
+++ b/reference/pthreads/threaded/isterminated.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.isterminated" 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="threaded.isterminated">
  <refnamediv>
   <refname>Threaded::isTerminated</refname>
   <refpurpose>State Detection</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Threaded::isTerminated</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    Tell if the referenced object was terminated during execution; suffered fatal errors, or threw uncaught exceptions
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Detect the state of the referenced object</title>
-    <programlisting role="php">
+  <example>
+   <title>Detect the state of the referenced object</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -49,18 +47,16 @@ $my->join();
 var_dump($my->isTerminated());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/merge.xml b/reference/pthreads/threaded/merge.xml
index 4438ca86cf88..f7985f6238cd 100644
--- a/reference/pthreads/threaded/merge.xml
+++ b/reference/pthreads/threaded/merge.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.merge" 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="threaded.merge">
  <refnamediv>
   <refname>Threaded::merge</refname>
   <refpurpose>Manipulation</refpurpose>
@@ -47,13 +46,12 @@
    &return.success;
   </para>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Merging into the property table of a threaded object</title>
-    <programlisting role="php">
+  <example>
+   <title>Merging into the property table of a threaded object</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $array = [];
@@ -75,9 +73,9 @@ $safe->merge($stdClass, false);
 var_dump($safe);
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 object(Threaded)#2 (13) {
   ["0"]=>
@@ -108,12 +106,10 @@ object(Threaded)#2 (13) {
   string(3) "baz"
 }
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/notify.xml b/reference/pthreads/threaded/notify.xml
index 80a20595294d..fdfe448155c4 100644
--- a/reference/pthreads/threaded/notify.xml
+++ b/reference/pthreads/threaded/notify.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.notify" 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="threaded.notify">
  <refnamediv>
   <refname>Threaded::notify</refname>
   <refpurpose>Synchronization</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Threaded::notify</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Send notification to the referenced object
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Notifications and Waiting</title>
-    <programlisting role="php">
+  <example>
+   <title>Notifications and Waiting</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -57,18 +55,16 @@ $my->synchronized(function($thread){
 var_dump($my->join());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/notifyone.xml b/reference/pthreads/threaded/notifyone.xml
index 7901930f0307..fe83842e9585 100644
--- a/reference/pthreads/threaded/notifyone.xml
+++ b/reference/pthreads/threaded/notifyone.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.notifyone" 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="threaded.notifyone">
  <refnamediv>
   <refname>Threaded::notifyOne</refname>
   <refpurpose>Synchronization</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Threaded::notifyOne</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Send notification to the referenced object. This unblocks at least one of the
@@ -34,10 +33,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Notifications and Waiting</title>
-    <programlisting role="php">
+  <example>
+   <title>Notifications and Waiting</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -59,18 +57,16 @@ $my->synchronized(function($thread){
 var_dump($my->join());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/pop.xml b/reference/pthreads/threaded/pop.xml
index 5b9312dd55b8..eb34b89ad930 100644
--- a/reference/pthreads/threaded/pop.xml
+++ b/reference/pthreads/threaded/pop.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.pop" 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="threaded.pop">
  <refnamediv>
   <refname>Threaded::pop</refname>
   <refpurpose>Manipulation</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Threaded::pop</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Pops an item from the objects property table
@@ -29,13 +28,12 @@
   The last item from the objects property table
   </para>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Popping the last item from the property table of a threaded object</title>
-    <programlisting role="php">
+  <example>
+   <title>Popping the last item from the property table of a threaded object</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $safe = new Threaded();
@@ -46,18 +44,16 @@ while (count($safe) < 10)
 var_dump($safe->pop());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 int(9)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/shift.xml b/reference/pthreads/threaded/shift.xml
index 56193936c071..65b0d95a6d3a 100644
--- a/reference/pthreads/threaded/shift.xml
+++ b/reference/pthreads/threaded/shift.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.shift" 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="threaded.shift">
  <refnamediv>
   <refname>Threaded::shift</refname>
   <refpurpose>Manipulation</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>mixed</type><methodname>Threaded::shift</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
   Shifts an item from the objects property table
@@ -29,13 +28,12 @@
   The first item from the objects property table
   </para>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Shifting the first item from the property table of a threaded object</title>
-    <programlisting role="php">
+  <example>
+   <title>Shifting the first item from the property table of a threaded object</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $safe = new Threaded();
@@ -46,18 +44,16 @@ while (count($safe) < 10)
 var_dump($safe->shift());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 int(0)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/synchronized.xml b/reference/pthreads/threaded/synchronized.xml
index dcdc1b686aea..c2a8b8ffaee3 100644
--- a/reference/pthreads/threaded/synchronized.xml
+++ b/reference/pthreads/threaded/synchronized.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.synchronized" 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="threaded.synchronized">
  <refnamediv>
   <refname>Threaded::synchronized</refname>
   <refpurpose>Synchronization</refpurpose>
@@ -50,10 +49,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Synchronizing</title>
-    <programlisting role="php">
+  <example>
+   <title>Synchronizing</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -73,18 +71,16 @@ $my->synchronized(function($thread){
 var_dump($my->join());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/threaded/wait.xml b/reference/pthreads/threaded/wait.xml
index a604a01dbd8f..193f8c5c0446 100644
--- a/reference/pthreads/threaded/wait.xml
+++ b/reference/pthreads/threaded/wait.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="threaded.wait" 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="threaded.wait">
  <refnamediv>
   <refname>Threaded::wait</refname>
   <refpurpose>Synchronization</refpurpose>
@@ -41,10 +40,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Notifications and Waiting</title>
-    <programlisting role="php">
+  <example>
+   <title>Notifications and Waiting</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 class My extends Thread {
@@ -66,18 +64,16 @@ $my->synchronized(function($thread){
 var_dump($my->join());
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/worker/collect.xml b/reference/pthreads/worker/collect.xml
index fafa746d2929..6196560fe6bf 100644
--- a/reference/pthreads/worker/collect.xml
+++ b/reference/pthreads/worker/collect.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="worker.collect" 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="worker.collect">
  <refnamediv>
   <refname>Worker::collect</refname>
   <refpurpose>Collect references to completed tasks</refpurpose>
@@ -44,10 +43,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>A basic example of <methodname>Worker::collect</methodname></title>
-    <programlisting role="php">
+  <example>
+   <title>A basic example of <methodname>Worker::collect</methodname></title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $worker = new Worker();
@@ -68,20 +66,18 @@ echo "There are now {$worker->collect()} tasks on the stack to be collected\n";
 
 $worker->shutdown();
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 There are currently 0 tasks on the stack to be collected
 There are 15 tasks remaining on the stack to be collected
 There are now 0 tasks on the stack to be collected
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/worker/getstacked.xml b/reference/pthreads/worker/getstacked.xml
index 9eb2f6f3982d..1e23af0085f5 100644
--- a/reference/pthreads/worker/getstacked.xml
+++ b/reference/pthreads/worker/getstacked.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="worker.getstacked" 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="worker.getstacked">
  <refnamediv>
   <refname>Worker::getStacked</refname>
   <refpurpose>Gets the remaining stack size</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>int</type><methodname>Worker::getStacked</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    Returns the number of tasks left on the stack
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>A basic example of <classname>Worker::getStacked</classname></title>
-    <programlisting role="php">
+  <example>
+   <title>A basic example of <classname>Worker::getStacked</classname></title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $worker = new Worker();
@@ -46,18 +44,16 @@ for ($i = 0; $i < 5; ++$i) {
 
 echo "There are {$worker->getStacked()} stacked tasks\n";
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 There are 5 stacked tasks
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/worker/isshutdown.xml b/reference/pthreads/worker/isshutdown.xml
index e1ca8d18aab9..7610d2180fe9 100644
--- a/reference/pthreads/worker/isshutdown.xml
+++ b/reference/pthreads/worker/isshutdown.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="worker.isshutdown" 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="worker.isshutdown">
  <refnamediv>
   <refname>Worker::isShutdown</refname>
   <refpurpose>State Detection</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Worker::isShutdown</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    Whether the worker has been shutdown or not.
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Detect the state of a worker</title>
-    <programlisting role="php">
+  <example>
+   <title>Detect the state of a worker</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $worker = new Worker();
@@ -47,20 +45,18 @@ $worker->shutdown();
 
 var_dump($worker->isShutdown());
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(false)
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/worker/shutdown.xml b/reference/pthreads/worker/shutdown.xml
index 0990041f675e..49a24e50ddc5 100644
--- a/reference/pthreads/worker/shutdown.xml
+++ b/reference/pthreads/worker/shutdown.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="worker.shutdown" 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="worker.shutdown">
  <refnamediv>
   <refname>Worker::shutdown</refname>
   <refpurpose>Shutdown the worker</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>Worker::shutdown</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    Shuts down the worker after executing all of the stacked tasks.
@@ -32,10 +31,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Shutdown the referenced worker</title>
-    <programlisting role="php">
+  <example>
+   <title>Shutdown the referenced worker</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $my = new Worker();
@@ -43,18 +41,16 @@ $my->start();
 /* stack/execute tasks */
 var_dump($my->shutdown());
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/worker/stack.xml b/reference/pthreads/worker/stack.xml
index e35867ca3292..1af0d35d018b 100644
--- a/reference/pthreads/worker/stack.xml
+++ b/reference/pthreads/worker/stack.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="worker.stack" 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="worker.stack">
  <refnamediv>
   <refname>Worker::stack</refname>
   <refpurpose>Stacking work</refpurpose>
@@ -41,28 +40,25 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Stacking a task for execution onto a worker</title>
-    <programlisting role="php">
+  <example>
+   <title>Stacking a task for execution onto a worker</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $worker = new Worker();
 $work = new class extends Threaded {};
 
 var_dump($worker->stack($work));]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 int(1)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pthreads/worker/unstack.xml b/reference/pthreads/worker/unstack.xml
index 2d6efb85ce1b..566aff04ffee 100644
--- a/reference/pthreads/worker/unstack.xml
+++ b/reference/pthreads/worker/unstack.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="worker.unstack" 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="worker.unstack">
  <refnamediv>
   <refname>Worker::unstack</refname>
   <refpurpose>Unstacking work</refpurpose>
@@ -32,35 +31,32 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL pthreads 3.0.0</entry>
-       <entry>
-        The parameter to specify the task to unstack has been removed. Now, only the
-        first task in the stack is removed.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>PECL pthreads 3.0.0</entry>
+      <entry>
+       The parameter to specify the task to unstack has been removed. Now, only the
+       first task in the stack is removed.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title>Removing objects from the stack of Workers</title>
-    <programlisting role="php">
+  <example>
+   <title>Removing objects from the stack of Workers</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $my = new Worker();
@@ -69,19 +65,17 @@ $work = new class extends Threaded {};
 var_dump($my->stack($work));
 var_dump($my->unstack());
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 int(1)
 int(0)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
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.