diff --git a/doc/other.rst b/doc/other.rst
index bb6de86dc8..3b6efaa7cb 100644
--- a/doc/other.rst
+++ b/doc/other.rst
@@ -13,6 +13,21 @@ book and other officially endorsed `books at the phpMyAdmin site`_.
 Tutorials
 ---------
 
-Third party tutorials and articles are listed on our `wiki page`_.
+Third party tutorials and articles which you might find interesting:
 
-.. _wiki page: http://wiki.phpmyadmin.net/pma/Articles
+Česky (Czech)
++++++++++++++
+
+- `Seriál o phpMyAdminovi <https://cihar.com/publications/linuxsoft/>`_
+
+English
++++++++
+
+- `Having fun with phpMyAdmin's MIME-transformations & PDF-features <http://garv.in/tops/texte/mimetutorial>`_
+- `Learning SQL Using phpMyAdmin (old tutorial) <http://www.php-editors.com/articles/sql_phpmyadmin.php>`_
+- `Install and configure phpMyAdmin on IIS <http://www.iis-aid.com/articles/how_to_guides/install_and_configure_phpmyadmin_iis>`_
+
+Русский (Russian)
++++++++++++++++++
+
+* `Russian server about phpMyAdmin <http://php-myadmin.ru/>`_
diff --git a/doc/setup.rst b/doc/setup.rst
index 8238de68b0..704ff0dce0 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -532,7 +532,7 @@ For a whole set of additional features (:ref:`bookmarks`, comments, :term:`SQL`-
 tracking mechanism, :term:`PDF`-generation, :ref:`transformations`, :ref:`relations`
 etc.) you need to create a set of special tables.  Those tables can be located
 in your own database, or in a central database for a multi-user installation
-(this database would then be accessed by the :ref:`controluser`, so no other user
+(this database would then be accessed by the controluser, so no other user
 should have rights to it).
 
 Zero configuration
diff --git a/doc/user.rst b/doc/user.rst
index 554a864f39..8af756a7bb 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -9,5 +9,5 @@ User Guide
     privileges
     relations
     charts
-    other
     import_export
+    other