13 files changed, 635 insertions, 105 deletions

diff --git a/ChangeLog b/ChangeLog
index e7f1637..02cbe9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2013-05-08  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+        Rename testgdbm to gdbmtool. Improve documentation.
+        
+        * configure.ac: Fix a typo.
+        * src/.cvsignore: Add gdbmtool
+        * src/Makefile.am: Rename testgdbm to gdbmtool. Source
+        file not renamed because of CVS deficiency.
+        * src/gdbm_dump.c: Enable NLS.
+        * src/gdbm_load.c: Likewise.
+        * src/testgdbm.c: New option -q (--quiet).
+        New command: prompt.
+        * doc/Makefile.am (man_MANS): Add new manpages.
+        * doc/gdbmtool.1: New file.
+        * doc/gdbm_load.1: New file.
+        * doc/gdbm_dump.1: New file.
+        * doc/gdbm.3: Update.
+        * doc/gdbm.texinfo: Update.
+
+2013-05-08  Sergey Poznyakoff  <gray@gnu.org.ua>
+
         * configure.ac: (AC_INIT): Add webpage URL.
 
 2013-05-08  Sergey Poznyakoff  <gray@gnu.org.ua>
diff --git a/configure.ac b/configure.ac
index e43bc53..ce00344 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_INIT([gdbm],
         _GDBM_VERSION_MAJOR._GDBM_VERSION_MINOR[]m4_ifdef([_GDBM_VERSION_PATCH],._GDBM_VERSION_PATCH),
         [bug-gdbm@gnu.org],,
         [http://www.gnu.org/software/gdbm])
-AC_PREREQ(2.69)a
+AC_PREREQ(2.69)
 AC_CONFIG_SRCDIR([src/gdbmdefs.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([autoconf.h])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f4059d0..223c892 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,7 @@ info_TEXINFOS = gdbm.texinfo
 gdbm_TEXINFOS=\
   fdl.texi
 
-man_MANS   = gdbm.3
+man_MANS   = gdbm.3 gdbm_dump.1 gdbm_load.1 gdbmtool.1
 EXTRA_DIST = $(man_MANS)
 
 GENDOCS=gendocs.sh 
diff --git a/doc/gdbm.3 b/doc/gdbm.3
index e3b90d4..c08ece3 100644
--- a/doc/gdbm.3
+++ b/doc/gdbm.3
@@ -1,5 +1,5 @@
 .\" This file is part of GDBM.
-.\" Copyright (C) 2011 Free Software Foundation, Inc.
+.\" Copyright (C) 2011, 2013 Free Software Foundation, Inc.
 .\"
 .\" GDBM is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -13,11 +13,10 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with GDBM. If not, see <http://www.gnu.org/licenses/>. */
-.TH GDBM 3 "August 9, 2011" "GDBM" "GDBM User Reference"
-.ds ve 1.9
+.TH GDBM 3 "May 8, 2013" "GDBM" "GDBM User Reference"
 .SH NAME
-GDBM - The GNU database manager.  Includes \fBdbm\fR and \fBndbm\fR
-compatability. (Version \*(ve.)
+GDBM \- The GNU database manager.  Includes \fBdbm\fR and \fBndbm\fR
+compatibility.
 .SH SYNOPSIS
 .nf
 .B #include <gdbm.h>
@@ -200,7 +199,7 @@ Insert only, generate an error if key exists;
 .B GDBM_REPLACE
 Replace contents if key exists.
 .PP
-If a reader calls \fBgdbm_store\fR, the return value will be  -1.
+If a reader calls \fBgdbm_store\fR, the return value will be  \-1.
 If called with \fBGDBM_INSERT\fR and \fIkey\fR is in the database, the return
 value will be 1.  Otherwise, the return value is 0.
 
@@ -245,7 +244,7 @@ To remove some data from the database:
 \fIDbf\fR is the pointer returned by \fBgdbm_open\fR.  \fIKey\fR is the
 key data.
 
-The return value is -1 if the item is not present or the requester is a reader.
+The return value is \-1 if the item is not present or the requester is a reader.
 The return value is 0 if there was a successful delete.
 
 The next two routines allow for accessing all items in the database.  This 
@@ -353,7 +352,7 @@ especially if used in conjunction with \fBGDBM_CENTFREE\fR. \fIvalue\fR
 .PP
 \fIvalue\fR is the value to set \fIoption\fR to, specified as an integer
 pointer.  \fIsize\fR is the size of the data pointed to by \fIvalue\fR.
-The return value will be -1 upon failure, or 0 upon success.  The global
+The return value will be \-1 upon failure, or 0 upon success.  The global
 variable \fIgdbm_errno\fR will be set upon failure.
 
 For instance, to set a database to use a cache of 10, after opening it
@@ -399,12 +398,12 @@ also try to open it as a reader.  All returned pointers in datum
 structures point to data that \fBgdbm\fR WILL free.  They should be
 treated as static pointers (as standard UNIX \fBdbm\fR does).
 .SH LINKING
-This library is accessed by specifying \fI-lgdbm\fR as the last
+This library is accessed by specifying \fI\-lgdbm\fR as the last
 parameter to the compile line, e.g.:
 .sp
 .nf
 .in +5
-gcc -o prog prog.c -lgdbm
+gcc \-o prog prog.c \-lgdbm
 .in
 .fi
 .PP
@@ -413,16 +412,18 @@ you must link in the \fIgdbm_compat\fR library as well.  For example:
 .sp
 .nf
 .in +5
-gcc -o prog proc.c -lgdbm -lgdbm_compat
+gcc \-o prog proc.c \-lgdbm \-lgdbm_compat
 .in
 .fi
 .\" .SH BUGS
 
 .SH "BUG REPORTS"
-Send bug reports to <bug-gdbm@gnu.org>.
+Send bug reports to <bug\-gdbm@gnu.org>.
 .SH "SEE ALSO"
-dbm, ndbm
-.SH AUTHOR
+.BR gdbm_dump (1),
+.BR gdbm_load (1),
+.BR gdbmtool (1).
+.SH AUTHORS
 by Philip A. Nelson, Jason Downs and Sergey Poznyakoff.
 .SH COPYRIGHT
 Copyright \(co 1990 - 2011 Free Software Foundation, Inc.
diff --git a/doc/gdbm.texinfo b/doc/gdbm.texinfo
index 9f0af5b..17f47f9 100644
--- a/doc/gdbm.texinfo
+++ b/doc/gdbm.texinfo
@@ -118,7 +118,7 @@ Functions:
 
 Programs
 
-* testgdbm::                   Test and modify a GDBM database.
+* gdbmtool::                   Examine and modify a GDBM database.
 * gdbm_dump::                  Dump the database into a flat file.          
 * gdbm_load::                  Load the database from a flat file.
 * gdbmexport::                 Export a database into a portable format.  
@@ -1617,35 +1617,35 @@ memory managed by the compatibility library.  The application should
 never free it.
 @end deftypefn
 
-@node testgdbm
-@chapter Test and modify a GDBM database.
-@prindex testgdbm
+@node gdbmtool
+@chapter Examine and modify a GDBM database.
+@prindex gdbmtool
 
-The @command{testgdbm} utility allows you to view and modify an
+The @command{gdbmtool} utility allows you to view and modify an
 existing @acronym{GDBM} database or to create a new one.
 
-@cindex default database, @command{testgdbm} 
+@cindex default database, @command{gdbmtool} 
 @flindex junk.gdbm
 When invoked without arguments, it tries to open a database file called
 @file{junk.gdbm}, located in the current working directory.  You can
 change this default by supplying the name of the database to use as
-the only argument to @command{testgdbm}, e.g.:
+the only argument to @command{gdbmtool}, e.g.:
 
 @example
-$ testgdbm file.db
+$ gdbmtool file.db
 @end example
 
-@cindex read-only mode, @command{testgdbm}
-@cindex @option{-r}, @command{testgdbm} option
-@cindex @option{--read-only}, @command{testgdbm} option
+@cindex read-only mode, @command{gdbmtool}
+@cindex @option{-r}, @command{gdbmtool} option
+@cindex @option{--read-only}, @command{gdbmtool} option
 The database will be opened in read-write mode, unless the
 @option{-r} (@option{--read-only}) option is specified, in which case
 it will be opened only for reading.
 
-@cindex creating a database, @command{testgdbm}
-@cindex @option{-n}, @command{testgdbm} option
-@cindex @option{--newdb}, @command{testgdbm} option
-If the database does not exist, @command{testgdbm} will create it.
+@cindex creating a database, @command{gdbmtool}
+@cindex @option{-n}, @command{gdbmtool} option
+@cindex @option{--newdb}, @command{gdbmtool} option
+If the database does not exist, @command{gdbmtool} will create it.