[DOC-CVS] [doc-en] master: snmp: fix XML by converting para to simpara tags via script

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

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

snmp: fix XML by converting para to simpara tags via script

Changed paths:
  M  reference/snmp/book.xml
  M  reference/snmp/configure.xml
  M  reference/snmp/functions/snmp-get-quick-print.xml
  M  reference/snmp/functions/snmp-get-valueretrieval.xml
  M  reference/snmp/functions/snmp-read-mib.xml
  M  reference/snmp/functions/snmp-set-enum-print.xml
  M  reference/snmp/functions/snmp-set-oid-numeric-print.xml
  M  reference/snmp/functions/snmp-set-oid-output-format.xml
  M  reference/snmp/functions/snmp-set-quick-print.xml
  M  reference/snmp/functions/snmp-set-valueretrieval.xml
  M  reference/snmp/functions/snmp2-get.xml
  M  reference/snmp/functions/snmp2-getnext.xml
  M  reference/snmp/functions/snmp2-real-walk.xml
  M  reference/snmp/functions/snmp2-set.xml
  M  reference/snmp/functions/snmp2-walk.xml
  M  reference/snmp/functions/snmp3-get.xml
  M  reference/snmp/functions/snmp3-getnext.xml
  M  reference/snmp/functions/snmp3-real-walk.xml
  M  reference/snmp/functions/snmp3-set.xml
  M  reference/snmp/functions/snmp3-walk.xml
  M  reference/snmp/functions/snmpget.xml
  M  reference/snmp/functions/snmpgetnext.xml
  M  reference/snmp/functions/snmprealwalk.xml
  M  reference/snmp/functions/snmpset.xml
  M  reference/snmp/functions/snmpwalk.xml
  M  reference/snmp/functions/snmpwalkoid.xml
  M  reference/snmp/setup.xml
  M  reference/snmp/snmp.xml
  M  reference/snmp/snmp/close.xml
  M  reference/snmp/snmp/construct.xml
  M  reference/snmp/snmp/get.xml
  M  reference/snmp/snmp/geterrno.xml
  M  reference/snmp/snmp/geterror.xml
  M  reference/snmp/snmp/getnext.xml
  M  reference/snmp/snmp/set.xml
  M  reference/snmp/snmp/setsecurity.xml
  M  reference/snmp/snmp/walk.xml
  M  reference/snmp/snmpexception.xml


Diff:

diff --git a/reference/snmp/book.xml b/reference/snmp/book.xml
index 93411bfdc58d..e2d020f163c4 100644
--- a/reference/snmp/book.xml
+++ b/reference/snmp/book.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<book xml:id="book.snmp" 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.snmp">
  <?phpdoc extension-membership="bundledexternal" ?>
  <title>SNMP</title>
- 
+
  <!-- {{{ preface -->
  <preface xml:id="intro.snmp">
   &reftitle.intro;
-  <para>
+  <simpara>
    The SNMP extension provides a very simple and easily usable toolset for
    managing remote devices via the Simple Network Management Protocol.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    As it is a wrapper around the underlying Net-SNMP
    library, all basic concepts are the same and the PHP functions change their
    behaviour depending on the Net-SNMP configuration files and environment variables.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    More information about Net-SNMP can be found at
    <link xlink:href="&url.net-snmp;">&url.net-snmp;</link>
-  </para>
+  </simpara>
  </preface>
  <!-- }}} -->
- 
+
  &reference.snmp.setup;
  &reference.snmp.constants;
  &reference.snmp.reference;
@@ -31,7 +30,6 @@
  &reference.snmp.snmp;
  &reference.snmp.snmpexception;
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -52,4 +50,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/snmp/configure.xml b/reference/snmp/configure.xml
index b9b29699ddb1..74620bdd9df2 100644
--- a/reference/snmp/configure.xml
+++ b/reference/snmp/configure.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xml:id="snmp.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="snmp.installation">
  &reftitle.install;
- <para>
+ <simpara>
   The Windows distribution of <link xlink:href="&url.net-snmp;">Net-SNMP</link> contains support files for SNMP in the
   <filename class="directory">mibs</filename> directory. This directory
   should be added to Windows' environment variables, as <envar>MIBDIRS</envar>, with the
   value being the full path to the <filename class="directory">mibs</filename> directory:
   e.g. <filename class="directory">c:\usr\mibs</filename>.
- </para>
+ </simpara>
 </section>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/snmp/functions/snmp-get-quick-print.xml b/reference/snmp/functions/snmp-get-quick-print.xml
index 233cd8866003..5119e733cf48 100644
--- a/reference/snmp/functions/snmp-get-quick-print.xml
+++ b/reference/snmp/functions/snmp-get-quick-print.xml
@@ -13,10 +13,10 @@
    <type>bool</type><methodname>snmp_get_quick_print</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
    Returns the current value stored in the NET-SNMP Library for quick_print.
    quick_print is off by default.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -26,9 +26,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; if quick_print is on, &false; otherwise.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/functions/snmp-get-valueretrieval.xml b/reference/snmp/functions/snmp-get-valueretrieval.xml
index 04d1d26820a0..914e65f40d06 100644
--- a/reference/snmp/functions/snmp-get-valueretrieval.xml
+++ b/reference/snmp/functions/snmp-get-valueretrieval.xml
@@ -24,11 +24,11 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    OR-ed combitantion of constants ( <constant>SNMP_VALUE_LIBRARY</constant> or
    <constant>SNMP_VALUE_PLAIN</constant> ) with
    possible SNMP_VALUE_OBJECT set.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/functions/snmp-read-mib.xml b/reference/snmp/functions/snmp-read-mib.xml
index a31b3247d9ce..a413316add47 100644
--- a/reference/snmp/functions/snmp-read-mib.xml
+++ b/reference/snmp/functions/snmp-read-mib.xml
@@ -14,15 +14,15 @@
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
 
-  <para>
+  <simpara>
    This function is used to load additional, e.g. vendor specific, MIBs so that
    human readable OIDs like <literal>VENDOR-MIB::foo.1</literal> instead of error prone numeric OIDs
    can be used.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    The order in which the MIBs are loaded does matter as the underlying Net-SNMP
    library will print warnings if referenced objects cannot be resolved.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -31,16 +31,16 @@
   <variablelist>
    <varlistentry>
     <term><parameter>filename</parameter></term>
-    <listitem><para>The filename of the <acronym>MIB</acronym>.</para></listitem>
+    <listitem><simpara>The filename of the <acronym>MIB</acronym>.</simpara></listitem>
    </varlistentry>
   </variablelist>
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.success;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
@@ -58,7 +58,7 @@
 ]]>
    </programlisting>
   </example>
