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

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

Commit: https://github.com/php/doc-en/commit/462b2bc5580f4bfaabe48be54a91f978cc181e9b
Raw diff: https://github.com/php/doc-en/commit/462b2bc5580f4bfaabe48be54a91f978cc181e9b.diff

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

Changed paths:
  M  reference/rnp/book.xml
  M  reference/rnp/configure.xml
  M  reference/rnp/examples.xml
  M  reference/rnp/functions/rnp-backend-string.xml
  M  reference/rnp/functions/rnp-backend-version.xml
  M  reference/rnp/functions/rnp-decrypt.xml
  M  reference/rnp/functions/rnp-dump-packets-to-json.xml
  M  reference/rnp/functions/rnp-dump-packets.xml
  M  reference/rnp/functions/rnp-ffi-create.xml
  M  reference/rnp/functions/rnp-ffi-destroy.xml
  M  reference/rnp/functions/rnp-ffi-set-pass-provider.xml
  M  reference/rnp/functions/rnp-import-keys.xml
  M  reference/rnp/functions/rnp-import-signatures.xml
  M  reference/rnp/functions/rnp-key-export-autocrypt.xml
  M  reference/rnp/functions/rnp-key-export-revocation.xml
  M  reference/rnp/functions/rnp-key-export.xml
  M  reference/rnp/functions/rnp-key-get-info.xml
  M  reference/rnp/functions/rnp-key-remove.xml
  M  reference/rnp/functions/rnp-key-revoke.xml
  M  reference/rnp/functions/rnp-list-keys.xml
  M  reference/rnp/functions/rnp-load-keys-from-path.xml
  M  reference/rnp/functions/rnp-load-keys.xml
  M  reference/rnp/functions/rnp-locate-key.xml
  M  reference/rnp/functions/rnp-op-encrypt.xml
  M  reference/rnp/functions/rnp-op-generate-key.xml
  M  reference/rnp/functions/rnp-op-sign-cleartext.xml
  M  reference/rnp/functions/rnp-op-sign-detached.xml
  M  reference/rnp/functions/rnp-op-sign.xml
  M  reference/rnp/functions/rnp-op-verify-detached.xml
  M  reference/rnp/functions/rnp-op-verify.xml
  M  reference/rnp/functions/rnp-save-keys-to-path.xml
  M  reference/rnp/functions/rnp-save-keys.xml
  M  reference/rnp/functions/rnp-supported-features.xml
  M  reference/rnp/functions/rnp-version-string-full.xml
  M  reference/rnp/functions/rnp-version-string.xml
  M  reference/rnp/rnpffi.xml
  M  reference/rnp/setup.xml


Diff:

diff --git a/reference/rnp/book.xml b/reference/rnp/book.xml
index dc5d329e434b..7c283f6d1e52 100644
--- a/reference/rnp/book.xml
+++ b/reference/rnp/book.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- State: experimental -->
-<book xml:id="book.rnp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.rnp">
  <?phpdoc extension-membership="pecl" ?>
  <title>Rnp</title>
  <titleabbrev>Rnp</titleabbrev>
@@ -8,12 +8,11 @@
  <preface xml:id="intro.rnp">
   &reftitle.intro;
   &warn.experimental;
-  <para>
-   This module allows you to use <link
-   xlink:href="&url.rnp;">RNP</link> library.
+  <simpara>
+   This module allows you to use <link xlink:href="&url.rnp;">RNP</link> library.
    RNP is a high performance C++ OpenPGP
    library used by Mozilla Thunderbird.
-  </para>
+  </simpara>
  </preface>
 
  &reference.rnp.setup;
diff --git a/reference/rnp/configure.xml b/reference/rnp/configure.xml
index ea9ece3315fe..40b85fec37e2 100644
--- a/reference/rnp/configure.xml
+++ b/reference/rnp/configure.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xml:id="rnp.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rnp.installation">
  &reftitle.install;
 
- <para>
+ <simpara>
   &pecl.info;
   <link xlink:href="&url.pecl.package;rnp">&url.pecl.package;rnp</link>
- </para>
+ </simpara>
 
 </section>
 <!-- Keep this comment at the end of the file
