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

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

Commit: https://github.com/php/doc-en/commit/2214cd3277cf065a3abf395e9bbde73ed61d7d12
Raw diff: https://github.com/php/doc-en/commit/2214cd3277cf065a3abf395e9bbde73ed61d7d12.diff

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

Changed paths:
  M  reference/sodium/constants.xml
  M  reference/sodium/functions/sodium-base642bin.xml
  M  reference/sodium/functions/sodium-bin2base64.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-add.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-from-hash.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-is-valid-point.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-random.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-add.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-complement.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-invert.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-mul.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-negate.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-random.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-reduce.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-sub.xml
  M  reference/sodium/functions/sodium-crypto-core-ristretto255-sub.xml
  M  reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml
  M  reference/sodium/functions/sodium-crypto-pwhash-str.xml
  M  reference/sodium/functions/sodium-crypto-pwhash.xml
  M  reference/sodium/functions/sodium-crypto-scalarmult-ristretto255-base.xml
  M  reference/sodium/functions/sodium-crypto-scalarmult-ristretto255.xml
  M  reference/sodium/functions/sodium-crypto-secretbox-keygen.xml
  M  reference/sodium/functions/sodium-crypto-secretbox-open.xml
  M  reference/sodium/functions/sodium-crypto-secretbox.xml
  M  reference/sodium/functions/sodium-crypto-stream-xchacha20-xor-ic.xml
  M  reference/sodium/functions/sodium-crypto-stream-xchacha20-xor.xml


Diff:

