From c4763baaff59bd1c806efb238eecadc348b48d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 25 Sep 2013 14:46:18 +0200 Subject: [PATCH 1/5] Incorporate distro specific docs from website --- doc/setup.rst | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/doc/setup.rst b/doc/setup.rst index d37692d817..219a6053a6 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -16,6 +16,67 @@ page can be used for this. uploading them to your server, as PHP seems not to like :term:`Mac`-style end of lines character ("``\r``"). +Linux distributions ++++++++++++++++++++ + +phpMyAdmin is included in most of 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 +------ + +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. + +OpenSUSE +-------- + +OpenSUSE already comes with phpMyAdmin package, just install packages from +the `openSUSE Build Service `_. + +Ubuntu +------ + +Ubuntu ships phpMyAdmin package, however if you want to use recent version, you +can use packages from +`PPA for Michal Čihař `_. + +Gentoo +------ + +Gentoo ships the phpMyAdmin package, both in a near stock configuration as well +as in a ``webapp-config`` configuration. Use ``emerge dev-db/phpmyadmin`` to +install. + +Mandriva +-------- + +Mandriva ships the phpMyAdmin package in their ``contrib`` branch and can be +installed via the usual Control Center. + +Fedora +------ + +Fedora ships the 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. + +Red Hat Enterprise Linux +------------------------ + +Red Hat Enterprise Linux itself and thus derivatives like CentOS don't +ship phpMyAdmin, but the Fedora-driven repository +`Extra Packages for Enterprise Linux (EPEL) `_ +is doing so, if it's +`enabled `_. +But be aware that the configuration file is maintained in +``/etc/phpMyAdmin/`` and may differ in some ways from the +official phpMyAdmin documentation. + + .. _quick_install: Quick Install From 66427dd54261de22d032b1e9bb8843c442cc2f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 25 Sep 2013 14:48:41 +0200 Subject: [PATCH 2/5] Mention XAMMP as easy way to install on Windows --- doc/setup.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/setup.rst b/doc/setup.rst index 219a6053a6..42cd977a72 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -77,6 +77,14 @@ But be aware that the configuration file is maintained in official phpMyAdmin documentation. +Installing on Windows ++++++++++++++++++++++ + +The easiest way to get phpMyAdmin on Windows is using third party products +which include phpMyAdmin together with a database and web server such as +`XAMPP `_. + + .. _quick_install: Quick Install From c7dab76355f73cc101ddb249c8ce0494d6486a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 25 Sep 2013 15:01:41 +0200 Subject: [PATCH 3/5] Add link to wiki --- doc/setup.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/setup.rst b/doc/setup.rst index 42cd977a72..f97a8dbf7b 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -84,6 +84,8 @@ The easiest way to get phpMyAdmin on Windows is using third party products which include phpMyAdmin together with a database and web server such as `XAMPP `_. +You can find more of such options at `phpMyadmin wiki `_. + .. _quick_install: From 8d26080f46b4f9d54017823eda537d6e151c7db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 25 Sep 2013 15:28:33 +0200 Subject: [PATCH 4/5] Remove not needed of --- doc/setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.rst b/doc/setup.rst index f97a8dbf7b..e5877d4c59 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -19,7 +19,7 @@ page can be used for this. Linux distributions +++++++++++++++++++ -phpMyAdmin is included in most of Linux distributions. It is recommended to use +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. From 017e3870488e0095c9d0a15e7ec83218138a4d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 25 Sep 2013 16:32:27 +0200 Subject: [PATCH 5/5] Link to existing page on Wikipedia --- doc/setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.rst b/doc/setup.rst index e5877d4c59..9670a40865 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -84,7 +84,7 @@ The easiest way to get phpMyAdmin on Windows is using third party products which include phpMyAdmin together with a database and web server such as `XAMPP `_. -You can find more of such options at `phpMyadmin wiki `_. +You can find more of such options at `Wikipedia `_. .. _quick_install: