updating phpMyAdmin

phpMyAdmin/CONTRIBUTING.md

@@ -0,0 +1,21 @@
+# Contributing to phpMyAdmin
+
+As an open source project, phpMyAdmin welcomes contributions of many forms.
+
+## Bug reporting
+
+Please report [bugs on SourceForge.net][1]. 
+
+[1]: https://sourceforge.net/p/phpmyadmin/bugs/new/
+
+## Patches submission
+
+Patches are welcome either as [pull requests on GitHub][2].
+
+[2]: https://github.com/phpmyadmin/phpmyadmin/pulls
+
+## More information
+
+You can find more information on our website:
+
+http://www.phpmyadmin.net/home_page/improve.php

phpMyAdmin/README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.7
+Version 4.1.7
 
 A set of PHP-scripts to manage MySQL over the web.
 
@@ -13,7 +13,7 @@ Copyright
 Copyright (C) 1998-2000
     Tobias Ratschiller <tobias_at_ratschiller.com>
 
-Copyright (C) 2001-2013
+Copyright (C) 2001-2014
     Marc Delisle <marc_at_infomarc.info>
     Olivier Müller <om_at_omnis.ch>
     Robin Johnson <robbat2_at_users.sourceforge.net>
@@ -22,7 +22,7 @@ Copyright (C) 2001-2013
     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]
+    [check documentation for more details]
 
 License
 -------
@@ -39,18 +39,38 @@ details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+Third party licenses
+--------------------
+
+phpMyAdmin includes several third party libraries which come under their
+respective licenses.
+
+jQuery's license, which is where we got the files under js/jquery/ is
+(MIT|GPL), a copy of each license is available in this repository (GPL
+is available as LICENSE, MIT as js/jquery/MIT-LICENSE.txt).
+
+TCPDF which is located under libraries/tcpdf is released under GPL
+version 3 and the license is available as libraries/tcpdf/LICENSE.TXT.
+
+DejaVu fonts which are located under libraries/tcpdf/fonts/ and their
+license is documented in
+libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE.
+
+PHP-gettext which is located under libraries/php-gettext/ is released
+under GPL version 2 license which is available in the LICENSE file.
+
 Requirements
 ------------
 
-* PHP 5.2 or later
+* PHP 5.3 or later
 * MySQL 5.0 or later
 * a web-browser (doh!)
 
 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.
+For a summary of features, please see the documentation in the doc folder.
 
 Download
 --------
@@ -60,7 +80,7 @@ You can get the newest version at http://www.phpmyadmin.net/.
 More Information
 ----------------
 
-Please see the Documentation.txt/.html file.
+Please see the documentation in the doc folder.
 
 Support
 -------
@@ -80,5 +100,5 @@ 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 mailing lists / forums.  Before
-contacting us, please read the Documentation.html (esp. the FAQ part).
+contacting us, please read the documentation (especially the FAQ part).
 

phpMyAdmin/RELEASE-DATE-4.1.7

@@ -0,0 +1 @@
+Sun Feb  9 12:39:08 UTC 2014