diff --git a/reference/sodium/constants.xml b/reference/sodium/constants.xml
index df97a9f07c0b..d4fbda7841ec 100644
--- a/reference/sodium/constants.xml
+++ b/reference/sodium/constants.xml
@@ -1,1051 +1,1047 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<appendix xml:id="sodium.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sodium.constants">
  &reftitle.constants;
  &extension.constants;
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.sodium-library-version">
-    <term>
-     <constant>SODIUM_LIBRARY_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-library-major-version">
-    <term>
-     <constant>SODIUM_LIBRARY_MAJOR_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-library-minor-version">
-    <term>
-     <constant>SODIUM_LIBRARY_MINOR_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-base64-variant-original">
-    <term>
-     <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-base64-variant-original-no-padding">
-    <term>
-     <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-base64-variant-urlsafe">
-    <term>
-     <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-base64-variant-urlsafe-no-padding">
-    <term>
-     <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-nsecbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_NSECBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-npubbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_NPUBBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-abytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_ABYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS256_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-nsecbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS256_NSECBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-npubbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS256_NPUBBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-abytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AEGIS256_ABYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.4.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-nsecbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AES256GCM_NSECBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-npubbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-abytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_AES256GCM_ABYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-nsecbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-npubbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-abytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_ABYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-nsecbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-npubbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-abytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-abytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-npubbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-nsecbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NSECBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-auth-bytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AUTH_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-auth-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_AUTH_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-box-sealbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_BOX_SEALBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-box-secretkeybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_BOX_SECRETKEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-box-publickeybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_BOX_PUBLICKEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-box-keypairbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_BOX_KEYPAIRBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-box-macbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_BOX_MACBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-box-noncebytes">
-    <term>
-     <constant>SODIUM_CRYPTO_BOX_NONCEBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-box-seedbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_BOX_SEEDBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kdf-bytes-min">
-    <term>
-     <constant>SODIUM_CRYPTO_KDF_BYTES_MIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kdf-bytes-max">
-    <term>
-     <constant>SODIUM_CRYPTO_KDF_BYTES_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kdf-contextbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_KDF_CONTEXTBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kdf-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_KDF_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kx-seedbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_KX_SEEDBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kx-sessionkeybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_KX_SESSIONKEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kx-publickeybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_KX_PUBLICKEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kx-secretkeybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_KX_SECRETKEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-kx-keypairbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_KX_KEYPAIRBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-generichash-bytes">
-    <term>
-     <constant>SODIUM_CRYPTO_GENERICHASH_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-generichash-bytes-min">
-    <term>
-     <constant>SODIUM_CRYPTO_GENERICHASH_BYTES_MIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-generichash-bytes-max">
-    <term>
-     <constant>SODIUM_CRYPTO_GENERICHASH_BYTES_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-generichash-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_GENERICHASH_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-generichash-keybytes-min">
-    <term>
-     <constant>SODIUM_CRYPTO_GENERICHASH_KEYBYTES_MIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-generichash-keybytes-max">
-    <term>
-     <constant>SODIUM_CRYPTO_GENERICHASH_KEYBYTES_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-alg-argon2i13">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-alg-argon2id13">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-alg-default">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_ALG_DEFAULT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-saltbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_SALTBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-strprefix">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_STRPREFIX</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-opslimit-interactive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-memlimit-interactive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-opslimit-moderate">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_OPSLIMIT_MODERATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-memlimit-moderate">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_MEMLIMIT_MODERATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-opslimit-sensitive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_OPSLIMIT_SENSITIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-memlimit-sensitive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_MEMLIMIT_SENSITIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-saltbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-strprefix">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_STRPREFIX</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-opslimit-interactive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-memlimit-interactive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-opslimit-sensitive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-memlimit-sensitive">
-    <term>
-     <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-bytes">
-    <term>
-     <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-hashbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_HASHBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-nonreducedscalarbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_NONREDUCEDSCALARBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-scalarbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_SCALARBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-scalarmult-bytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SCALARMULT_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-scalarmult-scalarbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SCALARMULT_SCALARBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-scalarmult-ristretto255-bytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SCALARMULT_RISTRETTO255_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-scalarmult-ristretto255-scalarbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SCALARMULT_RISTRETTO255_SCALARBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-shorthash-bytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SHORTHASH_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-shorthash-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SHORTHASH_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretbox-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETBOX_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretbox-macbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETBOX_MACBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretbox-noncebytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETBOX_NONCEBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-abytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-headerbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-messagebytes-max">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-final">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_FINAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-message">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_MESSAGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-push">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_PUSH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-rekey">
-    <term>
-     <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-sign-bytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SIGN_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-sign-seedbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SIGN_SEEDBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-sign-publickeybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-sign-secretkeybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SIGN_SECRETKEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-sign-keypairbytes">
-    <term>
-     <constant>SODIUM_CRYPTO_SIGN_KEYPAIRBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-stream-noncebytes">
-    <term>
-     <constant>SODIUM_CRYPTO_STREAM_NONCEBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-stream-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_STREAM_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-stream-xchacha20-keybytes">
-    <term>
-     <constant>SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.sodium-crypto-stream-xchacha20-noncebytes">
-    <term>
-     <constant>SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Available as of PHP 8.1.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
+ <variablelist>
+  <varlistentry xml:id="constant.sodium-library-version">
+   <term>
+    <constant>SODIUM_LIBRARY_VERSION</constant>
+    (<type>string</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-library-major-version">
+   <term>
+    <constant>SODIUM_LIBRARY_MAJOR_VERSION</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-library-minor-version">
+   <term>
+    <constant>SODIUM_LIBRARY_MINOR_VERSION</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-base64-variant-original">
+   <term>
+    <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-base64-variant-original-no-padding">
+   <term>
+    <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-base64-variant-urlsafe">
+   <term>
+    <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-base64-variant-urlsafe-no-padding">
+   <term>
+    <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-nsecbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_NSECBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-npubbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_NPUBBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis128l-abytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS128L_ABYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS256_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-nsecbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS256_NSECBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-npubbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS256_NPUBBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aegis256-abytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AEGIS256_ABYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.4.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-nsecbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AES256GCM_NSECBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-npubbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-aes256gcm-abytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_AES256GCM_ABYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-nsecbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-npubbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-abytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_ABYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-nsecbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-npubbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-chacha20poly1305-ietf-abytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-abytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-npubbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-aead-xchacha20poly1305-ietf-nsecbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NSECBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-auth-bytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AUTH_BYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-auth-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_AUTH_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-box-sealbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_BOX_SEALBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-box-secretkeybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_BOX_SECRETKEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-box-publickeybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_BOX_PUBLICKEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-box-keypairbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_BOX_KEYPAIRBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-box-macbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_BOX_MACBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-box-noncebytes">
+   <term>
+    <constant>SODIUM_CRYPTO_BOX_NONCEBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-box-seedbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_BOX_SEEDBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kdf-bytes-min">
+   <term>
+    <constant>SODIUM_CRYPTO_KDF_BYTES_MIN</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kdf-bytes-max">
+   <term>
+    <constant>SODIUM_CRYPTO_KDF_BYTES_MAX</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kdf-contextbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_KDF_CONTEXTBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kdf-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_KDF_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kx-seedbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_KX_SEEDBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kx-sessionkeybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_KX_SESSIONKEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kx-publickeybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_KX_PUBLICKEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kx-secretkeybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_KX_SECRETKEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-kx-keypairbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_KX_KEYPAIRBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-generichash-bytes">
+   <term>
+    <constant>SODIUM_CRYPTO_GENERICHASH_BYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-generichash-bytes-min">
+   <term>
+    <constant>SODIUM_CRYPTO_GENERICHASH_BYTES_MIN</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-generichash-bytes-max">
+   <term>
+    <constant>SODIUM_CRYPTO_GENERICHASH_BYTES_MAX</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-generichash-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_GENERICHASH_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-generichash-keybytes-min">
+   <term>
+    <constant>SODIUM_CRYPTO_GENERICHASH_KEYBYTES_MIN</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-generichash-keybytes-max">
+   <term>
+    <constant>SODIUM_CRYPTO_GENERICHASH_KEYBYTES_MAX</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-alg-argon2i13">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-alg-argon2id13">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-alg-default">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_ALG_DEFAULT</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-saltbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_SALTBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-strprefix">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_STRPREFIX</constant>
+    (<type>string</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-opslimit-interactive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-memlimit-interactive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-opslimit-moderate">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_OPSLIMIT_MODERATE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-memlimit-moderate">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_MEMLIMIT_MODERATE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-opslimit-sensitive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_OPSLIMIT_SENSITIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-memlimit-sensitive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_MEMLIMIT_SENSITIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-saltbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-strprefix">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_STRPREFIX</constant>
+    (<type>string</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-opslimit-interactive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-memlimit-interactive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-opslimit-sensitive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-pwhash-scryptsalsa208sha256-memlimit-sensitive">
+   <term>
+    <constant>SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-bytes">
+   <term>
+    <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_BYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-hashbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_HASHBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-nonreducedscalarbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_NONREDUCEDSCALARBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-core-ristretto255-scalarbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_CORE_RISTRETTO255_SCALARBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-scalarmult-bytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SCALARMULT_BYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-scalarmult-scalarbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SCALARMULT_SCALARBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-scalarmult-ristretto255-bytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SCALARMULT_RISTRETTO255_BYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-scalarmult-ristretto255-scalarbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SCALARMULT_RISTRETTO255_SCALARBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-shorthash-bytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SHORTHASH_BYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-shorthash-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SHORTHASH_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretbox-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETBOX_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretbox-macbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETBOX_MACBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretbox-noncebytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETBOX_NONCEBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-abytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-headerbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-messagebytes-max">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-final">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_FINAL</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-message">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_MESSAGE</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-push">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_PUSH</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-secretstream-xchacha20poly1305-tag-rekey">
+   <term>
+    <constant>SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-sign-bytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SIGN_BYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-sign-seedbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SIGN_SEEDBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-sign-publickeybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-sign-secretkeybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SIGN_SECRETKEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-sign-keypairbytes">
+   <term>
+    <constant>SODIUM_CRYPTO_SIGN_KEYPAIRBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-stream-noncebytes">
+   <term>
+    <constant>SODIUM_CRYPTO_STREAM_NONCEBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-stream-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_STREAM_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-stream-xchacha20-keybytes">
+   <term>
+    <constant>SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.sodium-crypto-stream-xchacha20-noncebytes">
+   <term>
+    <constant>SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES</constant>
+    (<type>int</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Available as of PHP 8.1.0.
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
 </appendix>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/sodium/functions/sodium-base642bin.xml b/reference/sodium/functions/sodium-base642bin.xml
index 23cbcc9c489b..df445957bb48 100644
--- a/reference/sodium/functions/sodium-base642bin.xml
+++ b/reference/sodium/functions/sodium-base642bin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.sodium-base642bin" 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.sodium-base642bin">
  <refnamediv>
   <refname>sodium_base642bin</refname>
   <refpurpose>Decodes a base64-encoded string into raw binary.</refpurpose>
@@ -36,25 +36,23 @@
    <varlistentry>
     <term><parameter>id</parameter></term>
     <listitem>
-     <para>
-      <simplelist>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
-        Base64 encoding.
-       </member>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
-        Base64 encoding, without <literal>=</literal> padding characters.
-       </member>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>) Base64 encoding.
-       </member>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>)
-        Base64 encoding, without <literal>=</literal> padding characters.
-       </member>
-      </simplelist>
-     </para>
+     <simplelist>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+       Base64 encoding.
+      </member>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+       Base64 encoding, without <literal>=</literal> padding characters.
+      </member>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>) Base64 encoding.
+      </member>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>)
+       Base64 encoding, without <literal>=</literal> padding characters.
+      </member>
+     </simplelist>
     </listitem>
    </varlistentry>
    <varlistentry>