diff --git a/reference/rnp/examples.xml b/reference/rnp/examples.xml
index a76741ac7040..6ce2920c464f 100644
--- a/reference/rnp/examples.xml
+++ b/reference/rnp/examples.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<chapter xml:id="rnp.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rnp.examples">
  &reftitle.examples;
  <section xml:id="rnp.examples-clearsign">
   <title>Clearsign text</title>
-  <para>
+  <simpara>
    This example will clearsign a given text.
-  </para>
+  </simpara>
   <example>
    <title>RNP clearsign example</title>
    <programlisting role="php">
@@ -32,7 +32,6 @@ rnp_ffi_destroy($ffi);
   </example>
  </section>
 </chapter>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/rnp/functions/rnp-backend-string.xml b/reference/rnp/functions/rnp-backend-string.xml
index 42db86ec7691..3e95ecdfaa34 100644
--- a/reference/rnp/functions/rnp-backend-string.xml
+++ b/reference/rnp/functions/rnp-backend-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-backend-string" 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.rnp-backend-string">
  <refnamediv>
   <refname>rnp_backend_string</refname>
   <refpurpose>Return cryptographic backend library name</refpurpose>
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>rnp_backend_string</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
 
  </refsect1>
@@ -25,10 +25,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Backend name string. Currently supported
    backends are "Botan" and "OpenSSL".
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-backend-version.xml b/reference/rnp/functions/rnp-backend-version.xml
index e6876f9edeab..ddc1afbd62cb 100644
--- a/reference/rnp/functions/rnp-backend-version.xml
+++ b/reference/rnp/functions/rnp-backend-version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-backend-version" 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.rnp-backend-version">
  <refnamediv>
   <refname>rnp_backend_version</refname>
   <refpurpose>Return cryptographic backend library version</refpurpose>
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>rnp_backend_version</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,9 +24,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Version string.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-decrypt.xml b/reference/rnp/functions/rnp-decrypt.xml
index ecd442c12021..375eb3afe68b 100644
--- a/reference/rnp/functions/rnp-decrypt.xml
+++ b/reference/rnp/functions/rnp-decrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-decrypt" 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.rnp-decrypt">
  <refnamediv>
   <refname>rnp_decrypt</refname>
   <refpurpose>Decrypt PGP message</refpurpose>
@@ -12,11 +12,11 @@
    <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
    <methodparam><type>string</type><parameter>input</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Private keys used for decryption should be loaded into the FFI object before calling this function.
    If password encryption was used, then password provider should be set by calling
    <function>rnp_ffi_set_pass_provider</function>.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,17 +26,17 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>input</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Encrypted message.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -44,9 +44,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Decrypted message on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-dump-packets-to-json.xml b/reference/rnp/functions/rnp-dump-packets-to-json.xml
index 7537b1ac1444..1165c609868f 100644
--- a/reference/rnp/functions/rnp-dump-packets-to-json.xml
+++ b/reference/rnp/functions/rnp-dump-packets-to-json.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-dump-packets-to-json" 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.rnp-dump-packets-to-json">
  <refnamediv>
   <refname>rnp_dump_packets_to_json</refname>
   <refpurpose>Dump OpenPGP packets stream information to the JSON string</refpurpose>
@@ -12,9 +12,9 @@
    <methodparam><type>string</type><parameter>input</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,17 +24,17 @@
    <varlistentry>
     <term><parameter>input</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Input string containing OpenPGP data, either in binary or ASCII-armored format.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       See <constant>RNP_JSON_DUMP_<replaceable>*</replaceable></constant> predefined constants.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -42,9 +42,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    JSON string with dump&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-dump-packets.xml b/reference/rnp/functions/rnp-dump-packets.xml
index 2bb2963f614e..bb36934cb00a 100644
--- a/reference/rnp/functions/rnp-dump-packets.xml
+++ b/reference/rnp/functions/rnp-dump-packets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-dump-packets" 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.rnp-dump-packets">
  <refnamediv>
   <refname>rnp_dump_packets</refname>
   <refpurpose>Dump OpenPGP packets stream information in humand-readable format</refpurpose>
@@ -12,9 +12,9 @@
    <methodparam><type>string</type><parameter>input</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,17 +24,17 @@
    <varlistentry>
     <term><parameter>input</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Input string containing OpenPGP data, either in binary or ASCII-armored format.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       See <constant>RNP_DUMP_<replaceable>*</replaceable></constant> predefined constants.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -42,9 +42,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Text describing packet sequence&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-ffi-create.xml b/reference/rnp/functions/rnp-ffi-create.xml
