Index: docs/manpages/trackerd.1
===================================================================
--- docs/manpages/trackerd.1	(revision 2825)
+++ docs/manpages/trackerd.1	(working copy)
@@ -1,4 +1,4 @@
-.TH trackerd 1 "July 2007" GNU "User Commands"
+.TH trackerd 1 "Jan 2008" GNU "User Commands"
 
 .SH NAME
 trackerd \- indexer daemon for tracker search tool
@@ -97,6 +97,7 @@ needs a
 to be running within your current session.
 
 .SH SEE ALSO
+.BR tracker-applet (1),
 .BR tracker-search-tool (1),
 .BR tracker-search (1),
 .BR tracker-tag (1),
Index: README
===================================================================
--- README	(revision 2825)
+++ README	(working copy)
@@ -13,9 +13,10 @@ Table of Contents
         6.1 Usage
         6.2 Setting Inotify Watch Limit
         6.3 Tracker files
-    7 Tracker & Nautilus Search
-    8 Tracker & Deskbar applet
-    9 Tracker tools
+    7 Integration with other tools
+        7.1 Nautilus search
+        7.2 Deskbar applet
+    8 Tracker tools
 
 
 1 Introduction
@@ -42,11 +43,12 @@ Table of Contents
   Supported first class objects include:
 
   * Files, Documents, Music, Images, Videos, Applications, Emails,
-    Conversations, History, Playlists
+    Conversations, Playlists
 
   Planned support:
 
-  * Appointments, Contacts, Projects, Tasks, Bookmarks, Notes
+  * Appointments, Contacts, Projects, Tasks, Bookmarks, Notes,
+    Firefox Web History
 
   All discussion related to tracker happens on the Tracker
   mailing list
@@ -343,8 +345,10 @@ Table of Contents
     session data.
 
 
-7 Tracker & Nautilus Search
+7 Integration with other tools
 
+7.1 Nautilus Search
+
   Once you have installed Tracker and have some indexed contents,
   you should now compile Nautilus (ver 2.13.4 or higher) which
   should auto-detect that Tracker is installed and automatically
@@ -358,17 +362,26 @@ Table of Contents
   /usr/bin/trackerd). For non-GNOME installations, see the
   desktop docs for how to achieve similar.
 
+7.2 Deskbar applet
 
-8 Tracker & Deskbar applet
+  Tracker is also integrated in GNOME's deskbar applet.
+  
+  Here are the compile options on how to get it built:
 
-  Tracker is also integrated in GNOME's deskbar applet. See
-  Compile Options above on how to get it built.
+    --enable-deskbar-applet=(auto, handler, module) : enables 	 
+    Deskbar-applet support; 'auto' should do since it automatically 	 
+    chooses whether to install the 'handler' (for Deskbar-applet 	 
+    >=2.16) or the 'module' (for Deskbar-applet >=2.19) 	 
+	  	 
+    --with-deskbar-applet-dir=(directory where Deskbar-applet 	 
+    should find tracker-handler; this should be automatically 	 
+    detected, perhaps in 	 
+    /usr/lib/deskbar-applet/{handlers,modules-2.20-compatible})
 
 
-9 Tracker Tools
+8 Tracker Tools
 
   The Tracker distribution comes with a number of useful utilities which
   are listed at the bottom of trackerd man page, "man trackerd". It's
   recommended that you use the "--help" command line switch
-  (e.g., "tracker-services --help") for a more up-to-date usage info.
-
+  (e.g., "tracker-services --help") for more up-to-date usage info.
Index: TODO
===================================================================
--- TODO	(revision 2825)
+++ TODO	(working copy)
@@ -1,28 +1,32 @@
 General:
-
 * XESAM integration
-* Indexer backend independence (not just rely on SQLite)
 * Automatic language detection
 
 Application support:
-
 * Balsa mboxes
 * Brasero integration
 * Epiphany integration (bookmarks and history)
 * Rhythmbox integration
 * Tomboy notes indexing
+* Modest, a mobile email client (much work already exists in svn trunk)
 
 Search:
-
 * Search filtering (e.g. search within specific folders)
 * Search results that update in real time
 * Search within archives
-* "exact phrase" search
-* Wildcard search
 
+Internal:
+* Crawler to move to Indexer
+* FTS support (replacement of QDBM, the current index db)
+  -> enables "exact phrase" searches
+  -> enables wildcard searches
+  -> enables prefix searches (pre*)
+* Denormalised tables
+* Better libtracker support for Maemo platform applications?
 
-Tracker SoC project ideas:
 
+2007 Tracker SoC project ideas:
+
 1. HAL integration into Tracker
 
     * We need to be able to handle files in removable media
Index: NEWS
===================================================================
--- NEWS	(revision 2825)
+++ NEWS	(working copy)
@@ -12,15 +12,18 @@ Tracker 0.6.90
   GLib's GIO usage
   * In-house file monitoring dropped.
   * Addition of unit tests.
-  * TST (GUI search) migrated away from the deprecated gnome-vfs2
+  * TST (GUI search) migrated away from the deprecated gnome-vfs2.
 
   Miscellaneous
-  * Added support for indexing removable media.
-  * Added support for the mobile email client, Modest. This adds to Evolution,
-    Thunderbird, and KMail, among supported clients.
+  * Added support for indexing removable media (MMC, USB sticks).
   * Added support for OR search operations.
   * Initial xesam support.
   * New functionality to estimate remaining indexing time period.
+  * NB (index merging has been removed in this release due to lack of
+    time re-implementing it after code refactoring; SQLite FTS, which
+    has the feature internally, will be used in future releases).
+  * support for metadata caching on removable devices
+    (see http://live.gnome.org/MetadataOnRemovableDevices)
 
 
 Tracker 0.6.6