1.10.2

packaging/debian/changelog

@@ -1,3 +1,11 @@
+recoll (1.10.2-0ubuntu1) dapper; urgency=low
+  * Updated package to recoll version 1.10.2
+ -- Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr>  Mar,  27 May 2008 11:30:01 +0100
+
+recoll (1.10.1-0ubuntu1) gutsy; urgency=low
+  * Updated package to recoll version 1.10.1
+ -- Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr>  Fri,  01 Feb 2008 11:30:01 +0100
+
 recoll (1.10.0-0ubuntu1) gutsy; urgency=low
   * Updated package to recoll version 1.10.0
  -- Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr>  Wed,  11 Nov 2007 15:34:51 +0200

packaging/rpm/recoll.spec

@@ -1,5 +1,5 @@
 %define name recoll
-%define version 1.10.0
+%define version 1.10.2
 %define release 0
 
 Name:           %{name}
@@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 # ---------------------------------------------------------------------------
 
 %changelog
+* Thu May 27 2008 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.2-1
+- Update to release 1.10.2
+* Thu Jan 31 2008 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.1-1
+- Update to release 1.10.1
 * Wed Nov 21 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.0-1
 - Update to release 1.10.0
 * Tue Sep 11 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.9.0-1

packaging/rpm/recollfedora.spec

@@ -1,12 +1,12 @@
 Name:           recoll
-Version:        1.10.0
+Version:        1.10.2
 Release:        1%{?dist}
 Summary:        Desktop full text search tool with a qt gui
 
 Group:          Applications/Databases
 License:        GPL
 URL:            http://www.recoll.org/
-Source0:        http://www.recoll.org/recoll-1.10.0.tar.gz 
+Source0:        http://www.recoll.org/recoll-1.10.2.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Not sure how easy it is to find a xapian-core rpm. Will be easier to
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 27 2008 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.2-1
+- Update to release 1.10.2
+* Thu Jan 31 2008 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.1-1
+- Update to release 1.10.1
 * Wed Nov 21 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.0-1
 - Update to release 1.10.0
 * Tue Sep 11 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.9.0-1

packaging/rpm/recollmdk.spec

@@ -1,5 +1,5 @@
 %define name recoll
-%define version 1.10.0
+%define version 1.10.2
 %define release  %mkrel 1
 
 Name:           %{name}
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 # ---------------------------------------------------------------------------
 
 %changelog
+* Thu May 27 2008 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.2-1
+- Update to release 1.10.2
+* Thu Jan 31 2008 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.1-1
+- Update to release 1.10.1
 * Wed Nov 21 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.10.0-1
 - Update to release 1.10.0
 * Tue Sep 11 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.9.0-1

src/python/recoll/pyrecoll.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: pyrecoll.cpp,v 1.1 2008-05-09 12:34:17 dockes Exp $ (C) 2007 J.F.Dockes";
+static char rcsid[] = "@(#$Id: pyrecoll.cpp,v 1.2 2008-05-27 10:45:59 dockes Exp $ (C) 2007 J.F.Dockes";
 #endif
 
 #include <Python.h>
@@ -10,7 +10,6 @@ using namespace std;
 
 #include "rclinit.h"
 #include "rclconfig.h"
-#include "idfile.h"
 #include "rcldb.h"
 #include "pathut.h"
 #include "wasastringtoquery.h"
@@ -18,18 +17,6 @@ using namespace std;
 
 static RclConfig *config;
 
