Copied wrong files. Fixed.

2 files changed, 37 insertions, 223 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9ef2473ab..d15420cfc 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,230 +1,65 @@
 2002-12-04  Werner Koch  <wk@gnupg.org>
 
-	Released 0.9.4.
+	* gpg-agent.texi (Agent Signals): New.
 
 2002-12-03  Werner Koch  <wk@gnupg.org>
 
-	* configure.ac (GNUPG_PROTECT_TOOL): New option --with-protect-tool. 
-
-2002-11-25  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac (NEED_KSBA_VERSION): Does now require 0.4.6.
+	* gpgsm.texi (Operational Commands): Add --passwd and
+	--call-protect-tool.
+	* gpg-agent.texi (Agent PASSWD): New
 
 2002-11-13  Werner Koch  <wk@gnupg.org>
 
-	* README: Noted where to find gpg-protect-tool. 
+	* gpg-agent.texi (Invoking GPG-AGENT): Tell about GPG_TTY.
 
 2002-11-12  Werner Koch  <wk@gnupg.org>
 
-	* config.sub, config.guess: Updated from ftp.gnu.org/gnu/config
-	to version 2002-11-08.
-
-2002-11-11  Werner Koch  <wk@gnupg.org>
-
-	Released 0.9.3.
-
-2002-10-31  Neal H. Walfield  <neal@g10code.de>
-
-	* configure.ac: Check for flockfile and funlockfile.  Check for
-	isascii and putc_unlocked replacing them if not found.
-
-2002-10-31  Neal H. Walfield  <neal@g10code.de>
-
-	* configure.ac (PTH_LIBS): If pth is found, add the output of
-	`$PTH_CONFIG --ldflags`, not just `$PTH_CONFIG --libs`.
-
-2002-09-20  Werner Koch  <wk@gnupg.org>
-
-	Released 0.9.2.
+	* gpgsm.texi (Operational Commands): Add --call-dirmngr.
 
-2002-09-05  Neal H. Walfield  <neal@g10code.de>
+2002-09-25  Werner Koch  <wk@gnupg.org>
 
-	* configure.ac: Check for makeinfo.
+	* gpg-agent.texi (Agent Options): Add --keep-tty and --keep-display.
 
-2002-09-03  Neal H. Walfield  <neal@g10code.de>
+2002-09-12  Werner Koch  <wk@gnupg.org>
 
-	* autogen.sh (have_version): New function.  Generalize and
-	simplify logic for finding and determining the versions of GNU
-	programs.  Use it.
+	* gpg-agent.texi (Invoking GPG-AGENT): Explained how to start only
+	one instance.
 
-2002-08-23  Werner Koch  <wk@gnupg.org>
+2002-08-28  Werner Koch  <wk@gnupg.org>
 
-	Released 0.9.1.
+	* gpg-agent.texi (Agent Options): Explained more options.
+	* scdaemon.texi (Scdaemon Options): Ditto.
 
-	* acinclude.m4 (AM_PATH_LIBGCRYPT): Updated from Libgcrypt.
-	(AM_PATH_OPENSC): Strip non-digits from the micro version.
+2002-08-09  Werner Koch  <wk@gnupg.org>
 
-2002-08-21  Werner Koch  <wk@gnupg.org>
+	* Makefile.am (gnupg_TEXINFOS): Include contrib.texi.
 
-	Released 0.9.0.
+2002-08-06  Werner Koch  <wk@gnupg.org>
 
-	* configure.ac: Changed the default homedir to .gnupg.
-	* README-alpha: Removed.
+	* gpgsm.texi: Added more options.
 
-2002-08-19  Werner Koch  <wk@gnupg.org>
+2002-07-26  Werner Koch  <wk@gnupg.org>
 
-	* acinclude.m4: Removed -lpcsclite from KSBA_LIBS; copy+paste bug.
-
-2002-08-13  Werner Koch  <wk@gnupg.org>
-
-	* acinclude.m4 (AM_PATH_OPENSC, AM_PATH_KSBA): New.
-	* configure.ac: Use them.
-
-2002-08-10  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.10.
-	
-	* configure.ac (NEED_LIBKSBA_VERSION): Require 0.4.4. Add support
-	for gettext.
+	* assuan.texi: New.
+	* gpgsm.texi, scdaemon.texi, gpg-agent.texi: Documented the Assuan
+	protocol used.
 
 2002-07-22  Werner Koch  <wk@gnupg.org>
 