diff --git a/reference/sodium/functions/sodium-bin2base64.xml b/reference/sodium/functions/sodium-bin2base64.xml
index 988e1bd5d429..2773d0a622dd 100644
--- a/reference/sodium/functions/sodium-bin2base64.xml
+++ b/reference/sodium/functions/sodium-bin2base64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.sodium-bin2base64" 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.sodium-bin2base64">
  <refnamediv>
   <refname>sodium_bin2base64</refname>
   <refpurpose>Encodes a raw binary string with base64.</refpurpose>
@@ -35,25 +35,23 @@
    <varlistentry>
     <term><parameter>id</parameter></term>
     <listitem>
-     <para>
-      <simplelist>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
-        Base64 encoding.
-       </member>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
-        Base64 encoding, without <literal>=</literal> padding characters.
-       </member>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>) Base64 encoding.
-       </member>
-       <member>
-        <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>)
-        Base64 encoding, without <literal>=</literal> padding characters.
-       </member>
-      </simplelist>
-     </para>
+     <simplelist>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_ORIGINAL</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+       Base64 encoding.
+      </member>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING</constant> for standard (<literal>A-Za-z0-9/\+</literal>)
+       Base64 encoding, without <literal>=</literal> padding characters.
+      </member>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_URLSAFE</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>) Base64 encoding.
+      </member>
+      <member>
+       <constant>SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING</constant> for URL-safe (<literal>A-Za-z0-9\-_</literal>)
+       Base64 encoding, without <literal>=</literal> padding characters.
+      </member>
+     </simplelist>
     </listitem>
    </varlistentry>
   </variablelist>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-add.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-add.xml