index a939fded8165..60f5a0a81e97 100644
--- a/reference/rnp/functions/rnp-ffi-create.xml
+++ b/reference/rnp/functions/rnp-ffi-create.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-ffi-create" 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.rnp-ffi-create">
  <refnamediv>
   <refname>rnp_ffi_create</refname>
   <refpurpose>Create the top-level object used for interacting with the library</refpurpose>
@@ -12,9 +12,9 @@
    <methodparam><type>string</type><parameter>pub_format</parameter></methodparam>
    <methodparam><type>string</type><parameter>sec_format</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
 
  </refsect1>
@@ -25,19 +25,19 @@
    <varlistentry>
     <term><parameter>pub_format</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the format of the public keyring, RNP_KEYSTORE_GPG or other
       RNP_KEYSTORE_* constant.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>sec_format</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       the format of the secret keyring, RNP_KEYSTORE_GPG or other
       RNP_KEYSTORE_* constant
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -45,9 +45,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns <type>RnpFFI</type> object on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-ffi-destroy.xml b/reference/rnp/functions/rnp-ffi-destroy.xml
index 82fa2602b735..445f4b4483a3 100644
--- a/reference/rnp/functions/rnp-ffi-destroy.xml
+++ b/reference/rnp/functions/rnp-ffi-destroy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-ffi-destroy" 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.rnp-ffi-destroy">
  <refnamediv>
   <refname>rnp_ffi_destroy</refname>
   <refpurpose>Destroy the top-level object used for interacting with the library</refpurpose>
@@ -11,9 +11,9 @@
    <type>void</type><methodname>rnp_ffi_destroy</methodname>
    <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -23,9 +23,9 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -33,9 +33,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-ffi-set-pass-provider.xml b/reference/rnp/functions/rnp-ffi-set-pass-provider.xml
index 7e7f623a144e..9541be180c7f 100644
--- a/reference/rnp/functions/rnp-ffi-set-pass-provider.xml
+++ b/reference/rnp/functions/rnp-ffi-set-pass-provider.xml
@@ -12,12 +12,12 @@
    <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
    <methodparam><type>callable</type><parameter>password_callback</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Sets password provider function. This function can ask for the password on a standard input
    (if PHP script is executed in a command line environment), display GUI dialog or provide
    password in any other possible ways. Requested passwords are used to encrypt or decrypt
    secret keys or perform symmetric encryption/decryption operations.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -27,9 +27,9 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -57,9 +57,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/rnp/functions/rnp-import-keys.xml b/reference/rnp/functions/rnp-import-keys.xml
index a5c7436cb7cc..b8a372c0c8e1 100644
--- a/reference/rnp/functions/rnp-import-keys.xml
+++ b/reference/rnp/functions/rnp-import-keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-import-keys" 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.rnp-import-keys">
  <refnamediv>
   <refname>rnp_import_keys</refname>
   <refpurpose>Import keys from PHP string to the keyring and receive JSON describing new/updated keys</refpurpose>
@@ -13,8 +13,8 @@
    <methodparam><type>string</type><parameter>input</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
-  </para>
+  <simpara>
+  </simpara>
 
  </refsect1>
 
@@ -24,25 +24,25 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>input</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       OpenPGP packets containing key(s) to be loaded. Can be either binary or ASCII armored.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       See <constant>RNP_LOAD_SAVE_<replaceable>*</replaceable></constant> predefined constants.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -50,9 +50,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    JSON string with information about new and updated keys on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-import-signatures.xml b/reference/rnp/functions/rnp-import-signatures.xml
index eece4319c8ff..08ef6bb3b3c0 100644
--- a/reference/rnp/functions/rnp-import-signatures.xml
+++ b/reference/rnp/functions/rnp-import-signatures.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-import-signatures" 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.rnp-import-signatures">
  <refnamediv>
   <refname>rnp_import_signatures</refname>
   <refpurpose>Import standalone signatures to the keyring and receive JSON describing updated keys</refpurpose>
@@ -13,8 +13,8 @@
    <methodparam><type>string</type><parameter>input</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
-  </para>
+  <simpara>
+  </simpara>
 
  </refsect1>
 