-  <para>
+  <simpara>
    The above example is made up but the results would look like:
 <![CDATA[
 Array
@@ -70,7 +70,7 @@ Array
     [FOO-BAR-MIB::someTable.0] => Gauge32: 6
 )
 ]]>
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/snmp/functions/snmp-set-enum-print.xml b/reference/snmp/functions/snmp-set-enum-print.xml
index 87e001f29847..e8cee9061697 100644
--- a/reference/snmp/functions/snmp-set-enum-print.xml
+++ b/reference/snmp/functions/snmp-set-enum-print.xml
@@ -13,10 +13,10 @@
    <type>true</type><methodname>snmp_set_enum_print</methodname>
    <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    This function toggles if snmpwalk/snmpget etc. should automatically lookup enum values
    in the MIB and return them together with their human readable string.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,9 +25,9 @@
    <varlistentry>
     <term><parameter>enable</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       As the value is interpreted as boolean by the Net-SNMP library, it can only be "0" or "1".
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -35,9 +35,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.true.always;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
@@ -72,13 +72,13 @@
 ]]>
    </programlisting>
   </example>
-  <para>
+  <simpara>
    The above  would return
 <![CDATA[
  INTEGER: up(1)
  INTEGER: 1
 ]]>
-  </para>
+  </simpara>
  </refsect1>
 
 </refentry>
diff --git a/reference/snmp/functions/snmp-set-oid-numeric-print.xml b/reference/snmp/functions/snmp-set-oid-numeric-print.xml
index b200c8ebecfc..ce1b482d2d6e 100644
--- a/reference/snmp/functions/snmp-set-oid-numeric-print.xml
+++ b/reference/snmp/functions/snmp-set-oid-numeric-print.xml
@@ -8,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>
+  <simpara>
   &info.function.alias; <function>snmp_set_oid_output_format</function>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/snmp/functions/snmp-set-oid-output-format.xml b/reference/snmp/functions/snmp-set-oid-output-format.xml
index 935af3b9fa04..2bc215d1c75b 100644
--- a/reference/snmp/functions/snmp-set-oid-output-format.xml
+++ b/reference/snmp/functions/snmp-set-oid-output-format.xml
@@ -13,10 +13,10 @@
    <type>true</type><methodname>snmp_set_oid_output_format</methodname>
    <methodparam><type>int</type><parameter>format</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    <function>snmp_set_oid_output_format</function> sets the output format
    to be full or numeric.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -45,9 +45,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.true.always;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
@@ -89,7 +89,7 @@
 ]]>
    </programlisting>
 
-   <para>
+   <simpara>
     The above would output:
 <![CDATA[
  Array
@@ -105,7 +105,7 @@
     [.iso.org.dod.internet.mgmt.mib-2.system.sysObjectID.0] => OID: .iso.org.dod.internet.private.enterprises.netSnmp.netSnmpEnumerations.netSnmpAgentOIDs.linux
  )
 ]]>
-   </para>
+   </simpara>
   </example>
  </refsect1>
 
diff --git a/reference/snmp/functions/snmp-set-quick-print.xml b/reference/snmp/functions/snmp-set-quick-print.xml
index b16779875bed..97c5514c8958 100644
--- a/reference/snmp/functions/snmp-set-quick-print.xml
+++ b/reference/snmp/functions/snmp-set-quick-print.xml
@@ -13,7 +13,7 @@
    <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
   </methodsynopsis>
 
-  <para>
+  <simpara>
    Sets the value of <parameter>enable</parameter> within the NET-<acronym>SNMP</acronym> library.  When this
    is set (1), the <acronym>SNMP</acronym> library will return 'quick printed' values.  This
    means that just the value will be printed.  When <parameter>enable</parameter> is not
@@ -21,15 +21,15 @@
    including the type of the value (i.e. IpAddress or OID).  Additionally,
    if quick_print is not enabled, the library prints additional hex values
    for all strings of three characters or less.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    By default the NET-<acronym>SNMP</acronym> library returns verbose values, quick_print is
    used to return only the value.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    Currently strings are still returned with extra quotes, this will be
    corrected in a later release.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -38,8 +38,8 @@
    <varlistentry>
     <term><parameter>enable</parameter></term>
     <listitem>
-     <para>
-     </para>
+     <simpara>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -47,9 +47,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.true.always;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
@@ -71,10 +71,10 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
+  <simpara>
    Setting quick_print is often used when using the information returned
    rather than displaying it.
-  </para>
+  </simpara>
   <example>
    <title>Using <function>snmp_set_quick_print</function></title>
    <programlisting role="php">
diff --git a/reference/snmp/functions/snmp-set-valueretrieval.xml b/reference/snmp/functions/snmp-set-valueretrieval.xml
index 162610568777..2f656d86be48 100644
--- a/reference/snmp/functions/snmp-set-valueretrieval.xml
+++ b/reference/snmp/functions/snmp-set-valueretrieval.xml
@@ -55,9 +55,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.true.always;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/snmp/functions/snmp2-get.xml b/reference/snmp/functions/snmp2-get.xml
index acc03a8ae259..037b4cfcbd72 100644
--- a/reference/snmp/functions/snmp2-get.xml
+++ b/reference/snmp/functions/snmp2-get.xml
@@ -16,11 +16,11 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    The <function>snmp2_get</function> function is used to read the
    value of an <acronym>SNMP</acronym> object specified by the
    <parameter>object_id</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,41 +29,41 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> agent.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The read community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -71,9 +71,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> object value on success or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/functions/snmp2-getnext.xml b/reference/snmp/functions/snmp2-getnext.xml
index 85b0d92a68e0..e2d215ecc5e2 100644
--- a/reference/snmp/functions/snmp2-getnext.xml
+++ b/reference/snmp/functions/snmp2-getnext.xml
@@ -16,11 +16,11 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    The <function>snmp2_get_next</function> function is used to read the
    value of the <acronym>SNMP</acronym> object that follows the specified
    <parameter>object_id</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,41 +29,41 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the <acronym>SNMP</acronym> agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The read community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id which precedes the wanted one.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -72,10 +72,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> object value on success or &false; on error.
    In case of an error, an E_WARNING message is shown.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/functions/snmp2-real-walk.xml b/reference/snmp/functions/snmp2-real-walk.xml
index df34bb471c53..caf76df3c909 100644
--- a/reference/snmp/functions/snmp2-real-walk.xml
+++ b/reference/snmp/functions/snmp2-real-walk.xml
@@ -16,11 +16,11 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    The <function>snmp2_real_walk</function> function is used to traverse over a number
    of <acronym>SNMP</acronym> objects starting from <parameter>object_id</parameter>
    and return not only their values but also their object ids.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,41 +29,41 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the <acronym>SNMP</acronym> agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The read community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id which precedes the wanted one.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -72,10 +72,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an associative array of the <acronym>SNMP</acronym> object ids and their values on success or &false; on error.
    In case of an error, an E_WARNING message is shown.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
@@ -90,7 +90,7 @@
 ]]>
    </programlisting>
 
-   <para>
+   <simpara>
     The above will output something like:
 <![CDATA[
     Array
@@ -102,7 +102,7 @@
       [IF-MIB::ifName.5] => STRING: sixxs
     )
 ]]>
-   </para>
+   </simpara>
   </example>
  </refsect1>
 
