From 192448ab0e86652b80a2d180021eb84d5ef8daba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Fri, 3 May 2024 22:39:20 +0200
Subject: [PATCH 1/3] Sync some classsynopses with stubs

---
 reference/ffi/ffi.xml            |   4 +-
 reference/intl/collator.xml      |  24 +++++
 reference/libxml/libxmlerror.xml |  26 ++----
 reference/snmp/snmp.xml          |  50 +++++------
 reference/spl/arrayobject.xml    |   2 +
 reference/sqlite3/sqlite3.xml    | 148 +++++++++++++++----------------
 6 files changed, 133 insertions(+), 121 deletions(-)

diff --git a/reference/ffi/ffi.xml b/reference/ffi/ffi.xml
index b6804762142d..febc24f0dd9a 100644
--- a/reference/ffi/ffi.xml
+++ b/reference/ffi/ffi.xml
@@ -49,7 +49,7 @@
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="ffi.constants.biggest-alignment">FFI::__BIGGEST_ALIGNMENT__</varname>
+     <varname linkend="ffi-ffi.constants.biggest-alignment">FFI::__BIGGEST_ALIGNMENT__</varname>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -64,7 +64,7 @@
   <section xml:id="ffi-ffi.constants">
    &reftitle.constants;
    <variablelist>
