4 files changed, 19 insertions, 126 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index bbaa6f4ec..aac2a912a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-04  Werner Koch  <[email protected]>
+
+	* gpgv.texi: New.
+	* tools.texi: Include new file.
+
 2006-12-02  David Shaw  <[email protected]>
 
 	* gpg.texi (GPG Esoteric Options): Document --passphrase-repeat.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ab8543b70..c93df6fad 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST = DETAILS HACKING TRANSLATE OpenPGP KEYSERVER samplekeys.asc \
              gnupg-card-architecture.pdf \
              faq.raw FAQ faq.html gnupg7.texi \
              opt-homedir.texi see-also-note.texi specify-user-id.texi \
-	     texi.css $(examples)
+	     gpgv.texi texi.css $(examples)
 
 BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
                 gnupg-card-architecture.pdf FAQ faq.html
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 524e0cc69..a8e213c95 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1070,6 +1070,9 @@ the filename does not contain a slash, it is assumed to be in the GnuPG
 home directory (@file{~/.gnupg} if @option{--homedir} or $GNUPGHOME is
 not used).
 
+@ifset gpgone
+@anchor{option --homedir}
+@end ifset
 @include opt-homedir.texi
 
 
@@ -1130,6 +1133,9 @@ encoded in the character set as specified by
 @option{--display-charset}. These options affect all following
 arguments. Both options may be used multiple times.
 
+@ifset gpgone
+@anchor{option --options}
+@end ifset
 @item --options @code{file}
 Read options from @code{file} and do not try to read them from the
 default options file in the homedir (see @option{--homedir}). This
@@ -2497,8 +2503,11 @@ name may be changed on the command line (@pxref{option
 @c man:.RE
 Note that on larger installations, it is useful to put predefined files
 into the directory @file{/etc/skel/.gnupg/} so that newly created users
-start up with a working configuration.  For existing users the a small
+start up with a working configuration.
+@ifclear gpgone
+For existing users the a small
 helper script is provided to create these files (@pxref{addgnupghome}).
+@end ifclear
 
 For internal purposes @command{@gpgname} creates and maintaines a few other
 files; They all live in in the current home directory (@pxref{option
@@ -2678,7 +2687,9 @@ as locked memory is allocated.
 @mansect see also
 @ifset isman
 @command{gpgv}(1), 
+@ifclear gpgone
 @command{gpgsm}(1), 
 @command{gpg-agent}(1)
+@end ifclear
 @end ifset
 @include see-also-note.texi
diff --git a/doc/tools.texi b/doc/tools.texi
index dec548905..914a1213f 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -92,130 +92,7 @@ Display a brief help page and exit
 @c
 @c  GPGV
 @c
-@manpage gpgv2.1
-@node gpgv
-@section Verify OpenPGP signatures
-@ifset manverb
-.B gpgv
-\- Verify OpenPGP signatures
-@end ifset
-
-@mansect synopsis
-@ifset manverb
-.B  gpgv2
-.RI [ options ]
-.I signed_files
-@end ifset
-
-@mansect description
-@code{gpgv2} is an OpenPGP signature verification tool.
-
-This program is actually a stripped down version of @code{gpg} which is
-only able to check signatures. It is somewhat smaller than the fully blown
-@code{gpg} and uses a different (and simpler) way to check that
-the public keys used to make the signature are valid. There are
-no configuration files and only a few options are implemented.
-
-@code{gpgv2} assumes that all keys in the keyring are trustworthy.
-By default it uses a keyring named @file{trustedkeys.gpg} which is
-assumed to be in the home directory as defined by GnuPG or set by an
-option or an environment variable. An option may be used to specify
-another keyring or even multiple keyrings.
-
-@noindent
-@mansect options
-@code{gpgv2} recognizes these options:
-
-@table @gnupgtabopt
-
-@item --verbose
-@itemx -v
-@opindex verbose
-Gives more information during processing. If used
-twice, the input data is listed in detail.
-
-@item --quiet
-@itemx -q
-@opindex quiet
-Try to be as quiet as possible.
-
-@item --keyring @var{file}
-@opindex keyring
-Add @var{file} to the list of keyrings.
-If @var{file} begins with a tilde and a slash, these
-are replaced by the HOME directory. If the filename
-does not contain a slash, it is assumed to be in the
-home-directory ("~/.gnupg" if --homedir is not used).
-
-@item --status-fd @var{n}
-@opindex status-fd
-Write special status strings to the file descriptor @var{n}.  See the
-file DETAILS in the documentation for a listing of them.
-
-@item --logger-fd @code{n}
-@opindex logger-fd
-Write log output to file descriptor @code{n} and not to stderr.
-
-@item --ignore-time-conflict
-@opindex ignore-time-conflict
-GnuPG normally checks that the timestamps associated with keys and
-signatures have plausible values. However, sometimes a signature seems to
-be older than the key due to clock problems. This option turns these
-checks into warnings.
-
-@include opt-homedir.texi
-
-@end table
-
-@mansect return value
-
-The program returns 0 if everything was fine, 1 if at least
-one signature was bad, and other error codes for fatal errors.
-
-@mansect examples
-@subsection Examples
-
-@table @asis
-
-@item gpgv2 @code{pgpfile}
-@itemx gpgv2 @code{sigfile} 
-Verify the signature of the file. The second form
-is used for detached signatures, where @code{sigfile} is the detached
-signature (either ASCII armored or binary) and are the signed
-data; if this is not given the name of the file holding the signed data is
-constructed by cutting off the extension (".asc", ".sig" or ".sign") from
-@code{sigfile}.
-
-@end table
-
-@mansect environment
-@subsection Environment
-
-@table @asis
-
-@item HOME
-Used to locate the default home directory.
-
-@item GNUPGHOME
-If set directory used instead of "~/.gnupg".
-
-@end table
-
-@mansect files
-@subsection FILES
-
-@table @asis
-
-@item ~/.gnupg/trustedkeys.gpg
-The default keyring with the allowed keys
-
-@end table
-
-@mansect see also
-@command{gpg2}(1)
-@include see-also-note.texi
-
-
+@include gpgv.texi
 
 
 @c