More man pages. Added include files for 2 common paragraphs.

Author: dd9jn

NEWS

@@ -1,6 +1,13 @@
 Noteworthy changes in version 1.9.23
 -------------------------------------------------
 
+ * man pages for most tools are now build directly from the texinfo
+   source.
+
+ * The gpg code from 1.4.5 has been fully merged into this release.
+   The configure option --enable-gpg is still required to build this
+   gpg part.  For production use of OpenPGP the gpg version 1.4.5 is
+   still recommended.
 
 
 Noteworthy changes in version 1.9.22 (2006-07-27)

README

@@ -55,11 +55,12 @@ that this package won't conflict with a GnuPG 1.2 or 1.3
 installation. gpg2 behaves just like gpg; it is however suggested to
 keep using gpg 1.2.x or 1.3.x. gpg2 is not even build by default.
 
-In case of problem please ask on gpa[email protected] for advise.  Note
+In case of problem please ask on gnupg[email protected] for advise.  Note
 that this release is only expected to build on GNU and *BSD systems.
 
-A texinfo manual named `gnupg.info' will get installed.  Some commands
-and options given below.  See also the section `SMARTCARD INTRO'.
+A texinfo manual named `gnupg.info' will get installed. man pages for
+all major components are also provided. Some commands and options
+given below.  See also the section `SMARTCARD INTRO'.
 
 
 COMMANDS

doc/Makefile.am

@@ -22,7 +22,8 @@
 EXTRA_DIST = gnupg-badge-openpgp.eps gnupg-badge-openpgp.jpg \
              gnupg-badge-openpgp.pdf \
              gnupg-card-architecture.eps gnupg-card-architecture.png \
-             gnupg-card-architecture.pdf
+             gnupg-card-architecture.pdf \
+             opt-homedir.texi see-also-note.texi
 
 BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
                 gnupg-card-architecture.pdf
@@ -38,12 +39,16 @@ gnupg_TEXINFOS = \
 	tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \
 	sysnotes.texi gnupg-card-architecture.fig
 
-YAT2M_OPTIONS = \
+AM_MAKEFINFOFLAGS = -I $(srcdir)
+
+YAT2M_OPTIONS = -I $(srcdir) \
         --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
 
 myman_sources = gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi tools.texi
 myman_pages   = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 \
-                watchgnupg.1 gpgconf.1 addgnupghome.8
+                watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
+		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
+		gpgsm-gencert.sh.1
 
 man_MANS = $(myman_pages)
 

doc/gpg-agent.texi

@@ -168,14 +168,8 @@ per-user configuration file.  The default configuration file is named
 below the home directory of the user.
 
 @anchor{option --homedir}
-@item --homedir @var{dir}
-@opindex homedir
-Set the name of the home directory to @var{dir}. If his option is not
-used, the home directory defaults to @file{~/.gnupg}.  It is only
-recognized when given on the command line.  It also overrides any home
-directory stated through the environment variable @env{GNUPGHOME} or
-(on W32 systems) by means on the Registry entry
-@var{HKCU\Software\GNU\GnuPG:HomeDir}.
+@include opt-homedir.texi
+
 
 @item -v
 @item --verbose

doc/gpg.texi

@@ -1501,11 +1501,8 @@ directory. If the filename does not contain a slash, it is assumed to
 be in the GnuPG home directory ("~/.gnupg" if --homedir or $GNUPGHOME
 is not used).
 
-@item --homedir @code{directory}
-Set the name of the home directory to @code{directory} If this option is not
-used it defaults to "~/.gnupg". It does not make sense to use this in
-a options file. This also overrides the environment variable
-$GNUPGHOME.
+@include opt-homedir.texi
+
 
 @item --pcsc-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default is

doc/gpgsm.texi

@@ -286,14 +286,7 @@ per-user configuration file.  The default configuration file is named
 @file{gpgsm.conf} and expected in the @file{.gnupg} directory directly
 below the home directory of the user.
 
-@item --homedir @var{dir}
-@opindex homedir
-Set the name of the home directory to @var{dir}. If his option is not
-used, the home directory defaults to @file{~/.gnupg}.  It is only
-recognized when given on the command line.  It also overrides any home
-directory stated through the environment variable @env{GNUPGHOME} or
-(on W32 systems) by means on the Registry entry
-@var{HKCU\Software\GNU\GnuPG:HomeDir}.
+@include opt-homedir.texi
 
 
 @item -v

doc/opt-homedir.texi

@@ -0,0 +1,14 @@
+@c This option is included at several places.
+@item --homedir @var{dir}
+@opindex homedir
+Set the name of the home directory to @var{dir}. If his option is not
+used, the home directory defaults to @file{~/.gnupg}.  It is only
+recognized when given on the command line.  It also overrides any home
+directory stated through the environment variable @env{GNUPGHOME} or
+(on W32 systems) by means on the Registry entry
+@ifset isman
+@var{HKCU\\Software\\GNU\\GnuPG:HomeDir}.
+@end ifset
+@ifclear isman
+@var{HKCU\Software\GNU\GnuPG:HomeDir}.
+@end ifclear

doc/scdaemon.texi

@@ -114,14 +114,8 @@ per-user configuration file.  The default configuration file is named
 @file{scdaemon.conf} and expected in the @file{.gnupg} directory directly
 below the home directory of the user.
 
-@item --homedir @var{dir}
-@opindex homedir
-Set the name of the home directory to @var{dir}. If his option is not
-used, the home directory defaults to @file{~/.gnupg}.  It is only
-recognized when given on the command line.  It also overrides any home
-directory stated through the environment variable @env{GNUPGHOME} or
-(on W32 systems) by means on the Registry entry
-@var{HKCU\Software\GNU\GnuPG:HomeDir}.
+@include opt-homedir.texi
+
 
 @item -v
 @item --verbose

doc/see-also-note.texi

@@ -0,0 +1,14 @@
+@c We append this note to all ``see also'' sections of the man pages
+
+@ifset isman
+The full documentation for this tool is maintained as a Texinfo manual.
+If GnuPG and the info program are properly installed at your site, the
+command
+
+@example
+info gnupg
+@end example
+
+should give you access to the complete manual including a menu structure
+and an index.
+@end ifset