The branch, master has been updated via fbea5364d15281f394eede5a576787c0facd6f53 (commit) from 95b423605337e53e1222c3dd5531c8e91782c6fd (commit)

- Log ----------------------------------------------------------------- commit fbea5364d15281f394eede5a576787c0facd6f53 Author: Michal Čihař michal@cihar.com Date: Tue Jun 21 11:01:19 2011 +0200

Switch generating phpdoc to docblox, it seems to work nicer

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

Summary of changes: website/pma-docs | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/website/pma-docs b/website/pma-docs index ce9f3e3..a8a3e22 100755 --- a/website/pma-docs +++ b/website/pma-docs @@ -10,13 +10,11 @@ chmod 644 $tmpfile cd /home/pmaweb/pma/phpmyadmin/ git pull -q nice -19 \ - phpdoc \ + docblox run \ -d ./ \ - -i lang/ \ - -dn 'phpMyAdmin' \ - -ti 'phpMyAdmin documentation' \ - -o HTML:frames:phphtmllib \ -t $tmpdir \ + -i libraries/PHPExcel/*,libraries/tcpdf/*,libraries/php-gettext/* \ + --title 'phpMyAdmin documentation' \ > $tmpfile if [ $? -eq 0 ] ; then rsync -az --delete $tmpdir/ web.sourceforge.net:htdocs/phpdoc/

hooks/post-receive