aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS8
-rw-r--r--configure.boot2
-rw-r--r--doc/dico.texi21
-rw-r--r--doc/dicod.8in12
4 files changed, 33 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index acca62f..09eceea 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ See the end of file for copying conditions.
Please send Dico bug reports to <bug-dico@gnu.org.ua>
-Version 2.6.95 (git)
+Version 2.7, 2018-09-25
* Support for virtual databases
@@ -34,8 +34,8 @@ 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
+option was introduced. Argument to this option is the base name of the
+shared libWN library, without suffix. Optionally, the "lib" prefix
is allowed. For example, to configure on Debian:
./configure --with-libWN=wordnet
@@ -52,6 +52,8 @@ request returns article in unsupported content type.
The code has been thorougly revisited to ensure correct handling of
databases in dictd database format. Testsuite is included.
+* Default m4 quoting characters changed to [ ]
+
Version 2.6, 2018-08-27
diff --git a/configure.boot b/configure.boot
index f6e704c..3bb6b5b 100644
--- a/configure.boot
+++ b/configure.boot
@@ -28,7 +28,7 @@ dnl Process this file with -*- autoconf -*- to produce a configure script.
# along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.63)
-AC_INIT([GNU dico], 2.6.95, [bug-dico@gnu.org])
+AC_INIT([GNU dico], 2.7, [bug-dico@gnu.org])
AC_CONFIG_SRCDIR([dicod/main.c])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/doc/dico.texi b/doc/dico.texi
index 31edfcc..a1d92fb 100644
--- a/doc/dico.texi
+++ b/doc/dico.texi
@@ -2429,8 +2429,8 @@ unless they authenticate themselves.
@cindex virtual databases
@cindex database, virtual
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.
+When a search is performed on a virtual database, it returns matches
+from the constituent databases.
Virtual databases can be used for grouping. For example a virtual
database may include all dictionaries translating from English to
@@ -2521,6 +2521,23 @@ database @{
@end group
@end example
+To determine description (whether short or long) for a virtual
+database, the following algorithm is used. If the @samp{description}
+(or, for long description, @samp{info}) statement is present in the
+@samp{database} block, its value is used. Otherwise, the server obtains
+descriptions of each member database that is visible in the current
+@samp{OPTION MIME} state. If all databases return the same value, it
+is used. Otherwise, empty string is used.
+
+Practically, that means that when defining a collection virtual
+database (as in the first example above), you are better off supplying
+both @samp{description} and @samp{info} statements.
+
+On the other hand, when defining a mime-switching virtual database
+with two members (as in the second example), you can safely omit both
+statements: @command{dicod} will pick the value from the currently
+active member database.
+
@node Strategies and Default Searches
@subsection Strategies and Default Searches
@cindex default searches
diff --git a/doc/dicod.8in b/doc/dicod.8in
index 7276917..72ed6b9 100644
--- a/doc/dicod.8in
+++ b/doc/dicod.8in
@@ -14,7 +14,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
.so config.man
-.TH DICOD 8 "August 20, 2018" "GNU DICO" "GNU Dico Reference"
+.TH DICOD 8 "September 25, 2018" "GNU DICO" "GNU Dico Reference"
.SH NAME
dicod \- GNU dictionary server
.SH SYNOPSIS
@@ -249,14 +249,18 @@ file. This can be used to provide macros and constants for the
configuration.
.PP
The default
-.B pp\-setup file renames all
+.B pp\-setup
+file changes the quote characters to
+.BR [ " and " ] ,
+and renames all
.B m4
built-in macros so they start with the prefix
.BR m4_ .
-This is similar to
+The latterr has the effect similar to that of
.B GNU m4 \-\-prefix\-builtin
option, but has an advantage that it works with other
-.B m4 implementations as well.
+.B m4
+implementations as well.
.PP
Additional definitions can also be provided from the command line
using the \fB\-D\fR (\fB\-\-define\fR) option.

Return to:

Send suggestions and report system problems to the System administrator.