-    <varlistentry xml:id="ffi.constants.biggest-alignment">
+    <varlistentry xml:id="ffi-ffi.constants.biggest-alignment">
      <term><constant>FFI::__BIGGEST_ALIGNMENT__</constant></term>
      <listitem>
       <para/>
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..b467c1cdc569 100644
--- a/reference/snmp/snmp.xml
+++ b/reference/snmp/snmp.xml
@@ -29,73 +29,73 @@
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.version-1">SNMP::VERSION_1</varname>
+     <varname linkend="snmp.class.constants.version-1">SNMP::VERSION_1</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.version-2c">SNMP::VERSION_2c</varname>
+     <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.constants.version-2c">SNMP::VERSION_2C</varname>
+     <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.constants.version-3">SNMP::VERSION_3</varname>
+     <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.constants.errno-noerror">SNMP::ERRNO_NOERROR</varname>
+     <varname linkend="snmp.class.constants.errno-noerror">SNMP::ERRNO_NOERROR</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.errno-any">SNMP::ERRNO_ANY</varname>
+     <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.constants.errno-generic">SNMP::ERRNO_GENERIC</varname>
+     <varname linkend="snmp.class.constants.errno-generic">SNMP::ERRNO_GENERIC</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.errno-timeout">SNMP::ERRNO_TIMEOUT</varname>
+     <varname linkend="snmp.class.constants.errno-timeout">SNMP::ERRNO_TIMEOUT</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.errno-error-in-reply">SNMP::ERRNO_ERROR_IN_REPLY</varname>
+     <varname linkend="snmp.class.constants.errno-error-in-reply">SNMP::ERRNO_ERROR_IN_REPLY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.errno-oid-not-increasing">SNMP::ERRNO_OID_NOT_INCREASING</varname>
+     <varname linkend="snmp.class.constants.errno-oid-not-increasing">SNMP::ERRNO_OID_NOT_INCREASING</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.errno-oid-parsing-error">SNMP::ERRNO_OID_PARSING_ERROR</varname>
+     <varname linkend="snmp.class.constants.errno-oid-parsing-error">SNMP::ERRNO_OID_PARSING_ERROR</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.constants.errno-multiple-set-queries">SNMP::ERRNO_MULTIPLE_SET_QUERIES</varname>
+     <varname linkend="snmp.class.constants.errno-multiple-set-queries">SNMP::ERRNO_MULTIPLE_SET_QUERIES</varname>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
@@ -271,39 +271,39 @@
   <!-- {{{ SNMP constants -->
   <section xml:id="snmp.class.constants">
    &reftitle.constants;
-   <section xml:id="snmp.constants.error-types">
+   <section xml:id="snmp.class.constants.error-types">
     <title><acronym>SNMP</acronym> Error Types</title>
     <variablelist>
 
-     <varlistentry xml:id="snmp.constants.errno-noerror">
+     <varlistentry xml:id="snmp.class.constants.errno-noerror">
       <term><constant>SNMP::ERRNO_NOERROR</constant></term>
       <listitem>
        <para>No <acronym>SNMP</acronym>-specific error occurred.</para>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.errno-generic">
+     <varlistentry xml:id="snmp.class.constants.errno-generic">
       <term><constant>SNMP::ERRNO_GENERIC</constant></term>
       <listitem>
        <para>A generic <acronym>SNMP</acronym> error occurred.</para>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.errno-timeout">
+     <varlistentry xml:id="snmp.class.constants.errno-timeout">
       <term><constant>SNMP::ERRNO_TIMEOUT</constant></term>
       <listitem>
        <para>Request to <acronym>SNMP</acronym> agent timed out.</para>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.errno-error-in-reply">
+     <varlistentry xml:id="snmp.class.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>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.errno-oid-not-increasing">
+     <varlistentry xml:id="snmp.class.constants.errno-oid-not-increasing">
       <term><constant>SNMP::ERRNO_OID_NOT_INCREASING</constant></term>
       <listitem>
        <para>
@@ -314,7 +314,7 @@
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.errno-oid-parsing-error">
+     <varlistentry xml:id="snmp.class.constants.errno-oid-parsing-error">
       <term><constant>SNMP::ERRNO_OID_PARSING_ERROR</constant></term>
       <listitem>
        <para>
@@ -324,7 +324,7 @@
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.errno-multiple-set-queries">
+     <varlistentry xml:id="snmp.class.constants.errno-multiple-set-queries">
       <term><constant>SNMP::ERRNO_MULTIPLE_SET_QUERIES</constant></term>
       <listitem>
        <para>
@@ -336,7 +336,7 @@
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.errno-any">
+     <varlistentry xml:id="snmp.class.constants.errno-any">
       <term><constant>SNMP::ERRNO_ANY</constant></term>
       <listitem>
        <para>
@@ -347,25 +347,25 @@
 
     </variablelist>
    </section>
-   <section xml:id="snmp.constants.protocols">
+   <section xml:id="snmp.class.constants.protocols">
     <title><acronym>SNMP</acronym> Protocol Versions</title>
     <variablelist>
 
-     <varlistentry xml:id="snmp.constants.version-1">
+     <varlistentry xml:id="snmp.class.constants.version-1">
       <term><constant>SNMP::VERSION_1</constant></term>
       <listitem>
        <para/>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.version-2c">
+     <varlistentry xml:id="snmp.class.constants.version-2c">
       <term><constant>SNMP::VERSION_2C</constant>, <constant>SNMP::VERSION_2c</constant></term>
       <listitem>
        <para/>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.constants.version-3">
+     <varlistentry xml:id="snmp.class.constants.version-3">
       <term><constant>SNMP::VERSION_3</constant></term>
       <listitem>
        <para/>
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>
diff --git a/reference/sqlite3/sqlite3.xml b/reference/sqlite3/sqlite3.xml
index 603728662ab5..3956b5ca37ce 100644
--- a/reference/sqlite3/sqlite3.xml
+++ b/reference/sqlite3/sqlite3.xml
@@ -29,223 +29,223 @@
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.ok">SQLite3::OK</varname>
+     <varname linkend="sqlite3.class.constants.ok">SQLite3::OK</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.deny">SQLite3::DENY</varname>
+     <varname linkend="sqlite3.class.constants.deny">SQLite3::DENY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.ignore">SQLite3::IGNORE</varname>
+     <varname linkend="sqlite3.class.constants.ignore">SQLite3::IGNORE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-index">SQLite3::CREATE_INDEX</varname>
+     <varname linkend="sqlite3.class.constants.create-index">SQLite3::CREATE_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-table">SQLite3::CREATE_TABLE</varname>
+     <varname linkend="sqlite3.class.constants.create-table">SQLite3::CREATE_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-temp-index">SQLite3::CREATE_TEMP_INDEX</varname>
+     <varname linkend="sqlite3.class.constants.create-temp-index">SQLite3::CREATE_TEMP_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-temp-table">SQLite3::CREATE_TEMP_TABLE</varname>
+     <varname linkend="sqlite3.class.constants.create-temp-table">SQLite3::CREATE_TEMP_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-temp-trigger">SQLite3::CREATE_TEMP_TRIGGER</varname>
+     <varname linkend="sqlite3.class.constants.create-temp-trigger">SQLite3::CREATE_TEMP_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-temp-view">SQLite3::CREATE_TEMP_VIEW</varname>
+     <varname linkend="sqlite3.class.constants.create-temp-view">SQLite3::CREATE_TEMP_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-trigger">SQLite3::CREATE_TRIGGER</varname>
+     <varname linkend="sqlite3.class.constants.create-trigger">SQLite3::CREATE_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-view">SQLite3::CREATE_VIEW</varname>
+     <varname linkend="sqlite3.class.constants.create-view">SQLite3::CREATE_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.delete">SQLite3::DELETE</varname>
+     <varname linkend="sqlite3.class.constants.delete">SQLite3::DELETE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-index">SQLite3::DROP_INDEX</varname>
+     <varname linkend="sqlite3.class.constants.drop-index">SQLite3::DROP_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-table">SQLite3::DROP_TABLE</varname>
+     <varname linkend="sqlite3.class.constants.drop-table">SQLite3::DROP_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-temp-index">SQLite3::DROP_TEMP_INDEX</varname>
+     <varname linkend="sqlite3.class.constants.drop-temp-index">SQLite3::DROP_TEMP_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-temp-table">SQLite3::DROP_TEMP_TABLE</varname>
+     <varname linkend="sqlite3.class.constants.drop-temp-table">SQLite3::DROP_TEMP_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-temp-trigger">SQLite3::DROP_TEMP_TRIGGER</varname>
+     <varname linkend="sqlite3.class.constants.drop-temp-trigger">SQLite3::DROP_TEMP_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-temp-view">SQLite3::DROP_TEMP_VIEW</varname>
+     <varname linkend="sqlite3.class.constants.drop-temp-view">SQLite3::DROP_TEMP_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-trigger">SQLite3::DROP_TRIGGER</varname>
+     <varname linkend="sqlite3.class.constants.drop-trigger">SQLite3::DROP_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-view">SQLite3::DROP_VIEW</varname>
+     <varname linkend="sqlite3.class.constants.drop-view">SQLite3::DROP_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.insert">SQLite3::INSERT</varname>
+     <varname linkend="sqlite3.class.constants.insert">SQLite3::INSERT</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.pragma">SQLite3::PRAGMA</varname>
+     <varname linkend="sqlite3.class.constants.pragma">SQLite3::PRAGMA</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.read">SQLite3::READ</varname>
+     <varname linkend="sqlite3.class.constants.read">SQLite3::READ</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.select">SQLite3::SELECT</varname>
+     <varname linkend="sqlite3.class.constants.select">SQLite3::SELECT</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.transaction">SQLite3::TRANSACTION</varname>
+     <varname linkend="sqlite3.class.constants.transaction">SQLite3::TRANSACTION</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.update">SQLite3::UPDATE</varname>
+     <varname linkend="sqlite3.class.constants.update">SQLite3::UPDATE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.attach">SQLite3::ATTACH</varname>
+     <varname linkend="sqlite3.class.constants.attach">SQLite3::ATTACH</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.detach">SQLite3::DETACH</varname>
+     <varname linkend="sqlite3.class.constants.detach">SQLite3::DETACH</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.alter-table">SQLite3::ALTER_TABLE</varname>
+     <varname linkend="sqlite3.class.constants.alter-table">SQLite3::ALTER_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.reindex">SQLite3::REINDEX</varname>
+     <varname linkend="sqlite3.class.constants.reindex">SQLite3::REINDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.analyze">SQLite3::ANALYZE</varname>
+     <varname linkend="sqlite3.class.constants.analyze">SQLite3::ANALYZE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.create-vtable">SQLite3::CREATE_VTABLE</varname>
+     <varname linkend="sqlite3.class.constants.create-vtable">SQLite3::CREATE_VTABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.drop-vtable">SQLite3::DROP_VTABLE</varname>
+     <varname linkend="sqlite3.class.constants.drop-vtable">SQLite3::DROP_VTABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.function">SQLite3::FUNCTION</varname>
+     <varname linkend="sqlite3.class.constants.function">SQLite3::FUNCTION</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.savepoint">SQLite3::SAVEPOINT</varname>
+     <varname linkend="sqlite3.class.constants.savepoint">SQLite3::SAVEPOINT</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.copy">SQLite3::COPY</varname>
+     <varname linkend="sqlite3.class.constants.copy">SQLite3::COPY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.constants.recursive">SQLite3::RECURSIVE</varname>
+     <varname linkend="sqlite3.class.constants.recursive">SQLite3::RECURSIVE</varname>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -264,259 +264,259 @@
   <section xml:id="sqlite3.class.constants">
    &reftitle.constants;
    <variablelist>
-    <varlistentry xml:id="sqlite3.constants.ok">
+    <varlistentry xml:id="sqlite3.class.constants.ok">
      <term><constant>SQLite3::OK</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.deny">
+    <varlistentry xml:id="sqlite3.class.constants.deny">
      <term><constant>SQLite3::DENY</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.ignore">
+    <varlistentry xml:id="sqlite3.class.constants.ignore">
      <term><constant>SQLite3::IGNORE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-index">
+    <varlistentry xml:id="sqlite3.class.constants.create-index">
      <term><constant>SQLite3::CREATE_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-table">
+    <varlistentry xml:id="sqlite3.class.constants.create-table">
      <term><constant>SQLite3::CREATE_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-temp-index">
+    <varlistentry xml:id="sqlite3.class.constants.create-temp-index">
      <term><constant>SQLite3::CREATE_TEMP_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-temp-table">
+    <varlistentry xml:id="sqlite3.class.constants.create-temp-table">
      <term><constant>SQLite3::CREATE_TEMP_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-temp-trigger">
+    <varlistentry xml:id="sqlite3.class.constants.create-temp-trigger">
      <term><constant>SQLite3::CREATE_TEMP_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-temp-view">
+    <varlistentry xml:id="sqlite3.class.constants.create-temp-view">
      <term><constant>SQLite3::CREATE_TEMP_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-trigger">
+    <varlistentry xml:id="sqlite3.class.constants.create-trigger">
      <term><constant>SQLite3::CREATE_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-view">
+    <varlistentry xml:id="sqlite3.class.constants.create-view">
      <term><constant>SQLite3::CREATE_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.delete">
+    <varlistentry xml:id="sqlite3.class.constants.delete">
      <term><constant>SQLite3::DELETE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-index">
+    <varlistentry xml:id="sqlite3.class.constants.drop-index">
      <term><constant>SQLite3::DROP_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-table">
+    <varlistentry xml:id="sqlite3.class.constants.drop-table">
      <term><constant>SQLite3::DROP_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-temp-index">
+    <varlistentry xml:id="sqlite3.class.constants.drop-temp-index">
      <term><constant>SQLite3::DROP_TEMP_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-temp-table">
+    <varlistentry xml:id="sqlite3.class.constants.drop-temp-table">
      <term><constant>SQLite3::DROP_TEMP_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-temp-trigger">
+    <varlistentry xml:id="sqlite3.class.constants.drop-temp-trigger">
      <term><constant>SQLite3::DROP_TEMP_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-temp-view">
+    <varlistentry xml:id="sqlite3.class.constants.drop-temp-view">
      <term><constant>SQLite3::DROP_TEMP_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-trigger">
+    <varlistentry xml:id="sqlite3.class.constants.drop-trigger">
      <term><constant>SQLite3::DROP_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-view">
+    <varlistentry xml:id="sqlite3.class.constants.drop-view">
      <term><constant>SQLite3::DROP_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.insert">
+    <varlistentry xml:id="sqlite3.class.constants.insert">
      <term><constant>SQLite3::INSERT</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.pragma">
+    <varlistentry xml:id="sqlite3.class.constants.pragma">
      <term><constant>SQLite3::PRAGMA</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.read">
+    <varlistentry xml:id="sqlite3.class.constants.read">
      <term><constant>SQLite3::READ</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.select">
+    <varlistentry xml:id="sqlite3.class.constants.select">
      <term><constant>SQLite3::SELECT</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.transaction">
+    <varlistentry xml:id="sqlite3.class.constants.transaction">
      <term><constant>SQLite3::TRANSACTION</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.update">
+    <varlistentry xml:id="sqlite3.class.constants.update">
      <term><constant>SQLite3::UPDATE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.attach">
+    <varlistentry xml:id="sqlite3.class.constants.attach">
      <term><constant>SQLite3::ATTACH</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.detach">
+    <varlistentry xml:id="sqlite3.class.constants.detach">
      <term><constant>SQLite3::DETACH</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.alter-table">
+    <varlistentry xml:id="sqlite3.class.constants.alter-table">
      <term><constant>SQLite3::ALTER_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.reindex">
+    <varlistentry xml:id="sqlite3.class.constants.reindex">
      <term><constant>SQLite3::REINDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.analyze">
+    <varlistentry xml:id="sqlite3.class.constants.analyze">
      <term><constant>SQLite3::ANALYZE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.create-vtable">
+    <varlistentry xml:id="sqlite3.class.constants.create-vtable">
      <term><constant>SQLite3::CREATE_VTABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.drop-vtable">
+    <varlistentry xml:id="sqlite3.class.constants.drop-vtable">
      <term><constant>SQLite3::DROP_VTABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.function">
+    <varlistentry xml:id="sqlite3.class.constants.function">
      <term><constant>SQLite3::FUNCTION</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.savepoint">
+    <varlistentry xml:id="sqlite3.class.constants.savepoint">
      <term><constant>SQLite3::SAVEPOINT</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.copy">
+    <varlistentry xml:id="sqlite3.class.constants.copy">
      <term><constant>SQLite3::COPY</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.constants.recursive">
+    <varlistentry xml:id="sqlite3.class.constants.recursive">
      <term><constant>SQLite3::RECURSIVE</constant></term>
      <listitem>
       <para/>

From b6bcb2bb070e72cedd16a19742da78ecf4e50ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Wed, 15 May 2024 09:32:04 +0200
Subject: [PATCH 2/3] Rename class constant container IDs

---
 reference/ffi/ffi.xml         |   6 +-
 reference/snmp/snmp.xml       |  52 ++++++------
 reference/sqlite3/sqlite3.xml | 148 +++++++++++++++++-----------------
 3 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/reference/ffi/ffi.xml b/reference/ffi/ffi.xml
index febc24f0dd9a..f543857e74a8 100644
--- a/reference/ffi/ffi.xml
+++ b/reference/ffi/ffi.xml
@@ -49,7 +49,7 @@
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="ffi-ffi.constants.biggest-alignment">FFI::__BIGGEST_ALIGNMENT__</varname>
+     <varname linkend="ffi.constants.--biggest-alignment--">FFI::__BIGGEST_ALIGNMENT__</varname>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -61,10 +61,10 @@
 
   </section>
 
-  <section xml:id="ffi-ffi.constants">
+  <section xml:id="class.ffi.constants">
    &reftitle.constants;
    <variablelist>
-    <varlistentry xml:id="ffi-ffi.constants.biggest-alignment">
+    <varlistentry xml:id="ffi.constants.--biggest-alignment--">
      <term><constant>FFI::__BIGGEST_ALIGNMENT__</constant></term>
      <listitem>
       <para/>
diff --git a/reference/snmp/snmp.xml b/reference/snmp/snmp.xml
index b467c1cdc569..fb4baee98142 100644
--- a/reference/snmp/snmp.xml
+++ b/reference/snmp/snmp.xml
@@ -29,73 +29,73 @@
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.version-1">SNMP::VERSION_1</varname>
+     <varname linkend="snmp.constants.version-1">SNMP::VERSION_1</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.version-2c">SNMP::VERSION_2c</varname>
+     <varname linkend="snmp.constants.version-2c">SNMP::VERSION_2c</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.version-2c">SNMP::VERSION_2C</varname>
+     <varname linkend="snmp.constants.version-2c">SNMP::VERSION_2C</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.version-3">SNMP::VERSION_3</varname>
+     <varname linkend="snmp.constants.version-3">SNMP::VERSION_3</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.errno-noerror">SNMP::ERRNO_NOERROR</varname>
+     <varname linkend="snmp.constants.errno-noerror">SNMP::ERRNO_NOERROR</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.errno-any">SNMP::ERRNO_ANY</varname>
+     <varname linkend="snmp.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>
+     <varname linkend="snmp.constants.errno-generic">SNMP::ERRNO_GENERIC</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="snmp.class.constants.errno-timeout">SNMP::ERRNO_TIMEOUT</varname>
+     <varname linkend="snmp.constants.errno-timeout">SNMP::ERRNO_TIMEOUT</varname>
     </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>
+     <varname linkend="snmp.constants.errno-error-in-reply">SNMP::ERRNO_ERROR_IN_REPLY</varname>
     </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>
+     <varname linkend="snmp.constants.errno-oid-not-increasing">SNMP::ERRNO_OID_NOT_INCREASING</varname>
     </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>
+     <varname linkend="snmp.constants.errno-oid-parsing-error">SNMP::ERRNO_OID_PARSING_ERROR</varname>
     </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>
+     <varname linkend="snmp.constants.errno-multiple-set-queries">SNMP::ERRNO_MULTIPLE_SET_QUERIES</varname>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
@@ -269,41 +269,41 @@
 <!-- }}} -->
 
   <!-- {{{ SNMP constants -->
-  <section xml:id="snmp.class.constants">
+  <section xml:id="class.snmp.constants">
    &reftitle.constants;
-   <section xml:id="snmp.class.constants.error-types">
+   <section xml:id="snmp.constants.error-types">
     <title><acronym>SNMP</acronym> Error Types</title>
     <variablelist>
 
-     <varlistentry xml:id="snmp.class.constants.errno-noerror">
+     <varlistentry xml:id="snmp.constants.errno-noerror">
       <term><constant>SNMP::ERRNO_NOERROR</constant></term>
       <listitem>
        <para>No <acronym>SNMP</acronym>-specific error occurred.</para>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.errno-generic">
+     <varlistentry xml:id="snmp.constants.errno-generic">
       <term><constant>SNMP::ERRNO_GENERIC</constant></term>
       <listitem>
        <para>A generic <acronym>SNMP</acronym> error occurred.</para>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.errno-timeout">
+     <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>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.errno-error-in-reply">
+     <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>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.errno-oid-not-increasing">
+     <varlistentry xml:id="snmp.constants.errno-oid-not-increasing">
       <term><constant>SNMP::ERRNO_OID_NOT_INCREASING</constant></term>
       <listitem>
        <para>
@@ -314,7 +314,7 @@
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.errno-oid-parsing-error">
+     <varlistentry xml:id="snmp.constants.errno-oid-parsing-error">
       <term><constant>SNMP::ERRNO_OID_PARSING_ERROR</constant></term>
       <listitem>
        <para>
@@ -324,7 +324,7 @@
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.errno-multiple-set-queries">
+     <varlistentry xml:id="snmp.constants.errno-multiple-set-queries">
       <term><constant>SNMP::ERRNO_MULTIPLE_SET_QUERIES</constant></term>
       <listitem>
        <para>
@@ -336,7 +336,7 @@
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.errno-any">
+     <varlistentry xml:id="snmp.constants.errno-any">
       <term><constant>SNMP::ERRNO_ANY</constant></term>
       <listitem>
        <para>
@@ -347,25 +347,25 @@
 
     </variablelist>
    </section>
-   <section xml:id="snmp.class.constants.protocols">
+   <section xml:id="snmp.constants.protocols">
     <title><acronym>SNMP</acronym> Protocol Versions</title>
     <variablelist>
 
-     <varlistentry xml:id="snmp.class.constants.version-1">
+     <varlistentry xml:id="snmp.constants.version-1">
       <term><constant>SNMP::VERSION_1</constant></term>
       <listitem>
        <para/>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.version-2c">
+     <varlistentry xml:id="snmp.constants.version-2c">
       <term><constant>SNMP::VERSION_2C</constant>, <constant>SNMP::VERSION_2c</constant></term>
       <listitem>
        <para/>
       </listitem>
      </varlistentry>
 
-     <varlistentry xml:id="snmp.class.constants.version-3">
+     <varlistentry xml:id="snmp.constants.version-3">
       <term><constant>SNMP::VERSION_3</constant></term>
       <listitem>
        <para/>
diff --git a/reference/sqlite3/sqlite3.xml b/reference/sqlite3/sqlite3.xml
index 3956b5ca37ce..603728662ab5 100644
--- a/reference/sqlite3/sqlite3.xml
+++ b/reference/sqlite3/sqlite3.xml
@@ -29,223 +29,223 @@
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.ok">SQLite3::OK</varname>
+     <varname linkend="sqlite3.constants.ok">SQLite3::OK</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.deny">SQLite3::DENY</varname>
+     <varname linkend="sqlite3.constants.deny">SQLite3::DENY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.ignore">SQLite3::IGNORE</varname>
+     <varname linkend="sqlite3.constants.ignore">SQLite3::IGNORE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-index">SQLite3::CREATE_INDEX</varname>
+     <varname linkend="sqlite3.constants.create-index">SQLite3::CREATE_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-table">SQLite3::CREATE_TABLE</varname>
+     <varname linkend="sqlite3.constants.create-table">SQLite3::CREATE_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-temp-index">SQLite3::CREATE_TEMP_INDEX</varname>
+     <varname linkend="sqlite3.constants.create-temp-index">SQLite3::CREATE_TEMP_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-temp-table">SQLite3::CREATE_TEMP_TABLE</varname>
+     <varname linkend="sqlite3.constants.create-temp-table">SQLite3::CREATE_TEMP_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-temp-trigger">SQLite3::CREATE_TEMP_TRIGGER</varname>
+     <varname linkend="sqlite3.constants.create-temp-trigger">SQLite3::CREATE_TEMP_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-temp-view">SQLite3::CREATE_TEMP_VIEW</varname>
+     <varname linkend="sqlite3.constants.create-temp-view">SQLite3::CREATE_TEMP_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-trigger">SQLite3::CREATE_TRIGGER</varname>
+     <varname linkend="sqlite3.constants.create-trigger">SQLite3::CREATE_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-view">SQLite3::CREATE_VIEW</varname>
+     <varname linkend="sqlite3.constants.create-view">SQLite3::CREATE_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.delete">SQLite3::DELETE</varname>
+     <varname linkend="sqlite3.constants.delete">SQLite3::DELETE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-index">SQLite3::DROP_INDEX</varname>
+     <varname linkend="sqlite3.constants.drop-index">SQLite3::DROP_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-table">SQLite3::DROP_TABLE</varname>
+     <varname linkend="sqlite3.constants.drop-table">SQLite3::DROP_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-temp-index">SQLite3::DROP_TEMP_INDEX</varname>
+     <varname linkend="sqlite3.constants.drop-temp-index">SQLite3::DROP_TEMP_INDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-temp-table">SQLite3::DROP_TEMP_TABLE</varname>
+     <varname linkend="sqlite3.constants.drop-temp-table">SQLite3::DROP_TEMP_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-temp-trigger">SQLite3::DROP_TEMP_TRIGGER</varname>
+     <varname linkend="sqlite3.constants.drop-temp-trigger">SQLite3::DROP_TEMP_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-temp-view">SQLite3::DROP_TEMP_VIEW</varname>
+     <varname linkend="sqlite3.constants.drop-temp-view">SQLite3::DROP_TEMP_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-trigger">SQLite3::DROP_TRIGGER</varname>
+     <varname linkend="sqlite3.constants.drop-trigger">SQLite3::DROP_TRIGGER</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-view">SQLite3::DROP_VIEW</varname>
+     <varname linkend="sqlite3.constants.drop-view">SQLite3::DROP_VIEW</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.insert">SQLite3::INSERT</varname>
+     <varname linkend="sqlite3.constants.insert">SQLite3::INSERT</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.pragma">SQLite3::PRAGMA</varname>
+     <varname linkend="sqlite3.constants.pragma">SQLite3::PRAGMA</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.read">SQLite3::READ</varname>
+     <varname linkend="sqlite3.constants.read">SQLite3::READ</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.select">SQLite3::SELECT</varname>
+     <varname linkend="sqlite3.constants.select">SQLite3::SELECT</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.transaction">SQLite3::TRANSACTION</varname>
+     <varname linkend="sqlite3.constants.transaction">SQLite3::TRANSACTION</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.update">SQLite3::UPDATE</varname>
+     <varname linkend="sqlite3.constants.update">SQLite3::UPDATE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.attach">SQLite3::ATTACH</varname>
+     <varname linkend="sqlite3.constants.attach">SQLite3::ATTACH</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.detach">SQLite3::DETACH</varname>
+     <varname linkend="sqlite3.constants.detach">SQLite3::DETACH</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.alter-table">SQLite3::ALTER_TABLE</varname>
+     <varname linkend="sqlite3.constants.alter-table">SQLite3::ALTER_TABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.reindex">SQLite3::REINDEX</varname>
+     <varname linkend="sqlite3.constants.reindex">SQLite3::REINDEX</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.analyze">SQLite3::ANALYZE</varname>
+     <varname linkend="sqlite3.constants.analyze">SQLite3::ANALYZE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.create-vtable">SQLite3::CREATE_VTABLE</varname>
+     <varname linkend="sqlite3.constants.create-vtable">SQLite3::CREATE_VTABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.drop-vtable">SQLite3::DROP_VTABLE</varname>
+     <varname linkend="sqlite3.constants.drop-vtable">SQLite3::DROP_VTABLE</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.function">SQLite3::FUNCTION</varname>
+     <varname linkend="sqlite3.constants.function">SQLite3::FUNCTION</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.savepoint">SQLite3::SAVEPOINT</varname>
+     <varname linkend="sqlite3.constants.savepoint">SQLite3::SAVEPOINT</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.copy">SQLite3::COPY</varname>
+     <varname linkend="sqlite3.constants.copy">SQLite3::COPY</varname>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="sqlite3.class.constants.recursive">SQLite3::RECURSIVE</varname>
+     <varname linkend="sqlite3.constants.recursive">SQLite3::RECURSIVE</varname>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -264,259 +264,259 @@
   <section xml:id="sqlite3.class.constants">
    &reftitle.constants;
    <variablelist>
-    <varlistentry xml:id="sqlite3.class.constants.ok">
+    <varlistentry xml:id="sqlite3.constants.ok">
      <term><constant>SQLite3::OK</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.deny">
+    <varlistentry xml:id="sqlite3.constants.deny">
      <term><constant>SQLite3::DENY</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.ignore">
+    <varlistentry xml:id="sqlite3.constants.ignore">
      <term><constant>SQLite3::IGNORE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-index">
+    <varlistentry xml:id="sqlite3.constants.create-index">
      <term><constant>SQLite3::CREATE_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-table">
+    <varlistentry xml:id="sqlite3.constants.create-table">
      <term><constant>SQLite3::CREATE_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-temp-index">
+    <varlistentry xml:id="sqlite3.constants.create-temp-index">
      <term><constant>SQLite3::CREATE_TEMP_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-temp-table">
+    <varlistentry xml:id="sqlite3.constants.create-temp-table">
      <term><constant>SQLite3::CREATE_TEMP_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-temp-trigger">
+    <varlistentry xml:id="sqlite3.constants.create-temp-trigger">
      <term><constant>SQLite3::CREATE_TEMP_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-temp-view">
+    <varlistentry xml:id="sqlite3.constants.create-temp-view">
      <term><constant>SQLite3::CREATE_TEMP_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-trigger">
+    <varlistentry xml:id="sqlite3.constants.create-trigger">
      <term><constant>SQLite3::CREATE_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-view">
+    <varlistentry xml:id="sqlite3.constants.create-view">
      <term><constant>SQLite3::CREATE_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.delete">
+    <varlistentry xml:id="sqlite3.constants.delete">
      <term><constant>SQLite3::DELETE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-index">
+    <varlistentry xml:id="sqlite3.constants.drop-index">
      <term><constant>SQLite3::DROP_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-table">
+    <varlistentry xml:id="sqlite3.constants.drop-table">
      <term><constant>SQLite3::DROP_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-temp-index">
+    <varlistentry xml:id="sqlite3.constants.drop-temp-index">
      <term><constant>SQLite3::DROP_TEMP_INDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-temp-table">
+    <varlistentry xml:id="sqlite3.constants.drop-temp-table">
      <term><constant>SQLite3::DROP_TEMP_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-temp-trigger">
+    <varlistentry xml:id="sqlite3.constants.drop-temp-trigger">
      <term><constant>SQLite3::DROP_TEMP_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-temp-view">
+    <varlistentry xml:id="sqlite3.constants.drop-temp-view">
      <term><constant>SQLite3::DROP_TEMP_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-trigger">
+    <varlistentry xml:id="sqlite3.constants.drop-trigger">
      <term><constant>SQLite3::DROP_TRIGGER</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-view">
+    <varlistentry xml:id="sqlite3.constants.drop-view">
      <term><constant>SQLite3::DROP_VIEW</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.insert">
+    <varlistentry xml:id="sqlite3.constants.insert">
      <term><constant>SQLite3::INSERT</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.pragma">
+    <varlistentry xml:id="sqlite3.constants.pragma">
      <term><constant>SQLite3::PRAGMA</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.read">
+    <varlistentry xml:id="sqlite3.constants.read">
      <term><constant>SQLite3::READ</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.select">
+    <varlistentry xml:id="sqlite3.constants.select">
      <term><constant>SQLite3::SELECT</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.transaction">
+    <varlistentry xml:id="sqlite3.constants.transaction">
      <term><constant>SQLite3::TRANSACTION</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.update">
+    <varlistentry xml:id="sqlite3.constants.update">
      <term><constant>SQLite3::UPDATE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.attach">
+    <varlistentry xml:id="sqlite3.constants.attach">
      <term><constant>SQLite3::ATTACH</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.detach">
+    <varlistentry xml:id="sqlite3.constants.detach">
      <term><constant>SQLite3::DETACH</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.alter-table">
+    <varlistentry xml:id="sqlite3.constants.alter-table">
      <term><constant>SQLite3::ALTER_TABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.reindex">
+    <varlistentry xml:id="sqlite3.constants.reindex">
      <term><constant>SQLite3::REINDEX</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.analyze">
+    <varlistentry xml:id="sqlite3.constants.analyze">
      <term><constant>SQLite3::ANALYZE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.create-vtable">
+    <varlistentry xml:id="sqlite3.constants.create-vtable">
      <term><constant>SQLite3::CREATE_VTABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.drop-vtable">
+    <varlistentry xml:id="sqlite3.constants.drop-vtable">
      <term><constant>SQLite3::DROP_VTABLE</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.function">
+    <varlistentry xml:id="sqlite3.constants.function">
      <term><constant>SQLite3::FUNCTION</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.savepoint">
+    <varlistentry xml:id="sqlite3.constants.savepoint">
      <term><constant>SQLite3::SAVEPOINT</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.copy">
+    <varlistentry xml:id="sqlite3.constants.copy">
      <term><constant>SQLite3::COPY</constant></term>
      <listitem>
       <para/>
      </listitem>
     </varlistentry>
 
-    <varlistentry xml:id="sqlite3.class.constants.recursive">
+    <varlistentry xml:id="sqlite3.constants.recursive">
      <term><constant>SQLite3::RECURSIVE</constant></term>
      <listitem>
       <para/>

From 61a45600bf69d0f20b0cff4388aed704fb62e771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Wed, 15 May 2024 22:03:24 +0200
Subject: [PATCH 3/3] Remove double hypens from IDs

---
 reference/ffi/ffi.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/ffi/ffi.xml b/reference/ffi/ffi.xml
index f543857e74a8..eb980154fb21 100644
--- a/reference/ffi/ffi.xml
+++ b/reference/ffi/ffi.xml
@@ -49,7 +49,7 @@
      <modifier>public</modifier>
      <modifier>const</modifier>
      <type>int</type>
-     <varname linkend="ffi.constants.--biggest-alignment--">FFI::__BIGGEST_ALIGNMENT__</varname>
+     <varname linkend="ffi.constants.biggest-alignment">FFI::__BIGGEST_ALIGNMENT__</varname>
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -64,7 +64,7 @@
   <section xml:id="class.ffi.constants">
    &reftitle.constants;
    <variablelist>
-    <varlistentry xml:id="ffi.constants.--biggest-alignment--">
+    <varlistentry xml:id="ffi.constants.biggest-alignment">
      <term><constant>FFI::__BIGGEST_ALIGNMENT__</constant></term>
      <listitem>
       <para/>