Imported Upstream version 4.3.99+cvs20060521

2 files changed, 29 insertions, 7 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index 07dc610..f17d1db 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/main
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -251,6 +254,7 @@ USE_NLS = @USE_NLS@
 USE_NLS_FALSE = @USE_NLS_FALSE@
 USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -605,9 +609,6 @@ uninstall-man: uninstall-man1 uninstall-man8
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/man/cups-genppdupdate.8.in b/man/cups-genppdupdate.8.in
index 80804f0..9f4e70b 100644
--- a/man/cups-genppdupdate.8.in
+++ b/man/cups-genppdupdate.8.in
@@ -1,4 +1,4 @@
-.\" $Id: cups-genppdupdate.8.in,v 1.4 2004/09/17 18:38:02 rleigh Exp $
+.\" $Id: cups-genppdupdate.8.in,v 1.5 2006/03/29 02:35:25 rlk Exp $
 .\" Copyright (C) 2000 Roger Leigh <rleigh@debian.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
@@ -21,8 +21,11 @@ cups\-genppdupdate \- update CUPS+Gutenprint PPD files
 .B cups\-genppdupdate
 [\fI\-h\fP]
 [\fI\-n\fP]
+[\fI\-N\fP]
 [\fI\-q\fP | \fI\-v\fP]
 [\fI\-s ppd-directory\fP]
+[\fI\-s output-directory\fP]
+[\fIPPD-FILES or QUEUES...\fP]
 .SH DESCRIPTION
 \fBcups\-genppdupdate\fP regenerates the \fIGutenprint\fP PPD files in use by
 CUPS, using the PPD files under \fI@cups_conf_datadir@/model/gutenprint\fP as
@@ -30,8 +33,17 @@ templates.  The new PPD file replaces the old PPD file under
 \fI@cups_conf_serverroot@/ppd\fP, but all the options set in the old PPD will
 be merged into the new PPD, provided that they are still valid in the new file.
 .PP
-cups\-genppdupdate does \fBnot\fP restart cupsd.  cupsd will need manually
-reloading (or send SIGHUP) once cups\-genppdupdate has completed.
+If no files or queue names are specified, \fBcups\-genppdupdate\fP updates all
+Gutenprint PPD files in \fI@cups_conf_serverroot@/ppd\fP.  Otherwise,
+\fBcups\-genppdupdate\fP updates all files or queues listed on the command
+line.
+.PP
+\fBcups\-genppdupdate\fP does not update Foomatic PPD files or PPD files from
+Gimp-Print 4.2 or earlier.
+.PP
+\fBcups\-genppdupdate\fP does \fBnot\fP restart cupsd.  cupsd will need
+manually reloading (or send SIGHUP) once \fBcups\-genppdupdate\fP has
+completed.
 .SH OPTIONS
 .TP
 .B \-h
@@ -53,12 +65,21 @@ Use \fIppd-directory\fP as the base directory to read PPD files from.  By
 default, the base directory is \fP@cups_conf_datadir@/model/gutenprint\fP.
 Under this directory, the PPD files are located in subdirectories according to
 language code and territory.
+.TP
+.B \-o \fIoutput-directory\fP
+Place updated PPD files in \fIoutput-directory\fP.  By default, this is the
+same as the input directory.
+.TP
+.B \-N
+Reset all options to their defaults (do not merge options from the current PPD
+file)
 .SH SEE ALSO
 .BR cups\-genppd (8),
 .BR cups\-genppdconfig (8),
 CUPS Software Administrators Manual, http://localhost:631/documentation.html
 .SH COPYRIGHT
-Copyright \(co  2002\-2003 Roger Leigh (rleigh@debian.org)
+Copyright \(co  2002\-2006 Roger Leigh (rleigh@debian.org) and Robert Krawitz
+(rlk@alum.mit.edu)
 .PP
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, version 2, as