@@ -24,25 +24,25 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>input</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       OpenPGP packets containing signatures to be imported. Can be either binary or ASCII armored.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Currently must be 0.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -50,9 +50,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    JSON string with information about updated keys on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-key-export-autocrypt.xml b/reference/rnp/functions/rnp-key-export-autocrypt.xml
index f5355daf490c..2ffd07add302 100644
--- a/reference/rnp/functions/rnp-key-export-autocrypt.xml
+++ b/reference/rnp/functions/rnp-key-export-autocrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-key-export-autocrypt" 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.rnp-key-export-autocrypt">
  <refnamediv>
   <refname>rnp_key_export_autocrypt</refname>
   <refpurpose>
@@ -18,8 +18,8 @@
    <methodparam><type>string</type><parameter>uid</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
-  </para>
+  <simpara>
+  </simpara>
 
  </refsect1>
 
@@ -29,44 +29,44 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>key_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Primary key fingerprint.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>subkey_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Subkey to export. Can be an empty string
       to pick the first suitable subkey.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>uid</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       User ID to export. Can be an empty string
       if exported key has only one uid.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Only <constant>RNP_KEY_EXPORT_BASE64</constant> is currently supported. Enabling
       it would export base64-encoded key data instead of binary.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -74,9 +74,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    OpenPGP packets of exported key on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-key-export-revocation.xml b/reference/rnp/functions/rnp-key-export-revocation.xml
index c5900ec263e4..f2b726e4c9c0 100644
--- a/reference/rnp/functions/rnp-key-export-revocation.xml
+++ b/reference/rnp/functions/rnp-key-export-revocation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-key-export-revocation" 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.rnp-key-export-revocation">
  <refnamediv>
   <refname>rnp_key_export_revocation</refname>
   <refpurpose>Generate and export primary key revocation signature</refpurpose>
@@ -14,10 +14,10 @@
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Note: to revoke a key you'll need to import this signature into the keystore or use
    <function>rnp_key_revoke</function> function.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -27,33 +27,33 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>key_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Key fingerprint of the primary key to be revoked.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       <constant>RNP_KEY_EXPORT_ARMORED</constant> or 0.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>options</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       An associative array with options.
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <thead>
@@ -90,9 +90,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Exported revocation signature on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-key-export.xml b/reference/rnp/functions/rnp-key-export.xml
index 666264569168..0de544b5f002 100644
--- a/reference/rnp/functions/rnp-key-export.xml
+++ b/reference/rnp/functions/rnp-key-export.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-key-export" 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.rnp-key-export">
  <refnamediv>
   <refname>rnp_key_export</refname>
   <refpurpose>Export a key</refpurpose>
@@ -13,8 +13,8 @@
    <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
-  </para>
+  <simpara>
+  </simpara>
 
  </refsect1>
 
@@ -24,26 +24,26 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>key_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Key fingerprint.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       See <constant>RNP_KEY_EXPORT_<replaceable>*</replaceable></constant> predefined constants
       (except <constant>RNP_KEY_EXPORT_BASE64</constant>).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -51,9 +51,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    OpenPGP packets of exported key (binary or ASCII-armored) on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-key-get-info.xml b/reference/rnp/functions/rnp-key-get-info.xml
index ecf249c1890b..d3449edb272a 100644
--- a/reference/rnp/functions/rnp-key-get-info.xml
+++ b/reference/rnp/functions/rnp-key-get-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-key-get-info" 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.rnp-key-get-info">
  <refnamediv>
   <refname>rnp_key_get_info</refname>
   <refpurpose>Get information about the key</refpurpose>
@@ -12,9 +12,9 @@
    <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
    <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,17 +24,17 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>key_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Key fingerprint.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -42,9 +42,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    An associative array with information about the key&return.falseforfailure;.
-  </para>
+  </simpara>
   <informaltable>
    <tgroup cols="2">
     <thead>
diff --git a/reference/rnp/functions/rnp-key-remove.xml b/reference/rnp/functions/rnp-key-remove.xml
index 2a62fa0f20e7..6c811cb4c737 100644
--- a/reference/rnp/functions/rnp-key-remove.xml
+++ b/reference/rnp/functions/rnp-key-remove.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-key-remove" 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.rnp-key-remove">
  <refnamediv>
   <refname>rnp_key_remove</refname>
   <refpurpose>Remove a key from keyring(s)</refpurpose>