index 02e4e0473f92..d187f757936b 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-add.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-add.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-add" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-add">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_add</refname>
   <refpurpose>Adds an element</refpurpose>
@@ -51,10 +51,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_add</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_add</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -67,25 +66,22 @@ $value = sodium_crypto_core_ristretto255_sub($value, $bar);
 var_dump(hash_equals($foo, $value));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_random</function></member>
-    <member><function>sodium_crypto_core_ristretto255_sub</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_random</function></member>
+   <member><function>sodium_crypto_core_ristretto255_sub</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-from-hash.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-from-hash.xml
index 6ed4160c6520..3822329f472c 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-from-hash.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-from-hash.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-from-hash" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-from-hash">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_from_hash</refname>
   <refpurpose>Maps a vector</refpurpose>
@@ -42,10 +42,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_from_hash</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_from_hash</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -56,26 +55,23 @@ $hashes = sodium_hex2bin(
 var_dump(sodium_bin2hex(sodium_crypto_core_ristretto255_from_hash($hashes)));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 string(64) "3066f82a1a747d45120d1740f14358531a8f04bbffe6a819f86dfe50f44a0a46"
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_hex2bin</function></member>
-    <member><function>sodium_bin2hex</function></member>
-    <member><function>sodium_crypto_core_ristretto255_from_hash</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_hex2bin</function></member>
+   <member><function>sodium_bin2hex</function></member>
+   <member><function>sodium_crypto_core_ristretto255_from_hash</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-is-valid-point.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-is-valid-point.xml
index 01c0b55c894d..9c19b97b17c1 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-is-valid-point.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-is-valid-point.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-is-valid-point" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-is-valid-point">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_is_valid_point</refname>
   <refpurpose>Determines if a point on the ristretto255 curve</refpurpose>
@@ -43,10 +43,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_is_valid_point</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_is_valid_point</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -56,25 +55,22 @@ $bar = sodium_crypto_scalarmult_ristretto255_base($foo);
 var_dump(sodium_crypto_core_ristretto255_is_valid_point($bar));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
-bool(true) 
+bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-    <member><function>sodium_crypto_scalarmult_ristretto255_base</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+   <member><function>sodium_crypto_scalarmult_ristretto255_base</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-random.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-random.xml
index 621b4095a2fc..90c3dfc68b8e 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-random.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-random.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-random" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-random">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_random</refname>
   <refpurpose>Generates a random key</refpurpose>
@@ -33,10 +33,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_random</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_random</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -49,25 +48,22 @@ $value = sodium_crypto_core_ristretto255_sub($value, $bar);
 var_dump(hash_equals($foo, $value));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_add</function></member>
-    <member><function>sodium_crypto_core_ristretto255_sub</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_add</function></member>
+   <member><function>sodium_crypto_core_ristretto255_sub</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-add.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-add.xml
index 3a8d5528e2db..1b9902bc5d24 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-add.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-add.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-add" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-add">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_add</refname>
   <refpurpose>Adds a scalar value</refpurpose>
@@ -51,10 +51,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_scalar_add</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_scalar_add</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -67,25 +66,22 @@ $value = sodium_crypto_core_ristretto255_scalar_sub($value, $bar);
 var_dump(hash_equals($foo, $value));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
-bool(true) 
+bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-    <member><function>sodium_crypto_core_ristretto255_scalar_sub</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+   <member><function>sodium_crypto_core_ristretto255_scalar_sub</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-complement.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-complement.xml
index 33585018e1ea..e11725cde2a7 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-complement.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-complement.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-complement" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-complement">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_complement</refname>
   <refpurpose>The sodium_crypto_core_ristretto255_scalar_complement purpose</refpurpose>
@@ -41,11 +41,9 @@
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-invert.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-invert.xml
index 37d2ecd6cf36..727614d644bf 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-invert.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-invert.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-invert" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-invert">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_invert</refname>
   <refpurpose>Inverts a scalar value</refpurpose>
@@ -42,10 +42,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_scalar_invert</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_scalar_invert</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -57,24 +56,21 @@ $reInverted = sodium_crypto_core_ristretto255_scalar_invert($inverted);
 var_dump(hash_equals($foo, $reInverted));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
-bool(true) 
+bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-mul.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-mul.xml
index e7c677007239..77e5cdd6116c 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-mul.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-mul.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-mul" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-mul">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_mul</refname>
   <refpurpose>Multiplies a scalar value</refpurpose>
@@ -51,11 +51,9 @@
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-negate.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-negate.xml
index e60be9a9b1cd..fde9011599b9 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-negate.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-negate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-negate" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-negate">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_negate</refname>
   <refpurpose>Negates a scalar value</refpurpose>
@@ -42,10 +42,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_scalar_negate</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_scalar_negate</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -57,24 +56,21 @@ $reNegate = sodium_crypto_core_ristretto255_scalar_negate($negate);
 var_dump(hash_equals($foo, $reNegate));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
-bool(true) 
+bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-random.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-random.xml
index 10f622581b13..298c609eedd5 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-random.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-random.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-random" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-random">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_random</refname>
   <refpurpose>Generates a random key</refpurpose>
@@ -33,10 +33,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_scalar_random</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_scalar_random</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -49,25 +48,22 @@ $value = sodium_crypto_core_ristretto255_scalar_sub($value, $bar);
 var_dump(hash_equals($foo, $value));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
-bool(true) 
+bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_add</function></member>
-    <member><function>sodium_crypto_core_ristretto255_scalar_sub</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_add</function></member>
+   <member><function>sodium_crypto_core_ristretto255_scalar_sub</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-reduce.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-reduce.xml
index 80ab1071b88f..956884842c0a 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-reduce.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-reduce.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-reduce" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-reduce">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_reduce</refname>
   <refpurpose>Reduces a scalar value</refpurpose>
@@ -42,11 +42,9 @@
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-sub.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-sub.xml
index 1b5c58027465..81f2a131d6cf 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-sub.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-scalar-sub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-scalar-sub" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-scalar-sub">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_scalar_sub</refname>
   <refpurpose>Subtracts a scalar value</refpurpose>
@@ -51,10 +51,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_scalar_sub</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_scalar_sub</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -67,25 +66,22 @@ $value = sodium_crypto_core_ristretto255_scalar_sub($value, $bar);
 var_dump(hash_equals($foo, $value));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
-bool(true) 
+bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
-    <member><function>sodium_crypto_core_ristretto255_scalar_add</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_scalar_random</function></member>
+   <member><function>sodium_crypto_core_ristretto255_scalar_add</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-core-ristretto255-sub.xml b/reference/sodium/functions/sodium-crypto-core-ristretto255-sub.xml
index 92201c8e5b87..704f2e93f37e 100644
--- a/reference/sodium/functions/sodium-crypto-core-ristretto255-sub.xml
+++ b/reference/sodium/functions/sodium-crypto-core-ristretto255-sub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-core-ristretto255-sub" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-core-ristretto255-sub">
  <refnamediv>
   <refname>sodium_crypto_core_ristretto255_sub</refname>
   <refpurpose>Subtracts an element</refpurpose>
@@ -51,10 +51,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_core_ristretto255_sub</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_core_ristretto255_sub</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -67,25 +66,22 @@ $value = sodium_crypto_core_ristretto255_sub($value, $bar);
 var_dump(hash_equals($foo, $value));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 bool(true)
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_core_ristretto255_random</function></member>
-    <member><function>sodium_crypto_core_ristretto255_add</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_core_ristretto255_random</function></member>
+   <member><function>sodium_crypto_core_ristretto255_add</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml b/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml
index 4c4f501e6873..93939cc4b25c 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash-str-verify.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.sodium-crypto-pwhash-str-verify" 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.sodium-crypto-pwhash-str-verify">
  <refnamediv>
   <refname>sodium_crypto_pwhash_str_verify</refname>
   <refpurpose>Verifies that a password matches a hash</refpurpose>
@@ -60,13 +60,11 @@
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_pwhash_str</function></member>
-    <member><function>password_hash</function></member>
-    <member><function>password_verify</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_pwhash_str</function></member>
+   <member><function>password_hash</function></member>
+   <member><function>password_verify</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-pwhash-str.xml b/reference/sodium/functions/sodium-crypto-pwhash-str.xml
index 5c7030e63369..741b7685449d 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash-str.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash-str.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.sodium-crypto-pwhash-str" 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.sodium-crypto-pwhash-str">
  <refnamediv>
   <refname>sodium_crypto_pwhash_str</refname>
   <refpurpose>Get an ASCII-encoded hash</refpurpose>
@@ -64,10 +64,9 @@ Uses a CPU- and memory-hard hash algorithm along with a randomly-generated salt,
 
   <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_pwhash_str</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_pwhash_str</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 $password = 'password';
@@ -77,15 +76,14 @@ echo sodium_crypto_pwhash_str(
     SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE
 );
 ]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
 <![CDATA[
 $argon2id$v=19$m=65536,t=2,p=1$oWIfdaXwWwhVmovOBc2NAQ$EbsZ+JnZyyavkafS0hoc4HdaOB0ILWZESAZ7kVGa+Iw
 ]]>
