Merge branch '0.98'

4 files changed, 20 insertions, 13 deletions

diff --git a/build.xml b/build.xml
index 27a7fe8..d7735c8 100644
--- a/build.xml
+++ b/build.xml
@@ -10,13 +10,14 @@
   <property file="html.properties" />
 
   <property name="version-m"  value="0.98" />
-  <property name="version"    value="0.98.1" />
+  <property name="version"    value="0.98.2" />
   <property name="stability"  value="beta" />
   <property name="releasenotes" value="
-- Fix bug #3375635: XML parsing problem in top.inc.php
-- Fix bug #3375428: Forgot to remove some old dojo files
-- Fix bug #3160512: Make SemanticScuttle work with FastCGI
-- Fix bug #3376618: Broken tag completion for private bookmarks
+- Fix bug #3385724: Rename tag ends with XML Parsing Error
+- Fix bug #3386178: 'system:unfiled' secret tag does not work
+- Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem
+- Fix bug #3382126: Linked tags does not work for tags with spaces
+- Fix delicious API help page link
 " />
   <property name="zipfile"     value="${phing.project.name}-${version}.zip" />
   <property name="pkgfile"     value="${phing.project.name}-${version}.tgz" />
@@ -108,6 +109,7 @@
      <dirroles key="www">www</dirroles>
      <dirroles key="data">data</dirroles>
      <dirroles key="doc">doc</dirroles>
+     <dirroles key="scripts">doc</dirroles>
      <dirroles key="src">php</dirroles>
      <dirroles key="tests">test</dirroles>
 
@@ -122,7 +124,6 @@
      <ignore>data/locales/messages.po</ignore>
      <ignore>data/locales/*/LC_MESSAGES/messages.po</ignore>
      <ignore>dist/**</ignore>
-     <ignore>scripts/**</ignore>
      <ignore>src/php-gettext/examples/**</ignore>
      <ignore>src/php-gettext/tests/**</ignore>
      <ignore>*.properties</ignore>
@@ -148,6 +149,14 @@
       type="pear-config" from="@data_dir@" to="data_dir"
       />
 
+     <changelog version="0.98.2" date="2011-08-08" license="GPL">
+- Fix bug #3385724: Rename tag ends with XML Parsing Error
+- Fix bug #3386178: "system:unfiled" secret tag does not work
+- Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem
+- Fix bug #3382126: Linked tags does not work for tags with spaces
+- Fix delicious API help page link
+     </changelog>
+
      <changelog version="0.98.1" date="2011-08-01" license="GPL">
 - Fix bug #3375635: XML parsing problem in top.inc.php
 - Fix bug #3375428: Forgot to remove some old dojo files
diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php
index 7381570..a9dae5c 100644
--- a/data/templates/default/about.tpl.php
+++ b/data/templates/default/about.tpl.php
@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 
 <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?>
-<li>SemanticScuttle v0.98.1</li>
+<li>SemanticScuttle v0.98.2</li>
 <?php endif ?>
 </ul>
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 714eae3..81c2f6d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,7 +3,7 @@ ChangeLog for SemantiScuttle
 
 .. contents::
 
-0.98.2 - 2011-08-XX
+0.98.2 - 2011-08-08
 -------------------
 - Fix bug #3385724: Rename tag ends with XML Parsing Error
 - Fix bug #3386178: "system:unfiled" secret tag does not work
diff --git a/doc/README.rst b/doc/README.rst
index 7702400..225f021 100644
--- a/doc/README.rst
+++ b/doc/README.rst
@@ -1,6 +1,6 @@
-====================
-SemanticScuttle 0.98
-====================
+======================
+SemanticScuttle 0.98.2
+======================
 A social bookmarking tool experimenting with new features
 like structured tags or collaborative descriptions of tags.
 
@@ -46,7 +46,6 @@ Links
 - `suggestions`_ for SemanticScuttle
 - `bug reports`_
 - `feature requests`_
-- `patches`_
 
 __ http://semanticscuttle.wiki.sourceforge.net/
 __ http://sourceforge.net/forum/forum.php?forum_id=759510
@@ -54,7 +53,6 @@ __ https://sourceforge.net/mailarchive/forum.php?forum_name=semanticscuttle-deve
 .. _suggestions:  http://sourceforge.net/forum/forum.php?forum_id=759511
 .. _bug reports: http://sourceforge.net/tracker/?group_id=211356&atid=1017430
 .. _feature requests: https://sourceforge.net/tracker/?group_id=211356&atid=1017433
-.. _patches: https://sourceforge.net/tracker/?group_id=211356&atid=1017432