@@ -13,9 +13,9 @@
    <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Note: you need to call <function>rnp_save_keys</function> to write updated keyring(s) out.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -25,26 +25,26 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>key_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Key fingerprint.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       See <constant>RNP_KEY_REMOVE_<replaceable>*</replaceable></constant> constants. Flag <constant>RNP_KEY_REMOVE_SUBKEYS</constant> will work only for
       the primary key and will remove all of its subkeys as well.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -52,9 +52,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-key-revoke.xml b/reference/rnp/functions/rnp-key-revoke.xml
index 3990b789fb3d..ffc2aedc8269 100644
--- a/reference/rnp/functions/rnp-key-revoke.xml
+++ b/reference/rnp/functions/rnp-key-revoke.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-key-revoke" 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.rnp-key-revoke">
  <refnamediv>
   <refname>rnp_key_revoke</refname>
   <refpurpose>Revoke a key or subkey by generating and adding revocation signature</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Note: you need to call <function>rnp_save_keys</function> to write updated keyring(s) out.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,33 +26,33 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>key_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Key fingerprint.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Currently must be 0.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>options</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       An associative array with options.
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <thead>
@@ -89,9 +89,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-list-keys.xml b/reference/rnp/functions/rnp-list-keys.xml
index e4543944b884..d8700260f20a 100644
--- a/reference/rnp/functions/rnp-list-keys.xml
+++ b/reference/rnp/functions/rnp-list-keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-list-keys" 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.rnp-list-keys">
  <refnamediv>
   <refname>rnp_list_keys</refname>
   <refpurpose>Enumerate all keys present in a keyring by specified identifer type</refpurpose>
@@ -12,9 +12,9 @@
    <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
    <methodparam><type>string</type><parameter>identifier_type</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,17 +24,17 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>identifier_type</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Key identifier type ("userid", "keyid", "grip", "fingerprint").
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -42,9 +42,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    An associative array where key is an identifier string and value is a PGP key fingerprint&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-load-keys-from-path.xml b/reference/rnp/functions/rnp-load-keys-from-path.xml
index ad473c74a8a4..bd720d023816 100644
--- a/reference/rnp/functions/rnp-load-keys-from-path.xml
+++ b/reference/rnp/functions/rnp-load-keys-from-path.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-load-keys-from-path" 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.rnp-load-keys-from-path">
  <refnamediv>
   <refname>rnp_load_keys_from_path</refname>
   <refpurpose>Load keys from specified path</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>string</type><parameter>input_path</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Note that for G10, the input must be a directory (which must already exist).
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,33 +26,33 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>format</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.key-format;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>input_path</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       file or directory containing the keys.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.loadsave-flags;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -60,9 +60,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-load-keys.xml b/reference/rnp/functions/rnp-load-keys.xml
index 5b8d4f4d7c81..8aad54993aa8 100644
--- a/reference/rnp/functions/rnp-load-keys.xml
+++ b/reference/rnp/functions/rnp-load-keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-load-keys" 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.rnp-load-keys">
  <refnamediv>
   <refname>rnp_load_keys</refname>
   <refpurpose>Load keys from PHP string</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>string</type><parameter>input</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Note that for G10, the input must be a directory (which must already exist).
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,33 +26,33 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>format</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.key-format;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>input</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       OpenPGP packets containing key(s) to be loaded. Can be either binary or ASCII armored.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.loadsave-flags;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -60,9 +60,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-locate-key.xml b/reference/rnp/functions/rnp-locate-key.xml
index f80dd1d31219..33f5d4ac6f5c 100644
--- a/reference/rnp/functions/rnp-locate-key.xml
+++ b/reference/rnp/functions/rnp-locate-key.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-locate-key" 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.rnp-locate-key">
  <refnamediv>
   <refname>rnp_locate_key</refname>
   <refpurpose>Search for the key</refpurpose>