diff --git a/reference/snmp/functions/snmp2-set.xml b/reference/snmp/functions/snmp2-set.xml
index 6b10b16538ad..3bed066017d7 100644
--- a/reference/snmp/functions/snmp2-set.xml
+++ b/reference/snmp/functions/snmp2-set.xml
@@ -18,10 +18,10 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    <function>snmp2_set</function> is used to set the value of an <acronym>SNMP</acronym> object
    specified by the <parameter>object_id</parameter>.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -31,25 +31,25 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the <acronym>SNMP</acronym> agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The write community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -64,25 +64,25 @@
    <varlistentry>
     <term><parameter>value</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The new value.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -90,13 +90,13 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.success;
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    If the SNMP host rejects the data type, an E_WARNING message like "Warning: Error in packet. Reason: (badValue) The value given has the wrong type or length." is shown.
    If an unknown or invalid OID is specified the warning probably reads "Could not add variable".
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/snmp/functions/snmp2-walk.xml b/reference/snmp/functions/snmp2-walk.xml
index fd42d8ed01cc..11d3184ac6a3 100644
--- a/reference/snmp/functions/snmp2-walk.xml
+++ b/reference/snmp/functions/snmp2-walk.xml
@@ -16,10 +16,10 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    <function>snmp2_walk</function> function is used to read all the values from
    an <acronym>SNMP</acronym> agent specified by the <parameter>hostname</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,47 +28,47 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The SNMP agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The read community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       If &null;, <parameter>object_id</parameter> is taken as the root of
       the <acronym>SNMP</acronym> objects tree and all objects under that tree are returned as
       an array.
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       If <parameter>object_id</parameter> is specified, all the <acronym>SNMP</acronym> objects
       below that <parameter>object_id</parameter> are returned.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -76,10 +76,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an array of <acronym>SNMP</acronym> object values starting from the
    <parameter>object_id</parameter> as root or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
@@ -99,11 +99,11 @@ foreach ($a as $val) {
 ]]>
    </programlisting>
   </example>
-  <para>
+  <simpara>
    Above function call would return all the <acronym>SNMP</acronym> objects from the
    <acronym>SNMP</acronym> agent running on localhost. One can step through the values
    with a loop
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/snmp/functions/snmp3-get.xml b/reference/snmp/functions/snmp3-get.xml
index 06a99fec21d1..02707b9a516f 100644
--- a/reference/snmp/functions/snmp3-get.xml
+++ b/reference/snmp/functions/snmp3-get.xml
@@ -21,11 +21,11 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    The <function>snmp3_get</function> function is used to read the
    value of an <acronym>SNMP</acronym> object specified by the
    <parameter>object_id</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -34,82 +34,82 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the <acronym>SNMP</acronym> agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_name</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security name, usually some kind of username
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_level</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security level (noAuthNoPriv|authNoPriv|authPriv)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication protocol (<literal>"MD5"</literal>, <literal>"SHA"</literal>,
       <literal>"SHA256"</literal>, or <literal>"SHA512"</literal>)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy protocol (DES or AES)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -117,9 +117,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> object value on success or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/snmp/functions/snmp3-getnext.xml b/reference/snmp/functions/snmp3-getnext.xml
index 4d1aca71d428..961074947cb9 100644
--- a/reference/snmp/functions/snmp3-getnext.xml
+++ b/reference/snmp/functions/snmp3-getnext.xml
@@ -21,11 +21,11 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    The <function>snmp3_getnext</function> function is used to read the
    value of the <acronym>SNMP</acronym> object that follows the specified
    <parameter>object_id</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -34,83 +34,83 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the
       <acronym>SNMP</acronym> agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_name</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security name, usually some kind of username
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_level</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security level (noAuthNoPriv|authNoPriv|authPriv)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication protocol (<literal>"MD5"</literal>, <literal>"SHA"</literal>,
       <literal>"SHA256"</literal>, or <literal>"SHA512"</literal>)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy protocol (DES or AES)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -118,10 +118,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> object value on success or &false; on error.
    In case of an error, an E_WARNING message is shown.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/snmp/functions/snmp3-real-walk.xml b/reference/snmp/functions/snmp3-real-walk.xml
index 7cf640c3f2df..a4a4e8c8f1cd 100644
--- a/reference/snmp/functions/snmp3-real-walk.xml
+++ b/reference/snmp/functions/snmp3-real-walk.xml
@@ -21,14 +21,14 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    The
    <function>snmp3_real_walk</function> function is used to traverse over a number
    of
    <acronym>SNMP</acronym> objects starting from
    <parameter>object_id</parameter>
    and return not only their values but also their object ids.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -39,10 +39,10 @@
      <parameter>hostname</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the
       <acronym>SNMP</acronym> agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -50,9 +50,9 @@
      <parameter>security_name</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       the security name, usually some kind of username
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -60,9 +60,9 @@
      <parameter>security_level</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       the security level (noAuthNoPriv|authNoPriv|authPriv)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -70,9 +70,9 @@
      <parameter>auth_protocol</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       the authentication protocol (MD5 or SHA)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -80,9 +80,9 @@
      <parameter>auth_passphrase</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       the authentication pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -90,10 +90,10 @@
      <parameter>privacy_protocol</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       the authentication protocol (<literal>"MD5"</literal>, <literal>"SHA"</literal>,
       <literal>"SHA256"</literal>, or <literal>"SHA512"</literal>)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -101,9 +101,9 @@
      <parameter>privacy_passphrase</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       the privacy pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -111,9 +111,9 @@
      <parameter>object_id</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -121,9 +121,9 @@
      <parameter>timeout</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -131,9 +131,9 @@
      <parameter>retries</parameter>
     </term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -141,11 +141,11 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an associative array of the
    <acronym>SNMP</acronym> object ids and their values on success or &false; on error.
    In case of an error, an E_WARNING message is shown.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
@@ -185,7 +185,7 @@
 ]]>
    </programlisting>
 