-static PyObject *
-recollq_idfile(PyObject *self, PyObject *args)
-{
-    const char *filename;
-
-    if (!PyArg_ParseTuple(args, "s", &filename))
-        return NULL;
-    //    string tp = "Newfule";
-    string tp = idFile(filename);
-    return Py_BuildValue("s", tp.c_str());
-}
-
 static PyObject *
 recollq_question(PyObject *self, PyObject *args)
 {
@@ -81,7 +68,6 @@ recollq_question(PyObject *self, PyObject *args)
 
 
 static PyMethodDef recollqMethods[] = {
-    {"idfile",  recollq_idfile, METH_VARARGS, "Identify file type."},
     {"question",  recollq_question, METH_VARARGS, "Query language query."},
 
     {NULL, NULL, 0, NULL}        /* Sentinel */

src/python/recoll/setup.py

@@ -35,7 +35,6 @@ module1 = Extension('recollq',
                                '../utils/base64.cpp',
                                '../utils/conftree.cpp',
                                '../utils/debuglog.cpp',
-                               '../utils/idfile.cpp',
                                '../utils/readfile.cpp',
                                '../utils/md5.cpp',
                                '../utils/pathut.cpp',

website/BUGS.txt

@@ -1,10 +1,15 @@
-Known bugs in current version and older versions:
+Known bugs in current and older versions:
 
 Bugs that are listed in an older version section are supposedly fixed in
 later versions. Bugs listed in the topmost section may also exist in older
 versions. 
 
-Latest (recoll 1.9.0 + xapian 1.0.2):
+Latest (recoll 1.10.2 + xapian 1.0.x):
+
+- In a preview window, when walking the search term hits with the
+  Previous/Next buttons, 'Previous' actually acts as 'Next' (it does work
+  normally for the local search).
+
 - If the user-chosen result list entry format results in several paragraphs
   (in the qt textedit sense), right clicks will only work inside the first
   one for each entry.
@@ -23,7 +28,7 @@ Latest (recoll 1.9.0 + xapian 1.0.2):
         "api/" directory: 
          http://www.recoll.org/xapian/xapNearDistrib-1.0.patch
         or fetch the already patched source:
-	 http://www.recoll.org/xapian/xapian-core-1.0.2-recollNEARpatch.tar.gz
+	 http://www.recoll.org/xapian/xapian-core-1.0.5-recollNEARpatch.tar.gz
 
         then recompile, and install.
 
@@ -40,10 +45,6 @@ Latest (recoll 1.9.0 + xapian 1.0.2):
   compressed (ie: xxx.txt.gz), recoll will try to start the external viewer
   on the compressed file, which will not work in most cases.
 
-- Problems have been reported indexing big mailstores (several hundreds of
-  thousands of messages): resulting in a very big database and even
-  crashes.
-
 - Under some versions of KDE (ie: Fedora FC5 KDE 3.5.4-0.5.fc5), there is a
   problem with the window stacking order. Opening the "browse" file
   selection dialog from the advanced search dialog will stack the latter
@@ -57,6 +58,33 @@ Latest (recoll 1.9.0 + xapian 1.0.2):
   exception handling (recoll catches an exception while trying the
   yet inexistant db).
 
+1.10.1 + xapian 1.0.x
+
+- The decoding of base-64 data in emails fails in a relatively uncommon but
+  sometimes encountered case.
+- The "Previous" button in the preview window would actually go forward
+  when walking the search terms 
+
+1.10.0
+
+- If a filter fails while trying to extract the data from a file, the file
+  will not be indexed at all (not even the file name). The file
+  name should be indexed in this case. This happens in particular in the
+  very common case where the helper application is not installed (ie:
+  missing Exiftool -> no *.jpg names in the index).
+
+- If several query language "ext:" qualifiers are specified, they will be
+  joined by an AND instead of OR, resulting in no results. Using an
+  explicit OR doesn't work (actually OR + field names is generally
+  broken). In some cases, you can use a "type:" qualifier as a workaround.
+
+
+1.9.x
+- Problems have been reported indexing big mailstores (several hundreds of
+  thousands of messages): resulting in a very big database and even
+  crashes.
+
+
 1.8.2
 - Under ubuntu (at least, maybe debian too), the default awk interpreter
   (mawk) is ancient, and the recoll pdf input filter does not

website/CHANGES.txt

@@ -1,5 +1,40 @@
 CHANGES 
 
+1.10.2
+
+- Fixed openSuse 11 compile issues.
+
+- Fixed bug in interpreting email mime structure, which resulted in base-64
+  decoding errors.
+
+- Fixed "Prev" button in preview window. Would actually go forward when
+  walking the search terms.
+
+- Allow setting the highlight color for search terms in result list and
+  preview (yes: feature change, should have waited for major release...)
+
+- Added svg filter
+
+1.10.1
+
+- Ensure that in case the data of a file can't be indexed because of some
+  error, at least the file name is indexed.
+
+- Improve query language to support OR queries of terms with field
+  specifications (ie: title:someterm OR author:someauthor).
+
+- Fix filename search to split patterns on white space, so that 
+  a "*.jpg *.jpeg" search does what's expected. Means you now need to use
+  double-quotes if there is actual embedded white space.
+
+- Jump directly to the external editor choice dialog instead of opening
+  preferences when an external viewer is not found.
+
+- Allow stopping indexing through menu action (only works with qt4 for now).
+
+- Create an "indexedmimetypes" configuration variable to allow explicitely
+  restricting the file types which do get indexed.
+
 1.10.0
 
 - Added a GUI dialog to configure the indexing parameters.

website/download.html

@@ -56,13 +56,18 @@
       <p><i>For building from source</i>, you will need a xapian-core
 	installation. You will find source and binary packages on  the 
 	<a href="http://www.xapian.org/download.php">Xapian download
-	  page</a>. Recoll 1.10.0 should build with any 0.9.x or 1.0.x
+	  page</a>. Recoll 1.10.2 should build with any 0.9.x or 1.0.x
-	  Xapian version (the current one is 1.0.4).</p>
+	  Xapian version (the current one is 1.0.5).</p>
 
       <p>You need Qt 3.3 (or qt 4) in all cases. Recoll will
 	automatically be configured to build with qt4 if the version
 	of qmake found in $QTDIR/bin:$PATH is for qt4.</p>
 
+      <p>QT 4.4 note (2008-05-23): there seems to be a few problems in
+	Qt 4.4.0 (maybe in the qt3 compatibility layer), resulting in
+	problems in displaying the Recoll result list. I suggest
+	avoiding qt 4.4 with Recoll for now (qt 4.3 works fine).</p>
+
       <p>Recoll relies on external packages for some
 	of its functionality (ie: for many of the non-text file
 	types). These are not listed as strict dependencies, because
@@ -109,8 +114,8 @@
 
       <p>New and updated filters are sometimes 
 	<a href="filters/filters.html">available</a> before the next
-	Recoll release. All filters are currently up to date in
+	Recoll release. There are no updated filters for Recoll
-	1.10.0. You can check the page if you are running an older
+	1.10.2, but you may find some if you are running an older
 	release.</p>
 
 
@@ -118,11 +123,11 @@
 
       <p><b>Current version:</b> 
 
-	<p>1.10.0: <a href="recoll-1.10.0.tar.gz">recoll-1.10.0.tar.gz</a>
+	<p>1.10.2: <a href="recoll-1.10.2.tar.gz">recoll-1.10.2.tar.gz</a>
 	  See the <a href="BUGS.txt">known bugs and issues</a> and 
 	  <a href="CHANGES.txt">changes</a>.</p>
 
-      <p>Recoll 1.10.0 will work with Xapian versions 0.9.x or 1.0.x but
+      <p>Recoll 1.10 will work with Xapian versions 0.9.x or 1.0.x but
 	1.0 is preferred. In order to take advantage of the new index
 	format in Xapian 1.0, Recoll users updating from 1.8 or older,
 	or who have skipped this step for 1.9 need to delete their old index. 
@@ -139,22 +144,31 @@
 	the <a href="CHANGES.txt">changes</a> list.</p>
 
       <p>Older recoll releases:
+	<a href="recoll-1.10.1.tar.gz">1.10.1</a>.
+	<a href="recoll-1.10.0.tar.gz">1.10.0</a>.
 	<a href="recoll-1.9.0.tar.gz">1.9.0</a>.
-	<a href="recoll-1.8.2.tar.gz">1.8.2</a>.
+	<a href="older/recoll-1.8.2.tar.gz">1.8.2</a>.
-	<a href="recoll-1.7.6.tar.gz">1.7.6</a>.
+	<a href="older/recoll-1.7.6.tar.gz">1.7.6</a>.
-	<a href="recoll-1.6.3.tar.gz">1.6.3</a>.
+	<a href="older/recoll-1.6.3.tar.gz">1.6.3</a>.
-	<a href="recoll-1.5.11.tar.gz">1.5.11</a>. 
+	<a href="older/recoll-1.5.11.tar.gz">1.5.11</a>. 
-	<a href="recoll-1.4.3.tar.gz">1.4.3</a>. 
+	<a href="older/recoll-1.4.3.tar.gz">1.4.3</a>. 
-	<a href="recoll-1.3.3.tar.gz">1.3.3</a>.
+	<a href="older/recoll-1.3.3.tar.gz">1.3.3</a>.
-	<a href="recoll-1.2.3.tar.gz">1.2.3</a>.
+	<a href="older/recoll-1.2.3.tar.gz">1.2.3</a>.
-	<a href="recoll-1.1.0.tar.gz">1.1.0</a>.
+	<a href="older/recoll-1.1.0.tar.gz">1.1.0</a>.
-	<a href="recoll-1.0.16.tar.gz">1.0.16</a>.
+	<a href="older/recoll-1.0.16.tar.gz">1.0.16</a>.
       </p>
 
+      <p>A separate source file contains a KDE kicker applet to start
+	a Recoll search from the KDE toolbar: 
+	<a href="recoll_applet-1.10.0.tgz">recoll_applet-1.10.0.tgz</a>.
+	This is a very slightly modified version of the 
+	<a href="http://demandiseineseite.gmxhome.de/find/">
+	  find_applet.</a></p>
+
       <h2><a name="rpms">Packages</a></h2>
 
       <p>The executables inside the binary rpms have a static link to
-	xapian 1.0.4, there is no real dependency except Qt 3.3. 
+	xapian 1.0.4/5, there is no real dependency except Qt 3.3. 
 	The Fedora and Mandriva packages unfortunately think that they
 	depend on exiftool (which is needed by the little
 	used jpeg info filter), due to excessive rpmbuild
@@ -165,47 +179,40 @@
 
       <p><b>Fedora Core</b>
 	FC6 RPM: 
-	<a href="fc6/recoll-1.10.0-1.i386.rpm">
+	<a href="fc6/recoll-1.10.2-1.i386.rpm">
-	  fc6/recoll-1.10.0-1.i386.rpm</a>. 
+	  fc6/recoll-1.10.2-1.i386.rpm</a>. 
 	Source: 
-	<a href="fc6/recoll-1.10.0-1.src.rpm">
+	<a href="fc6/recoll-1.10.2-1.src.rpm">
-	  recoll-1.10.0-1.src.rpm</a>
+	  recoll-1.10.2-1.src.rpm</a>
       </p>
 
       <p><b>Mandriva 2006</b>  (also works on 2005 and 2007). 
 	RPM: 
-	<a href="mandriva2006/recoll-1.10.0-0.1.20060mdk.i586.rpm">
+	<a href="mandriva2006/recoll-1.10.2-0.1.20060mdk.i586.rpm">
-	  recoll-1.10.0-0.1.20060mdk.i586.rpm</a>. 
+	  recoll-1.10.2-0.1.20060mdk.i586.rpm</a>. 
 	Source: 
-	<a href="mandriva2006/recoll-1.10.0-0.1.20060mdk.src.rpm">
+	<a href="mandriva2006/recoll-1.10.2-0.1.20060mdk.src.rpm">
-	  recoll-1.10.0-0.1.20060mdk.src.rpm</a>
+	  recoll-1.10.2-0.1.20060mdk.src.rpm</a>
       </p>
 
-      <p><b>Suse 10.2</b> 
+      <p><b>Suse 10.3</b> 
 	RPM: 
-	<a href="suse10.2/recoll-1.10.0-0.i586.rpm">
+	<a href="suse10.3/recoll-1.10.2-0.i586.rpm">
-	  recoll-1.10.0-0.i586.rpm</a>. 
+	  recoll-1.10.2-0.i586.rpm</a>. 
 	Source: 
-	<a href="suse10.2/recoll-1.10.0-0.src.rpm">
+	<a href="suse10.3/recoll-1.10.2-0.src.rpm">
-	  recoll-1.10.0-0.src.rpm</a>
+	  recoll-1.10.2-0.src.rpm</a>
       </p>
 
-      <p><b>Ubuntu 6.06 dapper</b>
+      <p><b>Ubuntu 6.06 dapper / edgy / gutsy / hardy</b>
-	This has a static link on xapian 1.0.4:
+	This has a static link on xapian 1.0.5:
-	<a href="debian/dapper/recoll_1.10.0-0ubuntu1_i386.deb">
+	<a href="debian/dapper/recoll_1.10.2-0ubuntu1_i386.deb">
-	  recoll_1.10.0-0ubuntu1_i386.deb</a> 
+	  recoll_1.10.2-0ubuntu1_i386.deb</a> 
-	<a href="debian/edgy/">debian/dapper</a>. This package
+	<a href="debian/dapper/">debian/dapper</a>. This package was
-	appears to also work correctly on later Ubuntu releases, so I
+	built on "dapper" and appears to work correctly on later
-	skipped building specific packages for edgy or gutsy this
+	Ubuntu releases, so I skipped building specific packages for
-	time. Please contact me if this is a problem.</p>
+	them this time. Please contact me if this is a
-
+	problem.</p>
-<!--      <p><b>Ubuntu 6.10 edgy</b> 
-	binary package (also works fine on <b>Ubuntu 7.04 feisty</b>):
-	<a href="debian/edgy/recoll_1.9.0-0ubuntu1_i386.deb">
-	  recoll_1.9.0-0ubuntu1_i386.deb</a>. 
-	Source package directory:
-	<a href="debian/edgy/">debian/edgy</a>
-      </p> -->
 
       <p><b>Debian unstable</b> Recoll is in the package repository,
 	you can install it with the usual <em>apt-get install recoll</em>. 
@@ -224,7 +231,7 @@
       <h2><a name="otherbinary">Binary bundles</a></h2>
 
       <p>These are just prebuilt trees (without the source files).
-	The executables were built with xapian 1.0.4 (patched for the
+	The executables were built with xapian 1.0.5 (patched for the
 	NEAR bug) and libiconv 1.9.2 (where relevant) as static
 	libraries. They depend on qt 3.3. For Solaris, you should be
 	able to find a qt package 
@@ -233,17 +240,17 @@
       <p>The installation instructions are <a
         href="usermanual/rcl.install.binary.html"> there</a>.</p>
 
-      <p><span class="application">FreeBSD</span> 6.2 i386: 
+      <p><span class="application">FreeBSD</span> 6.3 i386: 
-	<a href="recoll-1.10.0-FreeBSD-6.2-STABLE.tgz">
+	<a href="freebsd/recoll-1.10.2-FreeBSD-6.3-STABLE.tgz">
-	  recoll-1.10.0-FreeBSD-6.2-STABLE.tgz</a>
+	  recoll-1.10.2-FreeBSD-6.3-STABLE.tgz</a>
       </p>
 
       <p><span class="application">Solaris 8</span> sparc. 
       Note to Solaris users: you need to perform the initial
       indexing pass with "recollindex", not the recoll GUI indexing
       thread. See <a href="BUGS.txt">errata</a>.
-      <a href="recoll-1.10.0-SunOS-5.8.tgz">
+      <a href="sunos/recoll-1.10.2-SunOS-5.8.tgz">
-        recoll-1.10.0-SunOS-5.8.tgz</a>.
+        recoll-1.10.2-SunOS-5.8.tgz</a>.
 
       <p>Recoll also builds and runs on Solaris 10, but, given the
 	situation of open source packages for Solaris (very old qt on
@@ -292,9 +299,6 @@
 	<a href="http://cvsweb.freebsd.org/ports/deskutils/recoll">
 	  recoll port</a>.</p>
 
-      <p>Local copies of ports
-      for <a href="port-recoll-1.10.0.tgz">recoll 1.10 port directory</a>.</p>
-
       <h2><a name="translations">Translations</a></h2>
 
       <p>Some of the translations for 1.10 are incomplete. The source
@@ -318,7 +322,10 @@
       <h3>Updated 1.10 translations that became available after the
 	release:</h3>
 
-      <p>None for now.</p>
+      <p>German. 
+	<a href="translations/recoll_de.ts">recoll_de.ts</a>
+	<a href="translations/recoll_de.qm">recoll_de.qm</a>
+	</p> 
 <!--
       <p><b>Italian</b>. Thanks to Mario, Christian and Giovanni for this.
 	<a href="translations/recoll_it.ts">recoll_it.ts</a>
@@ -329,10 +336,6 @@
 	<a href="translations/recoll_tr.qm">recoll_tr.qm</a>
 	</p> 
 
-      <p>German. 
-	<a href="translations/recoll_de.ts">recoll_de.ts</a>
-	<a href="translations/recoll_de.qm">recoll_de.qm</a>
-	</p> 
 -->
 
     </div>

website/features.html

@@ -102,7 +102,7 @@
                 "http://www.winfield.demon.nl/">antiword</a>.</li>
                 <li><span class="literal">Powerpoint</span> and 
 		  <span class="literal">Excel</span> with the
-		  <a href="http://www.45.free.net/~vitus/software/catdoc/">
+		  <a href="http://catdoc.klik.atekon.de">
 		    catdoc</a> utilities.</li>
 
                 <li><span class="literal">rtf</span> with <a href=

website/index.html.en

@@ -47,18 +47,7 @@
 
       <p><span class="application">Recoll</span> is free, open source,
 	and licensed under the GPL. The current version is
-	<a class="important" href="download.html">1.10.0</a></p>
+	<a class="important" href="download.html">1.10.2</a></p>
-      <p>We borrow a lot of code
-	from other packages, and welcome code and ideas from
-	contributors, see the <a class="important"
-	  href="credits.html">Credits</a>.</p>
-
-      <blockquote>
-      <p><b><i>Recoll user ?</i></b> Maybe there are still a few useful
-	  tricks that you don't know about. A quick look at
-	the <a href="usermanual/rcl.search.tips.html">search
-	tips</a> might prove useful !</p>
-      </blockquote>
 
       <h2>Features: </h2>
 
@@ -81,22 +70,53 @@
 	<li><a class="weak" href="features.html">(more detail)</a></li>
       </ul>
 
+      <p><b><i>Recoll user ?</i></b> Maybe there are still a few useful
+	  tricks that you don't know about. A quick look at
+	the <a href="usermanual/rcl.search.tips.html">search
+	tips</a> might prove useful !</p>
+
 
       <h2>News: </h2>
       <ul>
-      <li>2007-11-21 Recoll 1.10.0 is out :) </li>
+	<li>2008-05-27 : 1.10.2 is out. It fixes a few minor bugs.</li>
+	<li>2008-05-22 : we now have a mailing list:
+	  <ul>
+	    <li><a href="http://www.freelists.org/list/recoll-user">
+		Subscription management</a></li>
+	    <li><a href="http://www.freelists.org/archives/recoll-user">
+		Archives </a></li>
+	  </ul>
+	</li>
+      </ul>
 	
       <h2><a name="support">Support</a></h3>
 
-      <p>If you have any problem with Recoll, its
+      <p>If you have any problem with Recoll, or a suggestion for
-	installation, or an idea for improvement, <em>please</em> <a href=
+  	improvement, <em>please</em> provide feedback, preferably on the 
-	  "mailto:jean-francois.dockes@wanadoo.fr">provide
+	recoll-user mailing list, or directly to 
-	  feedback</a>. You can also have a look at
+	<a href="mailto:jean-francois.dockes@wanadoo.fr">me</a>.</p>
-	  the <a href="devel.html">development</a> page for things you
+
-	  could do.</p>  
+      <p>Mailing list information:
+	<ul>
+	  <li><a href="http://www.freelists.org/list/recoll-user">
+	      Subscription management</a></li>
+	  <li><a href="http://www.freelists.org/archives/recoll-user">
+	      Archives </a></li>
+	</ul>
+      </p>
+
+      <p>You can also have a look at
+	the <a href="devel.html">development</a> page for things you
+	could do.</p>  
 
       <p>The list of known bugs is <a href="BUGS.txt">here</a></p>
 
+      <h2>Thanks</h2>
+      <p>We borrow a lot of code
+	from other packages, and welcome code and ideas from
+	contributors, see the 
+	<a class="important" href="credits.html">Credits</a>.</p>
+
     </div>
   </body>
 </html>

website/index.html.fr

@@ -38,7 +38,7 @@
     <div class="content">
 
       <h1><a href="http://www.recoll.org/">Recoll</a> est 
-      un outil personnel de recherche textuelle pour Unix et Linux</h1>
+	un outil personnel de recherche textuelle pour Unix et Linux</h1>
 
       <p>Il est basé sur le puissant moteur d'indexation <a href=
 	  "http://www.xapian.org">Xapian</a>, pour lequel il offre une
@@ -46,29 +46,18 @@
 	  mettre en oeuvre.</p>
 
       <p><span class="application">Recoll</span> est un logiciel libre
-      gratuit, dont le code source est disponible sous licence GPL. 
+	gratuit, dont le code source est disponible sous licence GPL. 
-      La dernière version est 
+	La dernière version est 
-      <a class="important" href="download.html">1.10.0</a></p>
+	<a class="important" href="download.html">1.10.1</a></p>
 
-      <p><span class="application">Recoll</span> emprunte beaucoup de code
+      <p>L'interface utilisateur de 
-	d'autres logiciels libres, et accueille volontiers les
+	<span class="application">Recoll</span> est traduite en
-	contributions en code ou en suggestions, voir la page des 
+	Français, mais pas encore la documentation, malheureusement,
-	<a class="important" href="credits.html">Attributions</a>.</p>
+	et la plupart des liens de cette page pointent sur des textes
+	en Anglais.</p>
 
-      <p>L'interface utilisateur de <span
-      class="application">Recoll</span> est traduite en Français, mais
-      pas encore la documentation, malheureusement, et la plupart des
-      liens de cette page pointent sur des textes en Anglais.</p>
 
-      <blockquote>
+      <h2>Caractéristiques: </h2>
-      <p><b><i>Déjà utilisateur ?</i></b> Il est possible qu'il 
-	  y ait encore quelques astuces qui vous aient échappées. Un coup
-	  d'oeil rapide sur la page des 
-	  <a href="usermanual/rcl.search.tips.html">petites recettes
-	de recherche</a> pourrait s'avérer fructueux !</p>
-      </blockquote>
-
-      <h2>Caractéristiques: </h1>
 
       <ul>
         <li>Installation facile, peu de dépendances. Pas besoin de
@@ -94,13 +83,20 @@
 
 	<li><a class="weak" href="fr/features.html">
 	    (plus de détails)</a></li>
+      </ul>
+      
+      <p><b><i>Déjà utilisateur ?</i></b> Il est possible qu'il 
+	y ait encore quelques astuces qui vous aient échappées. Un coup
+	d'oeil rapide sur la page des 
+	<a href="usermanual/rcl.search.tips.html">petites recettes
+	  de recherche</a> pourrait s'avérer fructueux !</p>
 
+      <h2>Nouvelles: </h2>
+      <ul>
+	<li>2007-01-29 Recoll 1.10.1 est sorti.</li>
       </ul>
 
-      <h2>Nouvelles: </h1>
+      <h2><a name="support">Support</a></h2>
-      <p>2007-11-21 Recoll 1.10.0 est sorti.</p>
-
-      <h2><a name="support">Support</a></h3>
 
       <p>Si vous avez un problème quelconque avec le logiciel ou son
       installation, ou une idée de fonctions à ajouter, merci de me
@@ -112,6 +108,13 @@
       <p><a href="BUGS.txt">Liste des probl&egrave;mes connus</a> (en
       anglais). </p>
 
+      <h2>Remerciements</h2>
+      <p><span class="application">Recoll</span> emprunte beaucoup de code
+	d'autres logiciels libres, et accueille volontiers les
+	contributions en code ou en suggestions, voir la page des 
+	<a class="important" href="credits.html">Attributions</a>.</p>
+
+
     </div>
   </body>
 </html>

website/styles/style.css

@@ -3,10 +3,10 @@ html {
     margin 0;
 }
 body {
-    position: relative;
+       position: relative;
-    margin: 0;
+       color: black; 
-    color: black; 
+       font-family: Verdana, Helvetica, Arial, sans-serif;
-    font-family: Verdana, Helvetica, Arial, sans-serif;
+       margin: 1em;
 }
 
 a img {
@@ -33,7 +33,7 @@ div.rightlinks {
 /*-Main content area-------------------------*/
 .content {
     margin-top: 2em;
-    margin-left: 25px;
+    margin-left: 2em;
     margin-right: 145px;
 }
 
@@ -46,6 +46,7 @@ div.rightlinks {
 }
 
 h1, h2, h3, h4, h5, h6 {
+    margin-left: -1em;
     color: #222299;
 }