diff --git a/reference/ffi/ffi.xml b/reference/ffi/ffi.xml
index b6804762142d..eb980154fb21 100644
--- a/reference/ffi/ffi.xml
+++ b/reference/ffi/ffi.xml
@@ -61,7 +61,7 @@
 
   </section>
 
-  <section xml:id="ffi-ffi.constants">
+  <section xml:id="class.ffi.constants">
    &reftitle.constants;
    <variablelist>
     <varlistentry xml:id="ffi.constants.biggest-alignment">
diff --git a/reference/intl/collator.xml b/reference/intl/collator.xml
index 23565024eb8a..94febbcc9ec1 100644
--- a/reference/intl/collator.xml
+++ b/reference/intl/collator.xml
@@ -27,121 +27,145 @@
 
     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.default-value">Collator::DEFAULT_VALUE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.primary">Collator::PRIMARY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.secondary">Collator::SECONDARY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.tertiary">Collator::TERTIARY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.default-strength">Collator::DEFAULT_STRENGTH</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.quaternary">Collator::QUATERNARY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.identical">Collator::IDENTICAL</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.off">Collator::OFF</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.on">Collator::ON</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.shifted">Collator::SHIFTED</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.non-ignorable">Collator::NON_IGNORABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.lower-first">Collator::LOWER_FIRST</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.upper-first">Collator::UPPER_FIRST</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.french-collation">Collator::FRENCH_COLLATION</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.alternate-handling">Collator::ALTERNATE_HANDLING</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.case-first">Collator::CASE_FIRST</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.case-level">Collator::CASE_LEVEL</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.normalization-mode">Collator::NORMALIZATION_MODE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.strength">Collator::STRENGTH</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.hiragana-quaternary-mode">Collator::HIRAGANA_QUATERNARY_MODE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.numeric-collation">Collator::NUMERIC_COLLATION</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.sort-regular">Collator::SORT_REGULAR</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.sort-string">Collator::SORT_STRING</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="collator.constants.sort-numeric">Collator::SORT_NUMERIC</varname>
diff --git a/reference/libxml/libxmlerror.xml b/reference/libxml/libxmlerror.xml
index c9e2807145a5..a0cead0ef5ca 100644
--- a/reference/libxml/libxmlerror.xml
+++ b/reference/libxml/libxmlerror.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<phpdoc:classref
- xmlns:phpdoc="http://php.net/ns/phpdoc"
- xml:id="class.libxmlerror"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+<phpdoc:classref xml:id="class.libxmlerror" 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 LibXMLError class</title>
  <titleabbrev>LibXMLError</titleabbrev>
  
@@ -28,17 +22,11 @@
    &reftitle.classsynopsis;
  
 <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LibXMLError</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LibXMLError</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
- 
+   <classsynopsis class="class">
+    <ooclass>
+     <classname>LibXMLError</classname>
+    </ooclass>
+
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
     <fieldsynopsis>
      <modifier>public</modifier>
@@ -140,7 +128,6 @@
  </partintro>
  
 </phpdoc:classref>
- 
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -161,4 +148,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 b5424c968a74..fb4baee98142 100644
--- a/reference/snmp/snmp.xml
+++ b/reference/snmp/snmp.xml
@@ -269,7 +269,7 @@
 <!-- }}} -->
 
   <!-- {{{ SNMP constants -->
-  <section xml:id="snmp.class.constants">
+  <section xml:id="class.snmp.constants">
    &reftitle.constants;
    <section xml:id="snmp.constants.error-types">
     <title><acronym>SNMP</acronym> Error Types</title>
diff --git a/reference/spl/arrayobject.xml b/reference/spl/arrayobject.xml
index 6babd598d24b..ad14da989942 100644
--- a/reference/spl/arrayobject.xml
+++ b/reference/spl/arrayobject.xml
@@ -43,11 +43,13 @@
 
     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="arrayobject.constants.std-prop-list">ArrayObject::STD_PROP_LIST</varname>
     </fieldsynopsis>
     <fieldsynopsis>
+     <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
      <varname linkend="arrayobject.constants.array-as-props">ArrayObject::ARRAY_AS_PROPS</varname>