-    </screen>
-   </example>
-  </para> 
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="notes">
@@ -101,18 +99,16 @@ $argon2id$v=19$m=65536,t=2,p=1$oWIfdaXwWwhVmovOBc2NAQ$EbsZ+JnZyyavkafS0hoc4HdaOB
    </para>
   </note>
  </refsect1>
- 
+
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_pwhash_str_verify</function></member>
-    <member><function>sodium_crypto_pwhash</function></member>
-    <member><function>password_hash</function></member>
-    <member><function>password_verify</function></member>
-    <member><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.libsodium.argon2;">Libsodium Argon2 docs</link></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_pwhash_str_verify</function></member>
+   <member><function>sodium_crypto_pwhash</function></member>
+   <member><function>password_hash</function></member>
+   <member><function>password_verify</function></member>
+   <member><link xlink:href="&url.libsodium.argon2;">Libsodium Argon2 docs</link></member>
+  </simplelist>
  </refsect1>
 
 
diff --git a/reference/sodium/functions/sodium-crypto-pwhash.xml b/reference/sodium/functions/sodium-crypto-pwhash.xml
index 205c132f5f5c..1e0ef57c4248 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.sodium-crypto-pwhash" 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.sodium-crypto-pwhash">
  <refnamediv>
   <refname>sodium_crypto_pwhash</refname>
   <refpurpose>Derive a key from a password, using Argon2</refpurpose>