-   <para>
+   <simpara>
     The above will output something like:
 <![CDATA[
 array (
@@ -196,7 +196,7 @@ array (
   'IF-MIB::ifName.5' => 'STRING: sixxs',
 )
 ]]>
-   </para>
+   </simpara>
   </example>
  </refsect1>
 
diff --git a/reference/snmp/functions/snmp3-set.xml b/reference/snmp/functions/snmp3-set.xml
index 52f20ab82964..e9036db85781 100644
--- a/reference/snmp/functions/snmp3-set.xml
+++ b/reference/snmp/functions/snmp3-set.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.snmp3-set" 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="function.snmp3-set">
  <refnamediv>
   <refname>snmp3_set</refname>
   <refpurpose>Set the value of an SNMP object</refpurpose>
  </refnamediv>
- 
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -23,81 +23,81 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    <function>snmp3_set</function> is used to set the value of an <acronym>SNMP</acronym> object
    specified by the <parameter>object_id</parameter>.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    Even if the security level does not use an auth or priv protocol/password valid values have to be specified.
-  </para>
-  
+  </simpara>
+
  </refsect1>
- 
+
  <refsect1 role="parameters">
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the SNMP agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_name</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security name, usually some kind of username
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_level</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security level (noAuthNoPriv|authNoPriv|authPriv)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication protocol (MD5 or SHA)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy protocol (DES or AES)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -112,41 +112,41 @@
    <varlistentry>
     <term><parameter>value</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The new value
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
  </refsect1>
- 
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.success;
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    If the SNMP host rejects the data type, an E_WARNING message like "Warning: Error in packet. Reason: (badValue) The value given has the wrong type or length." is shown.
    If an unknown or invalid OID is specified the warning probably reads "Could not add variable".
-  </para>
+  </simpara>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
    <example>
@@ -172,8 +172,8 @@
     </programlisting>
    </example>
  </refsect1>
- 
- 
+
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/snmp/functions/snmp3-walk.xml b/reference/snmp/functions/snmp3-walk.xml
index 9cfc2e5b2a44..9b6839ffc656 100644
--- a/reference/snmp/functions/snmp3-walk.xml
+++ b/reference/snmp/functions/snmp3-walk.xml
@@ -21,13 +21,13 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    <function>snmp3_walk</function> function is used to read all the values from
    an <acronym>SNMP</acronym> agent specified by the <parameter>hostname</parameter>.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    Even if the security level does not use an auth or priv protocol/password valid values have to be specified.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -36,88 +36,88 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the SNMP agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_name</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security name, usually some kind of username
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>security_level</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security level (noAuthNoPriv|authNoPriv|authPriv)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication protocol (<literal>"MD5"</literal>, <literal>"SHA"</literal>,
       <literal>"SHA256"</literal>, or <literal>"SHA512"</literal>)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>auth_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_protocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy protocol (DES or AES)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacy_passphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       If &null;, <parameter>object_id</parameter> is taken as the root of
       the <acronym>SNMP</acronym> objects tree and all objects under that tree are returned as
       an array.
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       If <parameter>object_id</parameter> is specified, all the <acronym>SNMP</acronym> objects
       below that <parameter>object_id</parameter> are returned.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -125,10 +125,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an array of <acronym>SNMP</acronym> object values starting from the
    <parameter>object_id</parameter> as root or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
 
@@ -168,7 +168,7 @@ var_export($ret);
 ]]>
    </programlisting>
   </example>
-  <para>
+  <simpara>
    Above function call would return all the <acronym>SNMP</acronym> objects from the
    <acronym>SNMP</acronym> agent running on localhost:
 <![CDATA[
@@ -180,7 +180,7 @@ array (
   4 => 'STRING: sixxs',
 )
 ]]>
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/snmp/functions/snmpget.xml b/reference/snmp/functions/snmpget.xml
index 5b93dd25d3cd..dfaabdf17c41 100644
--- a/reference/snmp/functions/snmpget.xml
+++ b/reference/snmp/functions/snmpget.xml
@@ -16,11 +16,11 @@
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
 
-  <para>
+  <simpara>
    The <function>snmpget</function> function is used to read the
    value of an <acronym>SNMP</acronym> object specified by the
    <parameter>object_id</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,41 +29,41 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> agent.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The read community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -71,9 +71,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> object value on success or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/functions/snmpgetnext.xml b/reference/snmp/functions/snmpgetnext.xml
index 8bfe0ff6c961..a28410409aa9 100644
--- a/reference/snmp/functions/snmpgetnext.xml
+++ b/reference/snmp/functions/snmpgetnext.xml
@@ -18,11 +18,11 @@
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
 
-  <para>
+  <simpara>
    The <function>snmpgetnext</function> function is used to read the
    value of the <acronym>SNMP</acronym> object that follows the specified
    <parameter>object_id</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,33 +30,33 @@
   <variablelist>
    <varlistentry>
     <term><parameter>hostname</parameter></term>
-    <listitem><para>The hostname of the <acronym>SNMP</acronym> agent (server).</para></listitem>
+    <listitem><simpara>The hostname of the <acronym>SNMP</acronym> agent (server).</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
-    <listitem><para>The read community.</para></listitem>
+    <listitem><simpara>The read community.</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
-    <listitem><para>The <acronym>SNMP</acronym> object id which precedes the wanted one.</para></listitem>
+    <listitem><simpara>The <acronym>SNMP</acronym> object id which precedes the wanted one.</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
-    <listitem><para>The number of microseconds until the first timeout.</para></listitem>
+    <listitem><simpara>The number of microseconds until the first timeout.</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
-    <listitem><para>The number of times to retry if timeouts occur.</para></listitem>
+    <listitem><simpara>The number of times to retry if timeouts occur.</simpara></listitem>
    </varlistentry>
   </variablelist>
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> object value on success or &false; on error.
    In case of an error, an E_WARNING message is shown.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/functions/snmprealwalk.xml b/reference/snmp/functions/snmprealwalk.xml
index 6531d8087cb8..f82ba3c3d464 100644
--- a/reference/snmp/functions/snmprealwalk.xml
+++ b/reference/snmp/functions/snmprealwalk.xml
@@ -17,11 +17,11 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    The <function>snmprealwalk</function> function is used to traverse over a number
    of <acronym>SNMP</acronym> objects starting from <parameter>object_id</parameter>
    and return not only their values but also their object ids.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -29,33 +29,33 @@
   <variablelist>
    <varlistentry>
     <term><parameter>hostname</parameter></term>
-    <listitem><para>The hostname of the <acronym>SNMP</acronym> agent (server).</para></listitem>
+    <listitem><simpara>The hostname of the <acronym>SNMP</acronym> agent (server).</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
-    <listitem><para>The read community.</para></listitem>
+    <listitem><simpara>The read community.</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
-    <listitem><para>The <acronym>SNMP</acronym> object id which precedes the wanted one.</para></listitem>
+    <listitem><simpara>The <acronym>SNMP</acronym> object id which precedes the wanted one.</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
-    <listitem><para>The number of microseconds until the first timeout.</para></listitem>
+    <listitem><simpara>The number of microseconds until the first timeout.</simpara></listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
-    <listitem><para>The number of times to retry if timeouts occur.</para></listitem>
+    <listitem><simpara>The number of times to retry if timeouts occur.</simpara></listitem>
    </varlistentry>
   </variablelist>
  </refsect1>
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an associative array of the <acronym>SNMP</acronym> object ids and their values on success or &false; on error.
    In case of an error, an E_WARNING message is shown.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
@@ -70,7 +70,7 @@
 ]]>
    </programlisting>
 
-   <para>
+   <simpara>
     The above will output something like:
 <![CDATA[
     Array
@@ -82,7 +82,7 @@
       [IF-MIB::ifName.5] => STRING: sixxs
     )
 ]]>
-   </para>
+   </simpara>
   </example>
  </refsect1>
 
diff --git a/reference/snmp/functions/snmpset.xml b/reference/snmp/functions/snmpset.xml
index c53c4bd79cfb..ed4c405a2062 100644
--- a/reference/snmp/functions/snmpset.xml
+++ b/reference/snmp/functions/snmpset.xml
@@ -19,10 +19,10 @@
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
 
-  <para>
+  <simpara>
    <function>snmpset</function> is used to set the value of an <acronym>SNMP</acronym> object
    specified by the <parameter>object_id</parameter>.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -32,25 +32,25 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The hostname of the <acronym>SNMP</acronym> agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The write community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The <acronym>SNMP</acronym> object id.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -65,25 +65,25 @@
    <varlistentry>
     <term><parameter>value</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The new value.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -91,13 +91,13 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.success;
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    If the SNMP host rejects the data type, an E_WARNING message like "Warning: Error in packet. Reason: (badValue) The value given has the wrong type or length." is shown.
    If an unknown or invalid OID is specified the warning probably reads "Could not add variable".
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/functions/snmpwalk.xml b/reference/snmp/functions/snmpwalk.xml
index e8b75c0ca24e..6a9d08d50831 100644
--- a/reference/snmp/functions/snmpwalk.xml
+++ b/reference/snmp/functions/snmpwalk.xml
@@ -16,10 +16,10 @@
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
 
