The branch, master has been updated via 4e7dfcc87aa0c633b25d182302aed8b0fadf714e (commit) via 058544bff0ae82e0d8b04174bb5023b86f62700f (commit) via 225bb623fe0752e5a13e5b258c5d46a68018be4d (commit) from e3596488cc4eed5e8a8d89a66b115bc74fe8d79b (commit)

- Log ----------------------------------------------------------------- commit 4e7dfcc87aa0c633b25d182302aed8b0fadf714e Author: Michal Čihař mcihar@suse.cz Date: Mon Jul 11 15:05:31 2011 +0200

Do not list 2.x releases

commit 058544bff0ae82e0d8b04174bb5023b86f62700f Author: Michal Čihař mcihar@suse.cz Date: Mon Jul 11 14:56:53 2011 +0200

Remove references to 2.x

commit 225bb623fe0752e5a13e5b258c5d46a68018be4d Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 7 15:42:31 2011 +0200

Document location of the build log file

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

Summary of changes: README | 8 ++++++++ render.py | 2 +- templates/downloads.tpl | 5 ++--- templates/index.tpl | 4 +--- 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README b/README index b2e49ff..e3957f7 100644 --- a/README +++ b/README @@ -109,6 +109,14 @@ And finally rsync it to sourceforge:

rsync -az --delete output/ user,phpmyadmin@web.sourceforge.net:htdocs/home_page/

+Automatic build +--------------- + +There is configured automatic build of website, which runs every hour. +In case website is not updated, you might want to check the build log +for any possible failures: + +http://www.phpmyadmin.net/home_page/render.log

License ------- diff --git a/render.py b/render.py index a28b47a..059d094 100755 --- a/render.py +++ b/render.py @@ -427,7 +427,7 @@ class SFGenerator: for stable in outversions.keys(): version = releases[outversions[stable]]['version'] major_branch = MAJOR_BRANCH_REGEXP.match(version).group(1) - if major_branch == '1': + if major_branch in ['1', '2']: del outversions[stable] continue for check in outversions.keys(): diff --git a/templates/downloads.tpl b/templates/downloads.tpl index abf2a79..c8fe45f 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -22,9 +22,8 @@ <p> If you do not have a package available or desire to install your own phpMyAdmin, you can download one of following - source packages. Please note that 3.x versions require at least PHP 5.2 - and MySQL 5 to use them. If you are using older versions, please choose - the 2.x branch, which is still supported for security fixes. + source packages. Please note that phpMyAdmin requires at least PHP 5.2 + and MySQL 5. </p>

<py:for each="release in releases"> diff --git a/templates/index.tpl b/templates/index.tpl index 0510e4e..c175908 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -55,9 +55,7 @@ and RTL languages. Since version 3.0.0, phpMyAdmin joined the <a href="${base_url}gophp5.${file_ext}">GoPHP5 initiative</a> and dropped compatibility code for older PHP and MySQL versions; version 3 and later requires -at least PHP 5.2 and MySQL 5. To use with older PHP or MySQL versions, use -the older (but still maintained) branch of 2.x releases, which you can find on the <a -href="${base_url}downloads.${file_ext}">download page</a>. +at least PHP 5.2 and MySQL 5. </p>

<p>

hooks/post-receive