The branch, master has been updated via a005aaa6fadd0fbef6d7207fca8bf4afac1e81a8 (commit) from 97097c0a7a4daf0bd179b29aa35e1fe9a8553d39 (commit)

- Log ----------------------------------------------------------------- commit a005aaa6fadd0fbef6d7207fca8bf4afac1e81a8 Author: Michal Čihař michal@cihar.com Date: Fri Dec 31 14:39:14 2010 +0100

Rewrap to 72 chars, fix some minor typos.

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

Summary of changes: README | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/README b/README index 3bab700..6e9ca8c 100644 --- a/README +++ b/README @@ -8,9 +8,13 @@ Version 3.4.0-beta1

http://www.phpmyadmin.net/

-Copyright (C) 1998-2000 +Copyright +--------- + +Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> -Copyright (C) 2001-2010 + +Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> @@ -21,18 +25,21 @@ Copyright (C) 2001-2010 Sebastian Mendel <cybot_tm_at_users.sourceforge.net> [check Documentation.txt/.html file for more details]

-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. +License +------- + +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.

-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. +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.

-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 +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

Requirements ------------ @@ -69,13 +76,11 @@ Enjoy! The phpMyAdmin Devel team

-PS: +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, 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 help desk.

- Please send your questions to the appropriate mailinglists / forums. - Before contacting us, please read the Documentation.html (esp. the - FAQ part). +Please send your questions to the appropriate mailing lists / forums. Before +contacting us, please read the Documentation.html (esp. the FAQ part).

hooks/post-receive