Update docs

2 files changed, 29 insertions, 24 deletions

diff --git a/NEWS b/NEWS
index 6399421..acca62f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU Dico NEWS -- history of user-visible changes. 2018-09-19
+GNU Dico NEWS -- history of user-visible changes. 2018-09-25
 Copyright (C) 2008-2010, 2012-2018 Sergey Poznyakoff
 See the end of file for copying conditions.
 
@@ -8,10 +8,10 @@ Version 2.6.95 (git)
 
 * Support for virtual databases
 
-Virtual databases include one or more of the regular databases defined
-in the dicod configuration. They can be used to group databases by
-languages, or to select the format of the DEFINE responses depending
-on whether OPTION MIME has been requested.
+Virtual database is a collection of regular databases defined
+in the dicod configuration. Virtual databases can be used to group
+databases by languages, or to select the format of the DEFINE
+responses depending on whether OPTION MIME has been requested.
 
 Example of defining a virtual database:
 
@@ -29,26 +29,29 @@ detailed discussion.
 
 * Support for building with WordNet on Debian-based systems
 
-Debian-based systems provide a package "wordnet-dev", which contains
-a properly built shared wordnet library.  However, this library is named
-"libwordnet.so", instead of the expected "libWN.so".  Due to this
-change, configure was unable to locate the library and wordnet module
-was not build.  To fix this. use the --with-libWN option, e.g.:
+Debian-based systems provide a package "wordnet-dev", which installs
+a shared wordnet library. However, this library is named "libwordnet.so",
+instead of the expected "libWN.so". Due to this change, previous
+versions of dico were unable to locate the library and build the
+wordnet database module. To fix this. the --with-libWN configure
+option was introduced. Argument to this option is the base name of 
+shared libWN library, without the suffix. Optionally, the "lib" prefix
+is allowed. For example, to configure on Debian:
 
   ./configure --with-libWN=wordnet
 
-Argument to this option is the new basename for the libWN library,
-without the suffix. Optionally, the "lib" prefix is allowed,
-
 * Dicoweb: graceful handling of unsupported content types.
 
-The new settings attribute ONERROR allows the administrator to
-configure actions to take on certain types of errors. In particular,
-ONERROR['UNSUPPORTED_CONTENT_TYPE'] defines what to do when a DEFINE
+New setting ONERROR allows the administrator to configure actions to
+take on certain types of errors. In particular,
+ONERROR['UNSUPPORTED_CONTENT_TYPE'] defines what to do when a DEFINE 
 request returns article in unsupported content type.
 
 * The dictorg module improved
 
+The code has been thorougly revisited to ensure correct handling of
+databases in dictd database format. Testsuite is included.
+
 
 Version 2.6, 2018-08-27
 
diff --git a/doc/dico.texi b/doc/dico.texi
index 5ddcc6f..81dbee2 100644
--- a/doc/dico.texi
+++ b/doc/dico.texi
@@ -2428,10 +2428,13 @@ unless they authenticate themselves.
 @subsubsection Virtual Databases
 @cindex virtual databases
 @cindex database, virtual
-A @dfn{virtual database} merges several regular databases into one.
-For example a virtual database may include all dictionaries
-translating from English to Norwegian.  Another one may include 
-thesauri for English.
+A @dfn{virtual database} is a collection of several regular databases.
+When a search is performed on a virtual database, it returns the
+matches from all constituent databases.
+
+Virtual databases can be used for grouping. For example a virtual
+database may include all dictionaries translating from English to
+Norwegian.  Another one may include thesauri for English.
 
 Yet another common use for virtual databases is to select different
 output markup depending on whether @samp{OPTION MIME} was requested by
@@ -2495,14 +2498,13 @@ database @{
   name "thesaurus";
   handler "virtual";
   database thes_plain nomime;
-  database thes_html plain;
+  database thes_html mime;
 @}
 @end group
 @end example
 
-Notice, that in this case member databases should not be visible, as
-they will duplicate the information from the @samp{thesaurus}
-database.  It will make sense to define them as invisible:
+Notice, that in this case it makes sense to define member databases
+as invisible, to avoid duplicate matches. E.g.:
 
 @example
 @group