-  <para>
+  <simpara>
    <function>snmpwalk</function> function is used to read all the values from
    an <acronym>SNMP</acronym> agent specified by the <parameter>hostname</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,45 +28,45 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The SNMP agent (server).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The read community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       If &null;, <parameter>object_id</parameter> is taken as the root of
       the <acronym>SNMP</acronym> objects tree and all objects under that tree are returned as
       an array.
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       If <parameter>object_id</parameter> is specified, all the <acronym>SNMP</acronym> objects
       below that <parameter>object_id</parameter> are returned.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>The number of times to retry if timeouts occur.</para>
+     <simpara>The number of times to retry if timeouts occur.</simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -74,10 +74,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an array of <acronym>SNMP</acronym> object values starting from the
    <parameter>object_id</parameter> as root or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
@@ -97,11 +97,11 @@ foreach ($a as $val) {
 ]]>
    </programlisting>
   </example>
-  <para>
+  <simpara>
    Above function call would return all the <acronym>SNMP</acronym> objects from the
    <acronym>SNMP</acronym> agent running on localhost. One can step through the values
    with a loop
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/snmp/functions/snmpwalkoid.xml b/reference/snmp/functions/snmpwalkoid.xml
index a9d8afa8db2d..a8099e8f8ae0 100644
--- a/reference/snmp/functions/snmpwalkoid.xml
+++ b/reference/snmp/functions/snmpwalkoid.xml
@@ -17,18 +17,18 @@
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
 
-  <para>
+  <simpara>
    <function>snmpwalkoid</function> function is used to read all object ids
    and their respective values from an SNMP agent specified by
    <parameter>hostname</parameter>.
-  </para>
+  </simpara>
 
-  <para>
+  <simpara>
    The existence of <function>snmpwalkoid</function> and
    <function>snmpwalk</function> has historical reasons.  Both
    functions are provided for backward compatibility.
    Use <function>snmprealwalk</function> instead.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -37,47 +37,47 @@
    <varlistentry>
     <term><parameter>hostname</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The SNMP agent.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The read community.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>object_id</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       If &null;, <parameter>object_id</parameter> is taken as the root of
       the SNMP objects tree and all objects under that tree are returned as
       an array.
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       If <parameter>object_id</parameter> is specified, all the SNMP objects
       below that <parameter>object_id</parameter> are returned.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>timeout</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of microseconds until the first timeout.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>retries</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The number of times to retry if timeouts occur.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -85,11 +85,11 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an associative array with object ids and their respective
    object value starting from the <parameter>object_id</parameter>
    as root or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
@@ -107,11 +107,11 @@ for (reset($a); $i = key($a); next($a)) {
 ]]>
    </programlisting>
   </example>
-  <para>
+  <simpara>
    Above function call would return all the SNMP objects from the
    SNMP agent running on localhost. One can step through the values
    with a loop
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/snmp/setup.xml b/reference/snmp/setup.xml
index 158fd9b09089..99515b88a818 100644
--- a/reference/snmp/setup.xml
+++ b/reference/snmp/setup.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<chapter xml:id="snmp.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="snmp.setup">
  &reftitle.setup;
 
  <!-- {{{ Requirements -->
  <section xml:id="snmp.requirements">
   &reftitle.required;
-  <para>
+  <simpara>
    In order to use the <acronym>SNMP</acronym> functions requires installation of the
    <link xlink:href="&url.net-snmp;">Net-SNMP</link> package. SNMPv3
    functions available only when <link xlink:href="&url.openssl;">OpenSSL</link>
    package is installed too.
-  </para>
-  <para>
+  </simpara>
+  <simpara>
    Net-SNMP version 5.3+ is required for Unix
    installations and Net-SNMP version 5.4+ for Windows.
-  </para>
+  </simpara>
  </section>
  <!-- }}} -->
 
@@ -25,7 +24,6 @@
  <!-- }}} -->
 
 </chapter>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -46,4 +44,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/snmp/snmp.xml b/reference/snmp/snmp.xml
index b7db0e2cdad9..cbb3fd1b1f26 100644
--- a/reference/snmp/snmp.xml
+++ b/reference/snmp/snmp.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xml:id="class.snmp" 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.snmp" role="class">
  <title>The SNMP class</title>
  <titleabbrev>SNMP</titleabbrev>
- 
+
  <partintro>