-	* configure.ac: Check for ftello and provide a replacement.
-
-2002-07-01  Werner Koch  <wk@gnupg.org>
-
-        Released 0.3.9.
-	
-	* README: Short note on how to export in pkcs-12 format.
-
-2002-06-29  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac: Define --with options to set the default location
-	of the agent, scdaemon, pinentry and dirmngr.
-
-2002-06-27  Werner Koch  <wk@gnupg.org>
-
-	* README: Short blurb on how to import a PKCS-12 file.
-
-	* configure.ac (AH_BOTTOM): New to define some constants.
-
-2002-06-25  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.8.
-	
-	* configure.ac (NEED_LIBGCRYPT_VERSION): Set to 1.1.8.
-
-2002-06-12  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac (NEED_LIBKSBA_VERSION): We need 0.4.3 now.
+	* gnupg.texi, scdaemon.texi, gpg-agent.texi: New.
+	* contrib.texi, gpl.texi, fdl.texi: New.
+	* gpgsm.texi: Made this an include file for gnupg.texi.
+	* Makefile.am: Build gnupg.info instead of gpgsm.info.
 
 2002-06-04  Werner Koch  <wk@gnupg.org>
 
-	Released 0.3.7.
-
-2002-05-21  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac: We now require libgcrypt 1.1.7 and libksba 0.4.2.
+	* gpgsm.texi (Invocation): Described the various debug flags.
 
 2002-05-14  Werner Koch  <wk@gnupg.org>
 
-	* doc/: New
-	* configure.ac, Makefile.am:  Added doc/ 
-
-2002-05-03  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.6.
-
-2002-04-25  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac: Check for setlocale.
-
-2002-04-24  Marcus Brinkmann  <marcus@g10code.de>
-
-	* configure.ac: Check for locale.h.
-
-2002-04-15  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.5.
-	
-	* NEWS: Started to describe release notes.
-	
-	* configure.ac (NEED_LIBKSBA_VERSION, NEED_LIBGCRYPT_VERSION): Defined
-
-2002-04-01  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.4.
-
-2002-03-18  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.3.
-
-2002-03-08  Werner Koch  <wk@gnupg.org>
-
-	* README: Add some explanation on how to specify a user ID.
-
-2002-03-06  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.2.
-
-2002-03-04  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.1.
-
-	* README: Explained some options and files.
-
-2002-02-14  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac: Fixed status messages related to presence of Pth.
-
-2002-02-13  Werner Koch  <wk@gnupg.org>
-
-	* acinclude.m4 (GNUPG_SYS_SO_PEERCRED): New.
-	* configure.ac: use it.
-
-2002-02-12  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac: Check for PTH.  Provide replacement fucntions for
-	apsrintf and fopencookie.
-
-	* acinclude.m4 (GNUPG_PTH_VERSION_CHECK): New.
-
-2002-02-07  Werner Koch  <wk@gnupg.org>
-
-	Released 0.3.0.
-
-	* configure.ac: Require libgcrypt 1.1.6.
-
-2002-02-01  Marcus Brinkmann  <marcus@g10code.de>
-
-	* configure.ac (KSBA_CONFIG): Remove superfluous x in front of
-	variable.
-
-2002-01-26  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac: Add options to disable the build of some programs
-	and print a configure status at the end.
-	* acinclude.m4 (GNUPG_BUILD_PROGRAM): New.
-
-	* scd/ : New.  Added to Makefile and configure.
-	* configure.ac: Check for libopensc
-	* Makefile.am: Build scd only when libopensc is available
-
-2002-01-23  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac (mkdtemp): See whether we have to provide a
-	replacement.
-
-2001-12-18  Werner Koch  <wk@gnupg.org>
-
-	Released 0.0.0.
-
-2001-12-17  Werner Koch  <wk@gnupg.org>
-
-	* acinclude.m4: Add AM_PATH_LIBGCRYPT macro.
-	* configure.ac: and use it here. Figure out the location of libksba
-
-2001-12-15  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac (missing_dir): Bail out if asprintf and fopencookie
-	are not available.
-
-2001-12-04  Werner Koch  <wk@gnupg.org>
-
-	* configure.ac (HAVE_JNLIB_LOGGING): always define it.
-
+	* Makefile.am, gpgsm.texi: New.
 	
- Copyright 2001, 2002 Free Software Foundation, Inc.
+ Copyright 2002 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
@@ -233,5 +68,3 @@
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-		
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ccfc98fb2..78ae80a2e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,7 @@
-# Makefile.am - main makefile for NewPG/GnuPG
-#     	Copyright (C) 2001 Free Software Foundation, Inc.
-# 
+# Copyright (C) 2002 Free Software Foundation, Inc.
+#
 # This file is part of GnuPG.
-# 
+#
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -19,29 +18,11 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = autogen.sh
-
-if BUILD_GPGSM
-sm = sm
-else
-sm =
-endif
-if BUILD_AGENT
-agent = agent
-else
-agent =
-endif
-if BUILD_SCDAEMON
-scd = scd
-else
-scd =
-endif
-
-SUBDIRS = intl jnlib assuan common kbx ${sm} ${agent} ${scd} po doc tests
-
-
-dist-hook:
-	@set -e; echo "$(VERSION)" > $(distdir)/VERSION
+info_TEXINFOS = gnupg.texi
 
+gnupg_TEXINFOS = \
+	gpgsm.texi gpg-agent.texi scdaemon.texi assuan.texi\
+	contrib.texi gpl.texi fdl.texi
 
+DISTCLEANFILES = gnupg.tmp gnupg.ops