@@ -13,9 +13,9 @@
    <methodparam><type>string</type><parameter>identifier_type</parameter></methodparam>
    <methodparam><type>string</type><parameter>identifier</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Note: only valid userids are checked while searching by userid.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -25,26 +25,26 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>identifier_type</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Identifier type string: "userid", "keyid", "fingerprint", "grip".
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>identifier</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       PGP User ID (name and email) for "userid" type, hexadecimal string
       that represents key id, fingerprint or key grip correspondingly.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -52,9 +52,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns hexadecimal fingerprint of the key found on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-op-encrypt.xml b/reference/rnp/functions/rnp-op-encrypt.xml
index ba6d13b16c33..6e950d50c562 100644
--- a/reference/rnp/functions/rnp-op-encrypt.xml
+++ b/reference/rnp/functions/rnp-op-encrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-op-encrypt" 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.rnp-op-encrypt">
  <refnamediv>
   <refname>rnp_op_encrypt</refname>
   <refpurpose>Encrypt message</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>array</type><parameter>recipient_keys_fp</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,33 +26,33 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>message</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Message to be encrypted.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>recipient_keys_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Array with fingerprints of recipient's keys. At least one key must be present.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>options</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       An associative array with options.
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <thead>
@@ -158,9 +158,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Encrypted data on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-op-generate-key.xml b/reference/rnp/functions/rnp-op-generate-key.xml
index 39bcea948fb0..180da42717b8 100644
--- a/reference/rnp/functions/rnp-op-generate-key.xml
+++ b/reference/rnp/functions/rnp-op-generate-key.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-op-generate-key" 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.rnp-op-generate-key">
  <refnamediv>
   <refname>rnp_op_generate_key</refname>
   <refpurpose>Generate key</refpurpose>
@@ -15,9 +15,9 @@
    <methodparam choice="opt"><type>string</type><parameter>sub_alg</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
 
  </refsect1>
@@ -28,42 +28,42 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>userid</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       PGP User ID - text that is intended to represent
       the name and email address of the key holder.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>key_alg</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Primary key algorithm (i.e. 'RSA', 'DSA', etc).
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>sub_alg</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Subkey algorithm. If not set, subkey will not be generated.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>options</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       An associative array with options.
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <thead>
@@ -139,12 +139,12 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Fingerprint of the generated primary key&return.falseforfailure;. This fingerprint can be used
    later to reference the key in sign and encrypt operations. The key data is stored in FFI
    memory context and can be saved using
    <function>rnp_save_keys</function> or <function>rnp_save_keys_to_path</function>.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-op-sign-cleartext.xml b/reference/rnp/functions/rnp-op-sign-cleartext.xml
index 24c54148fd3c..337ccbe4fb5e 100644
--- a/reference/rnp/functions/rnp-op-sign-cleartext.xml
+++ b/reference/rnp/functions/rnp-op-sign-cleartext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-op-sign-cleartext" 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.rnp-op-sign-cleartext">
  <refnamediv>
   <refname>rnp_op_sign_cleartext</refname>
   <refpurpose>Perform signing operation on a textual data, return cleartext signed message</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>array</type><parameter>keys_fp</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,34 +26,34 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>data</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Data to be signed.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>keys_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Array with key fingerprints. At least one key must be provided.
       Keys should be present in <parameter>ffi</parameter>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>options</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       An associative array with options.
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <thead>
@@ -95,10 +95,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Cleartext signed message containing source data with
    additional headers and ASCII-armored signature on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-op-sign-detached.xml b/reference/rnp/functions/rnp-op-sign-detached.xml
index 5917e37e53ed..3824bab71b50 100644
--- a/reference/rnp/functions/rnp-op-sign-detached.xml
+++ b/reference/rnp/functions/rnp-op-sign-detached.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-op-sign-detached" 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.rnp-op-sign-detached">
  <refnamediv>
   <refname>rnp_op_sign_detached</refname>
   <refpurpose>Perform signing operation, return detached signature(s)</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>array</type><parameter>keys_fp</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,34 +26,34 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>data</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Data to be signed.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>keys_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Array with key fingerprints. At least one key must be provided.
       Keys should be present in <parameter>ffi</parameter>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>options</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       An associative array with options.
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <thead>
@@ -95,9 +95,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Detached signature(s) data on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-op-sign.xml b/reference/rnp/functions/rnp-op-sign.xml
index d577dbde5e0e..8a7125c3a0cf 100644
--- a/reference/rnp/functions/rnp-op-sign.xml
+++ b/reference/rnp/functions/rnp-op-sign.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-op-sign" 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.rnp-op-sign">
  <refnamediv>
   <refname>rnp_op_sign</refname>
   <refpurpose>Perform signing operation on a binary data, return embedded signature(s)</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>array</type><parameter>keys_fp</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -26,34 +26,34 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>data</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Data to be signed.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>keys_fp</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Array with key fingerprints. At least one key must be provided.
       Keys should be present in <parameter>ffi</parameter>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>options</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       An associative array with options.
