From 89fc8796cd4a5cbe8ba606575712eab2e328f890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 16 May 2016 11:17:01 +0200 Subject: [PATCH] Improve docs on Debian packaging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on content from the wiki. Signed-off-by: Michal Čihař --- doc/setup.rst | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 7e8057e2fc..0c084d01a4 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -23,13 +23,23 @@ phpMyAdmin is included in most Linux distributions. It is recommended to use distribution packages when possible - they usually provide integration to your distribution and you will automatically get security updates from your distribution. +.. _debian-package: Debian ------ Debian's package repositories include a phpMyAdmin package, but be aware that the configuration file is maintained in ``/etc/phpmyadmin`` and may differ in -some ways from the official phpMyAdmin documentation. +some ways from the official phpMyAdmin documentation. Specifically it does: + +* Configuration of web server (works for Apache and lighttpd). +* Creating of :ref:`linked-tables` using dbconfig-common. +* Securing setup script, see :ref:`debian-setup`. + +.. seealso:: + + More information can be found in `README.Debian `_ + (it is installed as :file:`/usr/share/doc/phmyadmin/README.Debian` with the package). OpenSUSE -------- @@ -42,7 +52,12 @@ Ubuntu Ubuntu ships phpMyAdmin package, however if you want to use recent version, you can use packages from -`PPA for Michal Čihař `_. +`phpMyAdmin PPA `_. + +.. seealso:: + + The packages are same as in :ref:`debian-package` please check the documetation + there for more details. Gentoo ------ @@ -367,6 +382,8 @@ options which the setup script does not provide. a login dialog if using :term:`HTTP` or cookie authentication mode. +.. _debian-setup: + Setup script on Debian, Ubuntu and derivatives ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~