Merge branch 'master' into quickform

build.xml

@@ -8,8 +8,8 @@
   -->
   <property file="build.properties" />
 
-  <property name="version-m"  value="0.96" />
-  <property name="version"    value="0.96.1" />
+  <property name="version-m"  value="0.97" />
+  <property name="version"    value="0.97.0" />
   <property name="zipfile"    value="${phing.project.name}-${version}.zip" />
   <property name="distfile"   value="dist/${zipfile}" />
   <property name="sfproject"  value="SemanticScuttle" />

data/templates/about.tpl.php

@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 
 <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?>
-<li>SemanticScuttle v0.96.1</li>
+<li>SemanticScuttle v0.97.0</li>
 <?php endif ?>
 </ul>
 

doc/ChangeLog

@@ -1,9 +1,9 @@
 ChangeLog for SemantiScuttle
 ============================
 
-0.97.0 - 2010-?????
+0.97.0 - 2010-06-09
 -------------------
-- Many SQL optimizations
+- Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now
 - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames
 - Do not highlight admin bookmarks when $enableAdminColors is disabled
 - Add russian translation

doc/UPGRADE.txt

@@ -1,6 +1,12 @@
 Upgrading SemanticScuttle from a previous version
 =================================================
 
+
+From version 0.96 to 0.97
+-------------------------
+No database changes necessary.
+
+
 From version 0.95 to 0.96
 -------------------------
 Update your database:

doc/developers/release-new-version

@@ -3,19 +3,20 @@ How to release a new version of SemanticScuttle
 
 0. Run unit tests and verify that all of them pass
 1. Update doc/ChangeLog
-2. Update version in data/templates/about.tpl.php
+2. Update doc/UPGRADE.txt
+3. Update version in data/templates/about.tpl.php
    and build.xml
-3. Create a release zip file via the build script:
+4. Create a release zip file via the build script:
    Just type "phing".
-4. Make a test installation from your zip file with a fresh
+5. Make a test installation from your zip file with a fresh
    database. Register a user, add bookmarks etc.
-5. When all is fine, it's time to release.
+6. When all is fine, it's time to release.
    The build script takes care for most of the
    tasks.
    Run "phing release", and it will upload the release to
    sourceforge and create a svn tag.
-6. Write announcement mail to the SemanticScuttle mailing list
+7. Write announcement mail to the SemanticScuttle mailing list
    semanticscuttle-devel@lists.sourceforge.net
-7. Announce the new release in the sourceforge project news
+8. Announce the new release in the sourceforge project news
    https://sourceforge.net/apps/trac/sourceforge/wiki/News