@@ -88,10 +88,9 @@
  </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_pwhash</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_pwhash</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 //Need to keep the salt if we're ever going to be able to check this password
@@ -108,15 +107,14 @@ echo bin2hex(
     )
 );
 ?>]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
 <![CDATA[
 a18f346ba57992eb7e4ae6abf3fd30ee
 ]]>
-    </screen>
-   </example>
-  </para> 
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255-base.xml b/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255-base.xml
index bd7b2d7b67ac..90bc1e292f5a 100644
--- a/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255-base.xml
+++ b/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255-base.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-scalarmult-ristretto255-base" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-scalarmult-ristretto255-base">
  <refnamediv>
   <refname>sodium_crypto_scalarmult_ristretto255_base</refname>
   <refpurpose>Calculates the public key from a secret key</refpurpose>
@@ -42,11 +42,9 @@
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_scalarmult_ristretto255</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_scalarmult_ristretto255</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255.xml b/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255.xml
index c05d29828b4b..a61be11512c4 100644
--- a/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255.xml
+++ b/reference/sodium/functions/sodium-crypto-scalarmult-ristretto255.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-scalarmult-ristretto255" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-scalarmult-ristretto255">
  <refnamediv>
   <refname>sodium_crypto_scalarmult_ristretto255</refname>
   <refpurpose>Computes a shared secret</refpurpose>