- 
+
 <!-- {{{ SNMP intro -->
   <section xml:id="snmp.intro">
    &reftitle.intro;
-   <para>
+   <simpara>
     Represents <acronym>SNMP</acronym> session.
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
- 
+
   <section xml:id="snmp.synopsis">
    &reftitle.classsynopsis;
- 
+
 <!-- {{{ Synopsis -->
    <classsynopsis class="class">
     <ooclass>
@@ -158,13 +158,13 @@
     <varlistentry xml:id="snmp.props.max-oids">
      <term><varname>max_oids</varname></term>
      <listitem>
-      <para>Maximum OID per GET/SET/GETBULK request</para>
+      <simpara>Maximum OID per GET/SET/GETBULK request</simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="snmp.props.valueretrieval">
      <term><varname>valueretrieval</varname></term>
      <listitem>
-      <para>Controls the method how the SNMP values will be returned</para>
+      <simpara>Controls the method how the SNMP values will be returned</simpara>
       <informaltable>
        <tgroup cols="2">
         <tbody>
@@ -187,8 +187,8 @@
     <varlistentry xml:id="snmp.props.quick-print">
      <term><varname>quick_print</varname></term>
      <listitem>
-      <para>Value of <parameter>quick_print</parameter> within the NET-<acronym>SNMP</acronym> library</para>
-      <para>
+      <simpara>Value of <parameter>quick_print</parameter> within the NET-<acronym>SNMP</acronym> library</simpara>
+      <simpara>
        Sets the value of <parameter>quick_print</parameter> within the NET-<acronym>SNMP</acronym> library.  When this
        is set (1), the <acronym>SNMP</acronym> library will return 'quick printed' values.  This
        means that just the value will be printed.  When <parameter>quick_print</parameter> is not
@@ -196,23 +196,23 @@
        including the type of the value (i.e. IpAddress or OID).  Additionally,
        if quick_print is not enabled, the library prints additional hex values
        for all strings of three characters or less.
-      </para>
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="snmp.props.enum-print">
      <term><varname>enum_print</varname></term>
      <listitem>
-      <para>Controls the way enum values are printed</para>
-      <para>
+      <simpara>Controls the way enum values are printed</simpara>
+      <simpara>
        Parameter toggles if walk/get etc. should automatically lookup enum values
        in the MIB and return them together with their human readable string.
-      </para>
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="snmp.props.oid-output-format">
      <term><varname>oid_output_format</varname></term>
      <listitem>
-      <para>Controls OID output format</para>
+      <simpara>Controls OID output format</simpara>
       <table>
        <title>OID .1.3.6.1.2.1.1.3.0 representation for various
        <varname>oid_output_format</varname> values</title>
@@ -232,8 +232,8 @@
     <varlistentry xml:id="snmp.props.oid-increasing-check">
      <term><varname>oid_increasing_check</varname></term>
      <listitem>
-      <para>Controls disabling check for increasing OID while walking OID tree</para>
-      <para>
+      <simpara>Controls disabling check for increasing OID while walking OID tree</simpara>
+      <simpara>
        Some <acronym>SNMP</acronym> agents are known for returning OIDs out
        of order but can complete the walk anyway. Other agents return OIDs
        that are out of order and can cause <methodname>SNMP::walk</methodname>
@@ -243,24 +243,24 @@
        about non-increasing OID faced.
        Set <varname>oid_increasing_check</varname> to &false; to disable this
        check.
-      </para>
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="snmp.props.exceptions-enabled">
      <term><varname>exceptions_enabled</varname></term>
      <listitem>
-      <para>
+      <simpara>
        Controls which failures will raise SNMPException instead of
        warning. Use bitwise OR'ed <constant>SNMP::ERRNO_<replaceable>*</replaceable></constant> constants.
        By default all SNMP exceptions are disabled.
-      </para>
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="snmp.props.info">
      <term><varname>info</varname></term>
      <listitem>
-      <para>Read-only property with remote agent configuration: hostname,
-      port, default timeout, default retries count</para>
+      <simpara>Read-only property with remote agent configuration: hostname,
+      port, default timeout, default retries count</simpara>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -277,70 +277,70 @@
      <varlistentry xml:id="snmp.constants.errno-noerror">
       <term><constant>SNMP::ERRNO_NOERROR</constant></term>
       <listitem>
-       <para>No <acronym>SNMP</acronym>-specific error occurred.</para>
+       <simpara>No <acronym>SNMP</acronym>-specific error occurred.</simpara>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.errno-generic">
       <term><constant>SNMP::ERRNO_GENERIC</constant></term>
       <listitem>
-       <para>A generic <acronym>SNMP</acronym> error occurred.</para>
+       <simpara>A generic <acronym>SNMP</acronym> error occurred.</simpara>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.errno-timeout">
       <term><constant>SNMP::ERRNO_TIMEOUT</constant></term>
       <listitem>
-       <para>Request to <acronym>SNMP</acronym> agent timed out.</para>
+       <simpara>Request to <acronym>SNMP</acronym> agent timed out.</simpara>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.errno-error-in-reply">
       <term><constant>SNMP::ERRNO_ERROR_IN_REPLY</constant></term>
       <listitem>
-       <para><acronym>SNMP</acronym> agent returned an error in reply.</para>
+       <simpara><acronym>SNMP</acronym> agent returned an error in reply.</simpara>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.errno-oid-not-increasing">
       <term><constant>SNMP::ERRNO_OID_NOT_INCREASING</constant></term>
       <listitem>
-       <para>
+       <simpara>
         <acronym>SNMP</acronym> agent faced OID cycling reporning
         non-increasing OID while executing (BULK)WALK command.
         This indicates bogus remote <acronym>SNMP</acronym> agent.
-       </para>
+       </simpara>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.errno-oid-parsing-error">
       <term><constant>SNMP::ERRNO_OID_PARSING_ERROR</constant></term>
       <listitem>
-       <para>
+       <simpara>
         Library failed while parsing OID (and/or type for SET command).
         No queries has been made.
-       </para>
+       </simpara>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.errno-multiple-set-queries">
       <term><constant>SNMP::ERRNO_MULTIPLE_SET_QUERIES</constant></term>
       <listitem>
-       <para>
+       <simpara>
         Library will use multiple queries for SET operation requested.
-        That means that operation will be performed in a non-transaction manner 
+        That means that operation will be performed in a non-transaction manner
         and second or subsequent chunks may fail if a type or value failure
         will be faced.
-       </para>
+       </simpara>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.errno-any">
       <term><constant>SNMP::ERRNO_ANY</constant></term>
       <listitem>
-       <para>
+       <simpara>
  All SNMP::ERRNO_* codes bitwise OR'ed.
-       </para>
+       </simpara>
       </listitem>
      </varlistentry>
 
@@ -353,21 +353,21 @@
      <varlistentry xml:id="snmp.constants.version-1">
       <term><constant>SNMP::VERSION_1</constant></term>
       <listitem>
-       <para/>
+       <simpara/>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.version-2c">
       <term><constant>SNMP::VERSION_2C</constant>, <constant>SNMP::VERSION_2c</constant></term>
       <listitem>
-       <para/>
+       <simpara/>
       </listitem>
      </varlistentry>
 
      <varlistentry xml:id="snmp.constants.version-3">
       <term><constant>SNMP::VERSION_3</constant></term>
       <listitem>
-       <para/>
+       <simpara/>
       </listitem>
      </varlistentry>
 
@@ -376,11 +376,11 @@
   </section>
   <!-- }}} -->
 
- 
+
  </partintro>
- 
+
  &reference.snmp.entities.snmp;
- 
+
 </reference>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/snmp/snmp/close.xml b/reference/snmp/snmp/close.xml
index d831643dd35a..ea40cbdf4454 100644
--- a/reference/snmp/snmp/close.xml
+++ b/reference/snmp/snmp/close.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="snmp.close" 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="snmp.close">
  <refnamediv>
   <refname>SNMP::close</refname>
   <refpurpose>Close <acronym>SNMP</acronym> session</refpurpose>
@@ -13,29 +13,29 @@
    <modifier>public</modifier> <type>bool</type><methodname>SNMP::close</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
    Frees previously allocated <acronym>SNMP</acronym> session object.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
   &no.function.parameters;
  </refsect1>
- 
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.success;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="snmp.close.example.basic">
    <title><methodname>SNMP::close</methodname> example</title>
-   <para>
-   </para>
+   <simpara>
+   </simpara>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/snmp/construct.xml b/reference/snmp/snmp/construct.xml
index b2fadfaf585d..d883e5f402fc 100644
--- a/reference/snmp/snmp/construct.xml
+++ b/reference/snmp/snmp/construct.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="snmp.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="snmp.construct">
  <refnamediv>
   <refname>SNMP::__construct</refname>
   <refpurpose>Creates SNMP instance representing session to remote <acronym>SNMP</acronym> agent</refpurpose>
@@ -17,9 +17,9 @@
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>-1</initializer></methodparam>
   </constructorsynopsis>
-  <para>
+  <simpara>
    Creates SNMP instance representing session to remote <acronym>SNMP</acronym> agent.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -28,12 +28,12 @@
    <varlistentry>
     <term><parameter>version</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       <acronym>SNMP</acronym> protocol version:
-      <constant>SNMP::VERSION_1</constant>, 
-      <constant>SNMP::VERSION_2C</constant>, 
+      <constant>SNMP::VERSION_1</constant>,
+      <constant>SNMP::VERSION_2C</constant>,
       <constant>SNMP::VERSION_3</constant>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -67,11 +67,11 @@
    <varlistentry>
     <term><parameter>community</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Specifies the security level for given <parameter>version</parameter>.
       The purpose of <parameter>community</parameter> access string is
       <acronym>SNMP</acronym> version specific:
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <tbody>
@@ -117,17 +117,17 @@
     <varlistentry>
      <term><parameter>timeout</parameter></term>
      <listitem>
-      <para>
+      <simpara>
        The number of microseconds until the first timeout.
-      </para>
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry>
      <term><parameter>retries</parameter></term>
      <listitem>
-      <para>
+      <simpara>
        The number of retries in case timeout occurs.
-      </para>
+      </simpara>
      </listitem>
     </varlistentry>
   </variablelist>
@@ -135,11 +135,11 @@
 
  <refsect1 role="errors">
   &reftitle.errors;
-  <para>
+  <simpara>
    <methodname>SNMP::__construct</methodname> throws an exception when
    parameters count or types are wrong or unknown <acronym>SNMP</acronym>
    protocol version specified.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/snmp/snmp/get.xml b/reference/snmp/snmp/get.xml
index 6dd71ea73f21..b76f5252df9f 100644
--- a/reference/snmp/snmp/get.xml
+++ b/reference/snmp/snmp/get.xml
@@ -14,40 +14,40 @@
    <methodparam><type class="union"><type>array</type><type>string</type></type><parameter>objectId</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>preserveKeys</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Fetch an <acronym>SNMP</acronym> object specified in
    <parameter>objectId</parameter> using GET query.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
-  <para>
+  <simpara>
   If <parameter>objectId</parameter> is a string, then <methodname>SNMP::get</methodname>
   will return <acronym>SNMP</acronym> object as string. If
   <parameter>objectId</parameter> is a array, all requested <acronym>SNMP</acronym>
   objects will be returned as associative array of the <acronym>SNMP</acronym> object ids and their
   values.
-  </para>
+  </simpara>
   <variablelist>
   <varlistentry>
    <term><parameter>objectId</parameter></term>
    <listitem>
-    <para>
+    <simpara>
      The <acronym>SNMP</acronym> object (OID) or objects
-    </para>
+    </simpara>
    </listitem>
   </varlistentry>
   <varlistentry>
    <term><parameter>preserveKeys</parameter></term>
    <listitem>
-    <para>
+    <simpara>
      When <parameter>objectId</parameter> is a array and
      <parameter>preserveKeys</parameter> set to &true; keys in results
      will be taken exactly as in <parameter>objectId</parameter>,
      otherwise <varname>SNMP::oid_output_format</varname> property is used to determinate
      the form of keys.
-    </para>
+    </simpara>
    </listitem>
   </varlistentry>
  </variablelist>
@@ -55,10 +55,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> objects requested as string or array
    depending on <parameter>objectId</parameter> type or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  &snmp.methods.exceptions_enable.refsect;
@@ -67,11 +67,11 @@
   &reftitle.examples;
   <example xml:id="snmp.get.example.singleoid">
    <title>Single <acronym>SNMP</acronym> object</title>
-   <para>
+   <simpara>
      Single <acronym>SNMP</acronym> object may be requested in two ways: as
      string resulting string return value or as single-element array with
      associative array as output.
-   </para>
+   </simpara>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/snmp/geterrno.xml b/reference/snmp/snmp/geterrno.xml
index 39f52e317cbe..df4dd431b1cb 100644
--- a/reference/snmp/snmp/geterrno.xml
+++ b/reference/snmp/snmp/geterrno.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="snmp.geterrno" 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="snmp.geterrno">
  <refnamediv>
   <refname>SNMP::getErrno</refname>
   <refpurpose>Get last error code</refpurpose>
@@ -13,9 +13,9 @@
    <modifier>public</modifier> <type>int</type><methodname>SNMP::getErrno</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
    Returns error code from last SNMP request.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,17 +25,17 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns one of SNMP error code values described in constants chapter.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="snmp.geterrno.example.basic">
    <title><methodname>SNMP::getErrno</methodname> example</title>
-   <para>
-   </para>
+   <simpara>
+   </simpara>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/snmp/geterror.xml b/reference/snmp/snmp/geterror.xml
index 63d92e3da1fe..41a6b8c138a5 100644
--- a/reference/snmp/snmp/geterror.xml
+++ b/reference/snmp/snmp/geterror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="snmp.geterror" 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="snmp.geterror">
  <refnamediv>
   <refname>SNMP::getError</refname>
   <refpurpose>Get last error message</refpurpose>
@@ -13,9 +13,9 @@
    <modifier>public</modifier> <type>string</type><methodname>SNMP::getError</methodname>
    <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
    Returns string with error from last SNMP request.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,17 +25,17 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    String describing error from last SNMP request.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="snmp.geterror.example.basic">
    <title><methodname>SNMP::getError</methodname> example</title>
-   <para>
-   </para>
+   <simpara>
+   </simpara>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/snmp/getnext.xml b/reference/snmp/snmp/getnext.xml
index 175f0a9d4b56..b9612256e2e1 100644
--- a/reference/snmp/snmp/getnext.xml
+++ b/reference/snmp/snmp/getnext.xml
@@ -15,27 +15,27 @@
    <modifier>public</modifier> <type>mixed</type><methodname>SNMP::getnext</methodname>
    <methodparam><type class="union"><type>array</type><type>string</type></type><parameter>objectId</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Fetch an <acronym>SNMP</acronym> object that follows specified <parameter>objectId</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
-  <para>
+  <simpara>
   If <parameter>objectId</parameter> is a string, then <methodname>SNMP::getnext</methodname>
   will return <acronym>SNMP</acronym> object as string. If
   <parameter>objectId</parameter> is a array, all requested <acronym>SNMP</acronym>
   objects will be returned as associative array of the <acronym>SNMP</acronym> object ids and their
   values.
-  </para>
+  </simpara>
   <variablelist>
   <varlistentry>
    <term><parameter>objectId</parameter></term>
    <listitem>
-    <para>
+    <simpara>
      The <acronym>SNMP</acronym> object (OID) or objects
-    </para>
+    </simpara>
    </listitem>
   </varlistentry>
  </variablelist>
@@ -43,10 +43,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <acronym>SNMP</acronym> objects requested as string or array
    depending on <parameter>objectId</parameter> type or &false; on error.
-  </para>
+  </simpara>
  </refsect1>
 
  &snmp.methods.exceptions_enable.refsect;
@@ -55,11 +55,11 @@
   &reftitle.examples;
   <example xml:id="snmp.getnext.example.singleoid">
    <title>Single <acronym>SNMP</acronym> object</title>
-   <para>
+   <simpara>
      Single <acronym>SNMP</acronym> object may be requested in two ways: as
      string resulting string return value or as single-element array with
      associative array as output.
-   </para>
+   </simpara>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/snmp/set.xml b/reference/snmp/snmp/set.xml
index 15da7c91d999..9868b5bdb345 100644
--- a/reference/snmp/snmp/set.xml
+++ b/reference/snmp/snmp/set.xml
@@ -15,16 +15,16 @@
    <methodparam><type class="union"><type>array</type><type>string</type></type><parameter>type</parameter></methodparam>
    <methodparam><type class="union"><type>array</type><type>string</type></type><parameter>value</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Requests remote <acronym>SNMP</acronym> agent setting the value of
    one or more SNMP objects specified by the <parameter>objectId</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
   &reftitle.parameters;
   <variablelist>
-   <para>
+   <simpara>
     If <parameter>objectId</parameter> is <type>string</type>, both
     <parameter>type</parameter> and <parameter>value</parameter> must be
     <type>string</type> too. If <parameter>objectId</parameter> is <type>array</type>
@@ -34,21 +34,21 @@
     <parameter>objectId</parameter>-<parameter>value</parameter> pairs) or
     equal-sized array with per-OID value. When any other parameters' combinations are
     used, a number of E_WARNING messages may be shown with detailed description.
-   </para>
+   </simpara>
    <varlistentry>
     <term><parameter>objectId</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The SNMP object id
-     </para>
-     <para>
+     </simpara>
+     <simpara>
       When count of OIDs in object_id array is greater than
       max_oids object property set method will have to use multiple queries
       to perform requested value updates. In this case type and value checks
       are made per-chunk so second or subsequent requests may fail due to
       wrong type or value for OID requested. To mark this a warning is
       raised when count of OIDs in object_id array is greater than max_oids.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -63,9 +63,9 @@
    <varlistentry>
     <term><parameter>value</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       The new value.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -73,9 +73,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.success;
-  </para>
+  </simpara>
  </refsect1>
 
  &snmp.methods.exceptions_enable.refsect;
diff --git a/reference/snmp/snmp/setsecurity.xml b/reference/snmp/snmp/setsecurity.xml
index d56eabb08557..d2e07592ed32 100644
--- a/reference/snmp/snmp/setsecurity.xml
+++ b/reference/snmp/snmp/setsecurity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="snmp.setsecurity" 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="snmp.setsecurity">
  <refnamediv>
   <refname>SNMP::setSecurity</refname>
   <refpurpose>Configures security-related <acronym>SNMP</acronym>v3 session parameters</refpurpose>
@@ -19,9 +19,9 @@
    <methodparam choice="opt"><type>string</type><parameter>contextName</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>contextEngineId</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    setSecurity configures security-related session parameters used in <acronym>SNMP</acronym> protocol version 3
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -30,57 +30,57 @@
    <varlistentry>
     <term><parameter>securityLevel</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the security level (noAuthNoPriv|authNoPriv|authPriv)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>authProtocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication protocol (MD5 or SHA)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>authPassphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the authentication pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacyProtocol</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy protocol (DES or AES)
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>privacyPassphrase</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the privacy pass phrase
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>contextName</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the context name
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>contextEngineId</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the context EngineID
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -88,17 +88,17 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.success;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="snmp.setsecurity.example.basic">
    <title><methodname>SNMP::setSecurity</methodname> example</title>
-   <para>
-   </para>
+   <simpara>
+   </simpara>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/snmp/walk.xml b/reference/snmp/snmp/walk.xml
index 275d62684698..a29d041531c6 100644
--- a/reference/snmp/snmp/walk.xml
+++ b/reference/snmp/snmp/walk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="snmp.walk" 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="snmp.walk">
  <refnamediv>
   <refname>SNMP::walk</refname>
   <refpurpose>Fetch <acronym>SNMP</acronym> object subtree</refpurpose>
@@ -16,9 +16,9 @@
    <methodparam choice="opt"><type>int</type><parameter>maxRepetitions</parameter><initializer>-1</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>nonRepeaters</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    <methodname>SNMP::walk</methodname> is used to read <acronym>SNMP</acronym> subtree rooted at specified <parameter>objectId</parameter>.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -27,36 +27,36 @@
    <varlistentry>
     <term><parameter>objectId</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Root of subtree to be fetched
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>suffixAsKey</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       By default full OID notation is used for keys in output array.
       If set to &true; subtree prefix will be removed from keys leaving only suffix of object_id.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>nonRepeaters</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       This specifies the number of supplied variables that should not be iterated over.
       The default is to use this value from <acronym>SNMP</acronym> object.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>maxRepetitions</parameter></term>
     <listitem>
-     <para>
+     <simpara>
        This specifies the maximum number of iterations over the repeating variables.
        The default is to use this value from <acronym>SNMP</acronym> object.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -64,13 +64,13 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns an associative array of the <acronym>SNMP</acronym> object ids and their values on success or &false; on error.
    When a <acronym>SNMP</acronym> error occures <methodname>SNMP::getErrno</methodname> and
    <methodname>SNMP::getError</methodname> can be used for retrieving error
    number (specific to SNMP extension, see class constants) and error message
    respectively.
-  </para>
+  </simpara>
  </refsect1>
 
  &snmp.methods.exceptions_enable.refsect;
@@ -106,10 +106,10 @@ Array
   </example>
   <example xml:id="snmp.walk.example.suffix-as-key">
    <title><parameter>suffixAsKey</parameter> example</title>
-   <para>
+   <simpara>
      <parameter>suffixAsKey</parameter> may be used when merging multiple <acronym>SNMP</acronym> subtrees into one.
      This example maps interface names to their type.
-   </para>
+   </simpara>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/snmp/snmpexception.xml b/reference/snmp/snmpexception.xml
index 156d570bc847..ae02e2957c7b 100644
--- a/reference/snmp/snmpexception.xml
+++ b/reference/snmp/snmpexception.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xml:id="class.snmpexception" role="exception" 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.snmpexception" role="exception">
  <title>The SNMPException class</title>
  <titleabbrev>SNMPException</titleabbrev>
- 
+
  <partintro>
- 
+
 <!-- {{{ SNMPException intro -->
   <section xml:id="snmpexception.intro">
    &reftitle.intro;
-   <para>
-    Represents an error raised by SNMP.  You should not throw a 
+   <simpara>
+    Represents an error raised by SNMP.  You should not throw a
     <classname>SNMPException</classname> from your own code.
     See <link linkend="language.exceptions">Exceptions</link> for more
     information about Exceptions in PHP.
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
- 
+
   <section xml:id="snmpexception.synopsis">
    &reftitle.classsynopsis;
- 
+
 <!-- {{{ Synopsis -->
    <classsynopsis class="class">
     <ooexception>
@@ -46,9 +46,9 @@
     </xi:include>
    </classsynopsis>
 <!-- }}} -->
- 
+
   </section>
- 
+
 <!-- {{{ SNMPException properties -->
   <section xml:id="snmpexception.props">
    &reftitle.properties;
@@ -56,17 +56,17 @@
     <varlistentry xml:id="snmpexception.props.code"><!-- {{{ -->
      <term><varname>code</varname></term>
      <listitem>
-      <para>
+      <simpara>
        <literal>SNMP</literal> library error code. Use <function>Exception::getCode</function> to access it.
-      </para>
+      </simpara>
      </listitem>
     </varlistentry><!-- }}} -->
    </variablelist>
   </section>
 <!-- }}} -->
- 
+
  </partintro>
- 
+
 </reference>
 <!-- Keep this comment at the end of the file
 Local variables:
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.