-     </para>
+     </simpara>
      <informaltable>
       <tgroup cols="2">
        <thead>
@@ -120,9 +120,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Data with embedded signature(s) on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-op-verify-detached.xml b/reference/rnp/functions/rnp-op-verify-detached.xml
index 54fb84eaa162..6b04837f0601 100644
--- a/reference/rnp/functions/rnp-op-verify-detached.xml
+++ b/reference/rnp/functions/rnp-op-verify-detached.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-op-verify-detached" 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.rnp-op-verify-detached">
  <refnamediv>
   <refname>rnp_op_verify_detached</refname>
   <refpurpose>Verify detached signatures</refpurpose>
@@ -13,9 +13,9 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam><type>string</type><parameter>signature</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -25,25 +25,25 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>data</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Source data.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>signature</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Detached signature data.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -51,9 +51,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    An associative array with information about verification results&return.falseforfailure;.
-  </para>
+  </simpara>
   <informaltable>
    <tgroup cols="2">
     <thead>
@@ -112,9 +112,9 @@
     </tbody>
    </tgroup>
   </informaltable>
-  <para>
+  <simpara>
    "signatures" sub-array.
-  </para>
+  </simpara>
   <informaltable>
   <tgroup cols="2">
    <thead>
diff --git a/reference/rnp/functions/rnp-op-verify.xml b/reference/rnp/functions/rnp-op-verify.xml
index b2481c0c2577..087df9957e2b 100644
--- a/reference/rnp/functions/rnp-op-verify.xml
+++ b/reference/rnp/functions/rnp-op-verify.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-op-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.rnp-op-verify">
  <refnamediv>
   <refname>rnp_op_verify</refname>
   <refpurpose>Verify embedded or cleartext signatures</refpurpose>
@@ -12,9 +12,9 @@
    <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,17 +24,17 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>data</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       Signed data.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -42,9 +42,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    An associative array with information about verification results&return.falseforfailure;.
-  </para>
+  </simpara>
   <informaltable>
    <tgroup cols="2">
     <thead>
@@ -103,9 +103,9 @@
     </tbody>
    </tgroup>
   </informaltable>
-  <para>
+  <simpara>
    "signatures" sub-array.
-  </para>
+  </simpara>
   <informaltable>
     <tgroup cols="2">
      <thead>
diff --git a/reference/rnp/functions/rnp-save-keys-to-path.xml b/reference/rnp/functions/rnp-save-keys-to-path.xml
index 5f1a578b6455..0949051b3f66 100644
--- a/reference/rnp/functions/rnp-save-keys-to-path.xml
+++ b/reference/rnp/functions/rnp-save-keys-to-path.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-save-keys-to-path" 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.rnp-save-keys-to-path">
  <refnamediv>
   <refname>rnp_save_keys_to_path</refname>
   <refpurpose>Save keys to specified path</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>string</type><parameter>output_path</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Saves keys present in the FFI object (loaded or generated) to the specified file or directory.
-  </para>
+  </simpara>
 
 
  </refsect1>
@@ -27,33 +27,33 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>format</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.key-format;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>output_path</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       File or directory path where keys should be saved to.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.loadsave-flags;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -61,9 +61,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-save-keys.xml b/reference/rnp/functions/rnp-save-keys.xml
index 70ffc4fc0d00..d46cc2ddfe75 100644
--- a/reference/rnp/functions/rnp-save-keys.xml
+++ b/reference/rnp/functions/rnp-save-keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-save-keys" 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.rnp-save-keys">
  <refnamediv>
   <refname>rnp_save_keys</refname>
   <refpurpose>Save keys to PHP string</refpurpose>
@@ -14,9 +14,9 @@
    <methodparam><type>string</type><parameter role="reference">output</parameter></methodparam>
    <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Note that for G10, the output must be a directory (which must already exist).
