The branch, master has been updated via a727fd587d4b4bf800247129517b6bbb47232c24 (commit) from 0431042bd05a6c580951f7f7497fc237b17919d1 (commit)

- Log ----------------------------------------------------------------- commit a727fd587d4b4bf800247129517b6bbb47232c24 Author: Michal Čihař mcihar@novell.com Date: Tue Sep 7 15:17:08 2010 +0200

Unify plain text documentation formatting a little bit.

Most of things (except ChangeLog) are now proper reStructuredText.

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

Summary of changes: ChangeLog | 7 ++-- README | 105 +++++++++++++++++++++++++++++-------------------------- README.VENDOR | 17 ++++++--- contrib/README | 18 +++++++-- 4 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 58e2f8a..df12a55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,5 @@ ----------------------- -phpMyAdmin - ChangeLog ----------------------- +phpMyAdmin - ChangeLog +======================

3.4.0.0 (not yet released) + rfe #2890226 [view] Enable VIEW rename @@ -314,6 +313,6 @@ phpMyAdmin - ChangeLog http://www.phpmyadmin.net/old-stuff/ChangeLogs/

# vim: et ts=4 sw=4 sts=4 -# vim: ft=changelog fenc=utf-8 encoding=utf-8 +# vim: ft=changelog fenc=utf-8 # vim: fde=getline(v:lnum-1)=~'^\s*$'&&getline(v:lnum)=~'\S'?'>1':1&&v:lnum>4&&getline(v:lnum)!~'^#' # vim: fdn=1 fdm=expr diff --git a/README b/README index 4e95e34..ffa1b89 100644 --- a/README +++ b/README @@ -1,72 +1,77 @@ phpMyAdmin - Readme ===================

- A set of PHP-scripts to manage MySQL over the web. +A set of PHP-scripts to manage MySQL over the web.

- Version 3.4.0-dev - ----------------- - http://www.phpmyadmin.net/ +Version 3.4.0-dev +-----------------

- Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> - Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> - Olivier Müller <om_at_omnis.ch> - Robin Johnson <robbat2_at_users.sourceforge.net> - Alexander M. Turek <me_at_derrabus.de> - Michal Čihař <michal_at_cihar.com> - Garvin Hicking <me_at_supergarv.de> - Michael Keck <mkkeck_at_users.sourceforge.net> - Sebastian Mendel <cybot_tm_at_users.sourceforge.net> - [check Documentation.txt/.html file for more details] +http://www.phpmyadmin.net/

- This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2, - as published by the Free Software Foundation. +Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>

- This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> + Olivier Müller <om_at_omnis.ch> + Robin Johnson <robbat2_at_users.sourceforge.net> + Alexander M. Turek <me_at_derrabus.de> + Michal Čihař <michal_at_cihar.com> + Garvin Hicking <me_at_supergarv.de> + Michael Keck <mkkeck_at_users.sourceforge.net> + Sebastian Mendel <cybot_tm_at_users.sourceforge.net> + [check Documentation.txt/.html file for more details]

- You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License version 2, +as published by the Free Software Foundation.

- Requirements: - php 5.2 or later - MySQL 5.0 or later - a web-browser (doh!) +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details.

- Summary: - phpMyAdmin is intended to handle the administration of MySQL over the web. - For a summary of features, please see the Documentation.txt/.html file. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

- Download: - You can get the newest version at http://www.phpmyadmin.net/. +Requirements +~~~~~~~~~~~~

- Credits: - Please see the Documentation.txt/.html file. +* php 5.2 or later +* MySQL 5.0 or later +* a web-browser (doh!)

- Installation: - Please see the Documentation.txt/.html file. +Summary +~~~~~~~

- ChangeLog: - Now in ChangeLog +phpMyAdmin is intended to handle the administration of MySQL over the web. +For a summary of features, please see the Documentation.txt/.html file.

- Documentation: - Basic documentation available in Documentation.txt/.html +Download +~~~~~~~~

- Support: - See reference about support forums under http://www.phpmyadmin.net/ +You can get the newest version at http://www.phpmyadmin.net/. + +More Information +~~~~~~~~~~~~~~~~ + +Please see the Documentation.txt/.html file. + +Support +~~~~~~~ + +See reference about support forums under http://www.phpmyadmin.net/

Enjoy! - The phpMyAdmin Devel team + + -- The phpMyAdmin Devel team

- PS: Please, don't send us emails with question like "How do I compile - PHP with MySQL-support". We just don't have the time to be your - free helpdesk. - Please send your questions to the appropriate mailinglists / forums. - Before contacting us, please read the Documentation.html (esp. the - FAQ part). +PS: + Please, don't send us emails with question like "How do I compile + PHP with MySQL-support". We just don't have the time to be your + free helpdesk. + Please send your questions to the appropriate mailinglists / forums. + Before contacting us, please read the Documentation.html (esp. the + FAQ part).

diff --git a/README.VENDOR b/README.VENDOR index 5ff0312..1c6aae5 100644 --- a/README.VENDOR +++ b/README.VENDOR @@ -24,11 +24,16 @@ one we ship.

Currently known list of external libraries:

-js/jquery - jQuery js framework -js/colorpicker - jQuery based color picker - -libarries/PHPExcel - PHPExcel library for handling Excel files -libraries/php-gettext - php-gettext library -libraries/tcpdf - tcpdf library, modified for our needs! +js/jquery + jQuery js framework +js/colorpicker + jQuery based color picker + +libarries/PHPExcel + PHPExcel library for handling Excel files +libraries/php-gettext + php-gettext library +libraries/tcpdf + tcpdf library, modified for our needs!

# vim: et ts=4 sw=4 sts=4 tw=72 spell spelllang=en_us diff --git a/contrib/README b/contrib/README index 6e2c9e1..ac8ef6c 100644 --- a/contrib/README +++ b/contrib/README @@ -1,10 +1,20 @@ +phpMyAdmin Third Party Contributions +==================================== + This directory contains various stuff contributed by users that might be useful to other. There is no guarantee it will work for you.

Current content of this directory:

-packaging - Contains files needed for creating packages for various - distributions. Please prefer official packages from your vendor if - possible. +packaging + Contains files needed for creating packages for various + distributions. Please prefer official packages from your vendor if + possible. + +swekey.sample.conf + SweKey authentication configuration example. + +htaccess + Sample Apache configuration for limit access for bots.

-vim: expandtab ts=4 sw=4 sts=4 tw=78 +# vim: expandtab ts=4 sw=4 sts=4 tw=78

hooks/post-receive