The branch, master has been updated via 405496f24f34f13d2aad06123d9ad85fe7fdeba9 (commit) via 270ed4cba580e884882aef1b1ca4f3ac4fa4fed5 (commit) from 2288a005cce79eaa795e6b5782145e60999f010f (commit)

- Log ----------------------------------------------------------------- commit 405496f24f34f13d2aad06123d9ad85fe7fdeba9 Author: Michal Čihař mcihar@novell.com Date: Mon May 30 10:12:16 2011 +0200

Formatting

commit 270ed4cba580e884882aef1b1ca4f3ac4fa4fed5 Author: Robert Scheck robert@fedoraproject.org Date: Mon May 30 10:08:12 2011 +0200

Add information for Fedora and RHEL

-----------------------------------------------------------------------

Summary of changes: templates/downloads.tpl | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/templates/downloads.tpl b/templates/downloads.tpl index c692300..abf2a79 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -79,11 +79,11 @@ <h2><a id="distributions"></a>Distributions</h2> <h3>Debian</h3> <p> - 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. The - package maintainer often visits the official IRC channel (#phpmyadmin on - irc.freenode.net). + Debian's package repositories include a phpMyAdmin package, but be + aware that the configuration file is maintained in + <code>/etc/phpmyadmin</code> and may differ in some ways from the + official phpMyAdmin documentation. The package maintainer often visits + the official IRC channel (#phpmyadmin on irc.freenode.net). </p> <h3>OpenSUSE</h3> <p> @@ -111,6 +111,25 @@ and can be installed via the usual Control Center. </p>

+ <h3>Fedora</h3> + <p> + Fedora ships the phpMyAdmin package, but be aware that the + configuration file is maintained in <code>/etc/phpMyAdmin/</code> and + may differ in some ways from the official phpMyAdmin documentation. + </p> + + <h3>Red Hat Enterprise Linux</h3> + <p> + Red Hat Enterprise Linux itself and thus derivates like CentOS don't + ship phpMyAdmin, but the Fedora-driven repository <a + href="http://fedoraproject.org/wiki/EPEL%22%3EExtra Packages for Enterprise + Linux</a> (EPEL) is doing so, if it's <a + href="http://fedoraproject.org/wiki/EPEL/FAQ#howtouse%22%3Eenabled</a>. + But be aware that the configuration file is maintained in + <code>/etc/phpMyAdmin/</code> and may differ in some ways from the + official phpMyAdmin documentation. + </p> + <h3>Amahi Linux Home Server</h3> <p> phpMyAdmin is available as a one-click install on the <a href="http://www.amahi.org/apps">Amahi Home Server</a>.

hooks/post-receive