From 4876d2775855b2ce5bd9fff9e5abedbe2600a9bb Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 11 Mar 2010 12:41:04 -0500
Subject: [PATCH 1/3] remove mention of subversion

---
 scripts/create-release.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index fe19d09b7..9023b965a 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -69,7 +69,7 @@ fi
 cat <<END
 
 Please ensure you have:
-  1. incremented rc count or version in subversion :
+  1. incremented rc count or version in the repository :
      - in libraries/Config.class.php PMA_Config::__constructor() the line
           " \$this->set( 'PMA_VERSION', '$version' ); "
      - in Documentation.html the 2 lines
@@ -194,7 +194,7 @@ cat <<END
 Todo now:
 ---------
 
- 1. tag the subversion tree with the new revision number for a plain release
+ 1. tag the repository with the new revision number for a plain release
     or a release candidate:
     version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE
     version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING
@@ -214,7 +214,7 @@ Todo now:
     Don't forget to update the Description section in the announcement,
     based on Documentation.html.
 
- 7. increment rc count or version in subversion :
+ 7. increment rc count or version in the repository :
         - in libraries/Config.class.php PMA_Config::__constructor() the line
               " \$this->set( 'PMA_VERSION', '2.7.1-dev' ); "
         - in Documentation.html the 2 lines

From 0db3d899eed5dd09d6e0e018e5c175c1b4d53e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Thu, 11 Mar 2010 17:04:31 +0100
Subject: [PATCH 2/3] Add list of ignored files.

---
 .gitignore | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..83fc036dd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+# Directory for creating releases
+release
+# Configuration files
+config.inc.php
+config.header.inc.php
+config.footer.inc.php
+# Upload/save dirs
+upload
+save
+# For setup script
+config
+# ctags
+tags
+# Editor files
+phpmyadmin.wpj
+.projectOptions
+.vimrc
+.project
+.settings
+.buildpath
+.cache
+*.sw[op]

From 4a53eb19160936770d32244939ee82906e0f88c8 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 11 Mar 2010 17:58:51 -0500
Subject: [PATCH 3/3] duplicate comment

---
 navigation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/navigation.php b/navigation.php
index fe6fccc89..8bb5361c9 100644
--- a/navigation.php
+++ b/navigation.php
@@ -36,7 +36,6 @@
  * @uses PMA_getTableList()
  * @uses PMA_getRelationsParam()
  * @uses PMA_outBufferPre()
- * @uses session_write_close()
  * @uses strlen()
  * @uses session_write_close()
  * @uses is_array()