-  </para>
+  </simpara>
 
 
  </refsect1>
@@ -27,33 +27,33 @@
    <varlistentry>
     <term><parameter>ffi</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.ffi-description;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>format</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.key-format;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>output</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       key packets will be saved to the string referenced by <parameter>output</parameter>.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term><parameter>flags</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       &rnp.parameter.loadsave-flags;
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -61,9 +61,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns &true; on success&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-supported-features.xml b/reference/rnp/functions/rnp-supported-features.xml
index abd5eb193b00..0d54f6ed7a0f 100644
--- a/reference/rnp/functions/rnp-supported-features.xml
+++ b/reference/rnp/functions/rnp-supported-features.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-supported-features" 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.rnp-supported-features">
  <refnamediv>
   <refname>rnp_supported_features</refname>
   <refpurpose>Get supported features in JSON format</refpurpose>
@@ -11,9 +11,9 @@
    <type class="union"><type>string</type><type>false</type></type><methodname>rnp_supported_features</methodname>
    <methodparam><type>string</type><parameter>type</parameter></methodparam>
   </methodsynopsis>
-  <para>
+  <simpara>
    Get the JSON formatted string containing array of supported rnp feature values (algorithms, curves, etc) by type.
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -23,9 +23,9 @@
    <varlistentry>
     <term><parameter>type</parameter></term>
     <listitem>
-     <para>
+     <simpara>
       See RNP_FEATURE_* constants for supported values.
-     </para>
+     </simpara>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -33,9 +33,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    String containing JSON formatted array of supported algorithms, curves, etc&return.falseforfailure;.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-version-string-full.xml b/reference/rnp/functions/rnp-version-string-full.xml
index f54a2af95c18..33e10a52fc23 100644
--- a/reference/rnp/functions/rnp-version-string-full.xml
+++ b/reference/rnp/functions/rnp-version-string-full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-version-string-full" 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.rnp-version-string-full">
  <refnamediv>
   <refname>rnp_version_string_full</refname>
   <refpurpose>Full version string of RNP library</refpurpose>
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>rnp_version_string_full</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
 
  </refsect1>
@@ -25,9 +25,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns full version string of RNP library.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/functions/rnp-version-string.xml b/reference/rnp/functions/rnp-version-string.xml
index 566ce7cbc756..e277f615df51 100644
--- a/reference/rnp/functions/rnp-version-string.xml
+++ b/reference/rnp/functions/rnp-version-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.rnp-version-string" 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.rnp-version-string">
  <refnamediv>
   <refname>rnp_version_string</refname>
   <refpurpose>RNP library version</refpurpose>
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>rnp_version_string</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
-  <para>
+  <simpara>
 
-  </para>
+  </simpara>
 
  </refsect1>
 
@@ -24,9 +24,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    Returns RNP library version string.
-  </para>
+  </simpara>
  </refsect1>
 
 
diff --git a/reference/rnp/rnpffi.xml b/reference/rnp/rnpffi.xml
index fa161c23d0fc..6b7490b6e3d2 100644
--- a/reference/rnp/rnpffi.xml
+++ b/reference/rnp/rnpffi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.rnpffi" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rnpffi" role="class">
  <title>The RnpFFI class</title>
  <titleabbrev>RnpFFI</titleabbrev>
 
@@ -8,9 +8,9 @@
 <!-- {{{ RnpFFI intro -->
   <section xml:id="rnpffi.intro">
    &reftitle.intro;
-   <para>
+   <simpara>
 
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
 
diff --git a/reference/rnp/setup.xml b/reference/rnp/setup.xml
index 755d93a0cd98..4ddd8ad602a6 100644
--- a/reference/rnp/setup.xml
+++ b/reference/rnp/setup.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<chapter xml:id="rnp.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rnp.setup">
  &reftitle.setup;
 
  <section xml:id="rnp.requirements">
   &reftitle.required;
-  <para>
-   In order to use RNP library functions you need to install the<link
-   xlink:href="&url.rnp;">RNP</link> library. RNP library version &gt;= 0.16.2
+  <simpara>
+   In order to use RNP library functions you need to install the<link xlink:href="&url.rnp;">RNP</link> library. RNP library version &gt;= 0.16.2
    is required.
-  </para>
+  </simpara>
  </section>
 
  &reference.rnp.configure;
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.