@@ -51,11 +51,9 @@
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_scalarmult_ristretto255_base</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_scalarmult_ristretto255_base</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml b/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml
index 1c4563661d4e..039f6d3803eb 100644
--- a/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml
+++ b/reference/sodium/functions/sodium-crypto-secretbox-keygen.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
-<refentry xml:id="function.sodium-crypto-secretbox-keygen" 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.sodium-crypto-secretbox-keygen">
  <refnamediv>
   <refname>sodium_crypto_secretbox_keygen</refname>
   <refpurpose>Generate random key for sodium_crypto_secretbox</refpurpose>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>sodium_crypto_secretbox_keygen</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    Generate a key for use with <function>sodium_crypto_secretbox</function> and <function>sodium_crypto_secretbox_open</function>.
@@ -77,16 +76,13 @@ bool(true)
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_bin2hex</function></member>
-    <member><function>random_bytes</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_bin2hex</function></member>
+   <member><function>random_bytes</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/sodium/functions/sodium-crypto-secretbox-open.xml b/reference/sodium/functions/sodium-crypto-secretbox-open.xml
index 99a2f51d67ba..a2bac4533fd8 100644
--- a/reference/sodium/functions/sodium-crypto-secretbox-open.xml
+++ b/reference/sodium/functions/sodium-crypto-secretbox-open.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.sodium-crypto-secretbox-open" 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.sodium-crypto-secretbox-open">
  <refnamediv>
   <refname>sodium_crypto_secretbox_open</refname>
   <refpurpose>Authenticated shared-key decryption</refpurpose>
