Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 1c4b4e99188a11b64ed55a01c7fb923c33adf961)
+++ server/databases/mariadb.xml	(revision 27534cc7ea3c099e622386e3e902e966b5f2f08a)
@@ -8,8 +8,8 @@
   <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz"> 
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "83e6a957f9be5698dd711b64a509901f">
-  <!ENTITY mariadb-size          "84 MB">
-  <!ENTITY mariadb-buildsize     "2.3 GB (644 MB installed)">
-  <!ENTITY mariadb-time          "7.0 SBU (with parallelism=4, add 0.5 SBU for tests)">
+  <!ENTITY mariadb-md5sum        "d5ff75792dde53ba487567bd7e658198">
+  <!ENTITY mariadb-size          "85 MB">
+  <!ENTITY mariadb-buildsize     "2.3 GB (645 MB installed)">
+  <!ENTITY mariadb-time          "8.1 SBU (with parallelism=4, add 0.4 SBU for tests)">
 ]>
 
@@ -112,4 +112,5 @@
       <ulink url="http://msgpack.org/">MessagePack</ulink>,
       <ulink url="http://www.mruby.org/">mruby</ulink>,
+      <ulink url="https://google.github.io/snappy/">Snappy</ulink>,
       <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>,
       <ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and
@@ -204,5 +205,5 @@
       <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: This switch enables
       compiling the embedded server library needed by certain applications,
-      such as <application>Amarok</application>..
+      such as <application>Amarok</application>.
     </para>
 
@@ -414,11 +415,12 @@
           aria_s3_copy, galera_new_cluster, galera_recovery,
           innochecksum, mariabackup, mariadb, mariadbd, mariadb-access,
-          mariadb-admin, mariadb-binlog, mariadb-check, mariadb-client-test,
-          mariadb-client-test-embedded, mariadb-conv,
-          mariadb-convert-table-format, mariadbd-multi, mariadbd-safe,
-          mariadbd-safe-helper, mariadb-dump, mariadb-dumpslow,
+          mariadb-admin, mariadb-backup, mariadb-binlog, mariadb-check,
+          mariadb-client-test, mariadb-client-test-embedded, mariadb-conv,
+          mariadb-convert-table-format, mariadb-find-rows, mariadbd-multi, 
+          mariadbd-safe, mariadbd-safe-helper, mariadb-dump, mariadb-dumpslow,
           mariadb-embedded, mariadb-fix-extensions, mariadb-hotcopy,
           mariadb-import, mariadb-install-db, mariadb-ldb, mariadb-plugin,
-          mariadb-secure-installation, mariadb-setpermission, mariadb-show,
+          mariadb-secure-installation, mariadb-setpermission,
+          mariadb-service-convert, mariadb-show,
           mariadb-slap, mariadb-test, mariadb-test-embedded,
           mariadb-tzinfo-to-sql, mariadb-upgrade, mariadb-waitpid,
@@ -430,5 +432,5 @@
         </seg>
         <seg>
-          libmariadbclient.a, libmariadb.so, libmysqlclient.a,
+          libmariadbclient.a, libmariadb.so, libmariadbd.so, libmysqlclient.a,
           libmysqlclient_r.a (symbolic links to libmariadbclient.a),
           libmysqld.{so,a}, libmysqlservices.a,
@@ -437,5 +439,6 @@
         <seg>
           /etc/mysql,
-          /usr/{include,lib,share}/mysql, and
+          /usr/{include,lib,share}/mysql,
+          /usr/share/groonga{-normalizer-mysql}, and
           /usr/share/doc/mariadb-&mariadb-version;
         </seg>
@@ -486,5 +489,5 @@
         <listitem>
           <para>
-            is a tool to dump content of Aria log pages
+            is a tool to dump the contents of Aria log pages
           </para>
           <indexterm zone="mariadb aria_dump_log-mariadb">
@@ -643,5 +646,5 @@
         <listitem>
           <para>
-            read binary log files
+            reads binary log files
           </para>
           <indexterm zone="mariadb mariadb-binlog-mariadb">
@@ -681,5 +684,5 @@
         <listitem>
           <para>
-            is a tool to test client API for embedded server
+            is a tool to test the client API for the embedded server
           </para>
           <indexterm zone="mariadb mariadb-client-test-embedded-mariadb">
@@ -809,5 +812,5 @@
         <listitem>
           <para>
-            locks the table, flush the table and then performs a copy of
+            locks the table, flushes the table and then performs a copy of
             the database
           </para>
@@ -881,4 +884,16 @@
       </varlistentry>
 
+      <varlistentry id="mariadb-service-convert-mariadb">
+        <term><command>mariadb-service-convert</command></term>
+        <listitem>
+          <para>
+            generates a systemd unit based on the current mariadb settings
+          </para>
+          <indexterm zone="mariadb mariadb-service-convert-mariadb">
+            <primary sortas="b-mariadb-service-convert-mariadb">mariadb-service-convert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mariadb-setpermission-mariadb">
         <term><command>mariadb-setpermission</command></term>
