5 files changed, 78 insertions, 13 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f963ca2..7e3a064 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,11 +3,40 @@ ChangeLog for SemantiScuttle
 
 .. contents::
 
-0.98.1 - 2011-XX-XX
+0.98.4 - 2011-XX-XX
+-------------------
+- Fix bug: URLs were escaped too often in bookmark list
+- Fix bug: Subtitle was not escaped
+- Fix bug #3393951: Logo images missing on bookmark page
+- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
+
+
+0.98.3 - 2011-08-09
+-------------------
+- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php
+
+The script was only missing in the .zip file; the PEAR package
+contained it - thus no 0.98.3 PEAR package.
+
+
+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
+- 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
+
+Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the
+``system:unfiled`` tags.
+
+
+0.98.1 - 2011-08-01
 -------------------
 - 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
 
 
 0.98.0 - 2011-07-21
diff --git a/doc/README.rst b/doc/README.rst
index 7702400..a8ef83e 100644
--- a/doc/README.rst
+++ b/doc/README.rst
@@ -1,6 +1,6 @@
-====================
-SemanticScuttle 0.98
-====================
+======================
+SemanticScuttle 0.98.3
+======================
 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
 
 
 
diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt
index b144af2..511748e 100644
--- a/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@ -4,6 +4,12 @@ Upgrading SemanticScuttle from a previous version
 
 .. contents::
 
+From version 0.94-0.98.1 to 0.98.3
+==================================
+Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the
+``system:unfiled`` tags.
+
+
 From version 0.97 to 0.98
 =========================
 Database updates
diff --git a/doc/configuration.rst b/doc/configuration.rst
index f457ebb..c8a8bd9 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -2,6 +2,8 @@
 Configuration files
 ===================
 
+.. contents::
+
 SemanticScuttle uses at least two configuration files:
 
 1. Default configuration file ``config.default.php``
@@ -56,3 +58,24 @@ per-host configuration files:
 - ``data/config.$hostname.php``
 - ``/etc/semanticscuttle/config.$hostname.php``
 
+
+
+Configuration options
+=====================
+``$root`` URL
+-------------
+Normally, this configuration setting is detected automatically and will
+work for both HTTP and HTTPS installations.
+
+If your installation is available on **HTTP only**, then you need to configure
+it.
+
+The value is the full URL to your installation, including a trailing
+slash::
+
+    $root = "http://homepage.example.org/semanticscuttle/";
+
+or::
+
+    $root = "http://bookmarks.example.org/";
+
diff --git a/doc/developers/release-new-version.rst b/doc/developers/release-new-version.rst
index a5e77dc..de2c4e3 100644
--- a/doc/developers/release-new-version.rst
+++ b/doc/developers/release-new-version.rst
@@ -4,7 +4,7 @@ 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 ``doc/UPGRADE.txt``
-3. Update version in ``data/templates/about.tpl.php``,
+3. Update version in ``data/templates/default/about.tpl.php``,
    ``build.xml`` and ``doc/README.rst``
 4. Create a release zip file via the build script:
    Just type "``phing``".
@@ -14,9 +14,18 @@ How to release a new version of SemanticScuttle
    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.
-7. Write announcement mail to the SemanticScuttle mailing list
-   semanticscuttle-devel@lists.sourceforge.net
-8. Announce the new release in the sourceforge project news
-   https://sourceforge.net/apps/trac/sourceforge/wiki/News
-
+   sourceforge.
+7. Create a git tag and push it
+8. Create the PEAR package and test it:
+   Run ``phing package``, then
+   ``pear upgrade dist/pear/SemanticScuttle-0.xx.tgz``
+9. Publish the PEAR package: ``phing deploy-sf-pear``
+10. Publish the documentation: ``phing deploy-docs``
+11. Write announcement mail to the SemanticScuttle mailing list
+    semanticscuttle-devel@lists.sourceforge.net
+12. Announce the new release in the sourceforge project news
+    https://sourceforge.net/news/submit.php?group_id=211356
+    Help about the process is available in
+    https://sourceforge.net/apps/trac/sourceforge/wiki/News
+13. Set the default file in
+    https://sourceforge.net/projects/semanticscuttle/files/SemanticScuttle/