@@ -81,10 +81,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_secretbox_open</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_secretbox_open</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 // The $key must be kept confidential
@@ -100,26 +99,23 @@ if ($plaintext !== false) {
 }
 ?>
 ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
+   </programlisting>
+   &example.outputs;
+   <screen>
 <![CDATA[
 message to be encrypted
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_secretbox</function></member>
-    <member><function>sodium_crypto_secretbox_keygen</function></member>
-    <member><function>random_bytes</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_secretbox</function></member>
+   <member><function>sodium_crypto_secretbox_keygen</function></member>
+   <member><function>random_bytes</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-secretbox.xml b/reference/sodium/functions/sodium-crypto-secretbox.xml
index de318ecd4672..a61374a8f6e2 100644
--- a/reference/sodium/functions/sodium-crypto-secretbox.xml
+++ b/reference/sodium/functions/sodium-crypto-secretbox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.sodium-crypto-secretbox" 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.sodium-crypto-secretbox">
  <refnamediv>
   <refname>sodium_crypto_secretbox</refname>
   <refpurpose>Authenticated shared-key encryption</refpurpose>
@@ -85,10 +85,9 @@
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>sodium_crypto_secretbox</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>sodium_crypto_secretbox</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 // The $key must be kept confidential
@@ -103,27 +102,24 @@ var_dump(bin2hex($ciphertext));
 var_dump(sodium_crypto_secretbox_open($ciphertext, $nonce, $key));
 ?>
 ]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
 <![CDATA[
 string(78) "3a1fa3e9f7b72ef8be51d40abf8e296c6899c185d07b18b4c93e7f26aa776d24c50852cd6b1076"
 string(23) "message to be encrypted"
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_secretbox_open</function></member>
-    <member><function>sodium_crypto_secretbox_keygen</function></member>
-    <member><function>random_bytes</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_secretbox_open</function></member>
+   <member><function>sodium_crypto_secretbox_keygen</function></member>
+   <member><function>random_bytes</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor-ic.xml b/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor-ic.xml
index 57cdb3dcd98b..15b49d64e92c 100644
--- a/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor-ic.xml
+++ b/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor-ic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-stream-xchacha20-xor-ic" 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.sodium-crypto-stream-xchacha20-xor-ic">
  <refnamediv>
   <refname>sodium_crypto_stream_xchacha20_xor_ic</refname>
   <refpurpose>Encrypts a message using a nonce and a secret key (no authentication)</refpurpose>
@@ -111,11 +111,9 @@ bool(true)
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_stream_xchacha20_xor</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_stream_xchacha20_xor</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor.xml b/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor.xml
index fe13e06ae178..f0eff1df094e 100644
--- a/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor.xml
+++ b/reference/sodium/functions/sodium-crypto-stream-xchacha20-xor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.sodium-crypto-stream-xchacha20-xor" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sodium-crypto-stream-xchacha20-xor">
  <refnamediv>
   <refname>sodium_crypto_stream_xchacha20_xor</refname>
   <refpurpose>Encrypts a message using a nonce and a secret key (no authentication)</refpurpose>
@@ -26,7 +26,7 @@
     or <function>sodium_crypto_auth</function>.
    </para>
   </caution>
-  
+
  </refsect1>
 
  <refsect1 role="parameters">
@@ -68,11 +68,9 @@
 
  <refsect1 role="seealso">
   &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>sodium_crypto_stream_xchacha20_xor_ic</function></member>
-   </simplelist>
-  </para>
+  <simplelist>
+   <member><function>sodium_crypto_stream_xchacha20_xor_ic</function></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
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.