diff --git a/reference/snmp/snmp.xml b/reference/snmp/snmp.xml
index 7a55a5d81237..ca732df2610c 100644
--- a/reference/snmp/snmp.xml
+++ b/reference/snmp/snmp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.snmp" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://docbook.org/ns/docbook">
+<phpdoc:classref xml:id="class.snmp" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The SNMP class</title>
  <titleabbrev>SNMP</titleabbrev>
  
@@ -30,130 +30,130 @@
      </ooclass>
     </classsynopsisinfo>
 
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>array</type>
-     <varname linkend="snmp.props.info">info</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="snmp.props.max-oids">max_oids</varname>
-    </fieldsynopsis>
+    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
     <fieldsynopsis>
      <modifier>public</modifier>
+     <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.props.valueretrieval">valueretrieval</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>bool</type>
-     <varname linkend="snmp.props.quick-print">quick_print</varname>
+     <varname linkend="snmp.class.constants.version-1">SNMP::VERSION_1</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
-     <type>bool</type>
-     <varname linkend="snmp.props.enum-print">enum_print</varname>
+     <modifier>const</modifier>
+     <type>int</type>
+     <varname linkend="snmp.class.constants.version-2c">SNMP::VERSION_2c</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
+     <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.props.oid-output-format">oid_output_format</varname>
+     <varname linkend="snmp.class.constants.version-2c">SNMP::VERSION_2C</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
-     <type>bool</type>
-     <varname linkend="snmp.props.oid-increasing-check">oid_increasing_check</varname>
+     <modifier>const</modifier>
+     <type>int</type>
+     <varname linkend="snmp.class.constants.version-3">SNMP::VERSION_3</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
+     <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.props.exceptions-enabled">exceptions_enabled</varname>
+     <varname linkend="snmp.class.constants.errno-noerror">SNMP::ERRNO_NOERROR</varname>
     </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.snmp')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SNMP'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.snmp')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SNMP'])">
-     <xi:fallback/>
-    </xi:include>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.errno-noerror">SNMP::ERRNO_NOERROR</varname>
-     <initializer>0</initializer>
+     <varname linkend="snmp.class.constants.errno-any">SNMP::ERRNO_ANY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="snmp.class.constants.errno-generic">SNMP::ERRNO_GENERIC</varname>
-     <initializer>2</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="snmp.class.constants.errno-timeout">SNMP::ERRNO_TIMEOUT</varname>
-     <initializer>4</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="snmp.class.constants.errno-error-in-reply">SNMP::ERRNO_ERROR_IN_REPLY</varname>
-     <initializer>8</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="snmp.class.constants.errno-oid-not-increasing">SNMP::ERRNO_OID_NOT_INCREASING</varname>
-     <initializer>16</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="snmp.class.constants.errno-oid-parsing-error">SNMP::ERRNO_OID_PARSING_ERROR</varname>
-     <initializer>32</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="snmp.class.constants.errno-multiple-set-queries">SNMP::ERRNO_MULTIPLE_SET_QUERIES</varname>
-     <initializer>64</initializer>
     </fieldsynopsis>
+
+    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
     <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="snmp.class.constants.errno-multiple-set-queries">SNMP::ERRNO_ANY</varname>
-     <initializer>126</initializer>
+     <modifier>public</modifier>
+     <modifier>readonly</modifier>
+     <type>array</type>
+     <varname linkend="snmp.props.info">info</varname>
     </fieldsynopsis>
     <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="snmp.class.constants.version-1">SNMP::VERSION_1</varname>
-     <initializer>0</initializer>
+     <modifier>public</modifier>
+     <type class="union"><type>int</type><type>null</type></type>
+     <varname linkend="snmp.props.max-oids">max_oids</varname>
     </fieldsynopsis>
     <fieldsynopsis>
-     <modifier>const</modifier>
+     <modifier>public</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.version-2c">SNMP::VERSION_2C</varname>
-     <initializer>1</initializer>
+     <varname linkend="snmp.props.valueretrieval">valueretrieval</varname>
     </fieldsynopsis>
     <fieldsynopsis>
-     <modifier>const</modifier>
+     <modifier>public</modifier>
+     <type>bool</type>
+     <varname linkend="snmp.props.quick-print">quick_print</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <type>bool</type>
+     <varname linkend="snmp.props.enum-print">enum_print</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.version-2c">SNMP::VERSION_2c</varname>
-     <initializer>1</initializer>
+     <varname linkend="snmp.props.oid-output-format">oid_output_format</varname>
     </fieldsynopsis>
     <fieldsynopsis>
-     <modifier>const</modifier>
+     <modifier>public</modifier>
+     <type>bool</type>
+     <varname linkend="snmp.props.oid-increasing-check">oid_increasing_check</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.version-3">SNMP::VERSION_3</varname>
-     <initializer>3</initializer>
+     <varname linkend="snmp.props.exceptions-enabled">exceptions_enabled</varname>
     </fieldsynopsis>
+
+    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.snmp')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SNMP'])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.snmp')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SNMP'])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
   </section>
 
diff --git a/reference/spl/splpriorityqueue.xml b/reference/spl/splpriorityqueue.xml
index 88528412602a..9b19bf3755a1 100644
--- a/reference/spl/splpriorityqueue.xml
+++ b/reference/spl/splpriorityqueue.xml
@@ -45,6 +45,26 @@
      </oointerface>
     </classsynopsisinfo>
 
+    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <modifier>const</modifier>
+     <type>int</type>
+     <varname linkend="splpriorityqueue.constants.extr-both">SplPriorityQueue::EXTR_BOTH</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <modifier>const</modifier>
+     <type>int</type>
+     <varname linkend="splpriorityqueue.constants.extr-priority">SplPriorityQueue::EXTR_PRIORITY</varname>
+    </fieldsynopsis>
+    <fieldsynopsis>
+     <modifier>public</modifier>
+     <modifier>const</modifier>
+     <type>int</type>
+     <varname linkend="splpriorityqueue.constants.extr-data">SplPriorityQueue::EXTR_DATA</varname>
+    </fieldsynopsis>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.splpriorityqueue')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SplPriorityQueue'])">
      <xi:fallback/>
@@ -52,6 +72,30 @@
    </classsynopsis>
  
   </section>
+
+  <section xml:id="splpriorityqueue.constants">
+   &reftitle.constants;
+   <variablelist>
+    <varlistentry xml:id="splpriorityqueue.constants.extr-both">
+     <term><constant>SplPriorityQueue::EXTR_BOTH</constant></term>
+     <listitem>
+      <para/>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="splpriorityqueue.constants.extr-priority">
+     <term><constant>SplPriorityQueue::EXTR_PRIORITY</constant></term>
+     <listitem>
+      <para/>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="splpriorityqueue.constants.extr-data">
+     <term><constant>SplPriorityQueue::EXTR_DATA</constant></term>
+     <listitem>
+      <para/>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
  
 <!-- {{{ splpriorityqueue properties
   <section xml:id="splpriorityqueue.props">