Merge changes from CUPS 1.4svn-r7932.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@957 a1ca3aef-8c08-0410-bb20-df032aa958be

4 files changed, 33 insertions, 11 deletions

diff --git a/man/Makefile b/man/Makefile
index 1e2bb0100..0f686af4f 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -53,7 +53,7 @@ MAN7	=	backend.$(MAN7EXT) \
 		filter.$(MAN7EXT) \
 		rastertoescpx.$(MAN7EXT) \
 		rastertopclx.$(MAN7EXT)
-MAN8	=	accept.$(MAN8EXT) \
+MAN8	=	cupsaccept.$(MAN8EXT) \
 		cupsaddsmb.$(MAN8EXT) \
 		cupsctl.$(MAN8EXT) \
 		cupsfilter.$(MAN8EXT) \
@@ -129,7 +129,7 @@ install:	all install-data install-headers install-libs install-exec
 # Install data files...
 #
 
-install-data:
+install-data: all
 	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
 	for file in $(MAN1); do \
 		echo Installing $$file in $(MANDIR)/man1...; \
@@ -150,8 +150,8 @@ install-data:
 		echo Installing $$file in $(AMANDIR)/man$(MAN8DIR)...; \
 		$(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \
 	done
-	$(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
-	$(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
+	$(RM) $(AMANDIR)/man$(MAN8DIR)/cupsreject.$(MAN8EXT)
+	$(LN) cupsaccept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsreject.$(MAN8EXT)
 	$(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
 	$(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
 
diff --git a/man/accept.man b/man/cupsaccept.man
index 477d125e9..36457e351 100644
--- a/man/accept.man
+++ b/man/cupsaccept.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: accept.man 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id$"
 .\"
 .\"   accept/reject man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -75,5 +75,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: accept.man 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 4421c1df4..b3137f74f 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsd.conf 5 "Common UNIX Printing System" "16 June 2008" "Apple Inc."
+.TH cupsd.conf 5 "Common UNIX Printing System" "8 September 2008" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -254,6 +254,15 @@ DefaultLanguage locale
 .br
 Specifies the default language to use for text and web content.
 .TP 5
+DefaultPaperSize Auto
+.TP 5
+DefaultPaperSize None
+.TP 5
+DefaultPaperSize sizename
+.br
+Specifies the default paper size for new print queues. "Auto" uses a locale-
+specific default, while "None" specifies there is no default paper size.
+.TP 5
 DefaultPolicy policy-name
 .br
 Specifies the default access policy to use.
@@ -303,6 +312,15 @@ ErrorLog syslog
 .br
 Specifies the error log filename.
 .TP 5
+FatalErrors none
+.TP 5
+FatalErrors all -kind [... -kind]
+.TP 5
+FatalErrors kind [... kind]
+.br
+Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
+"browse", "config", "listen", "log", or "permissions".
+.TP 5
 FileDevice Yes
 .TP 5
 FileDevice No
diff --git a/man/lpstat.man b/man/lpstat.man
index 47294c5a5..e0bb5935d 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -3,7 +3,7 @@
 .\"
 .\"   lpstat man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007 by Apple Inc.
+.\"   Copyright 2007-2008 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,12 +12,12 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH lpstat 1 "Common UNIX Printing System" "23 March 2006" "Apple Inc."
+.TH lpstat 1 "Common UNIX Printing System" "10 September 2008" "Apple Inc."
 .SH NAME
 lpstat \- print cups status information
 .SH SYNOPSIS
 .B lpstat
-[ -E ] [ -U
+[ -E ] [ -H ] [ -U
 .I username
 ] [ -h
 .I hostname[:port]
@@ -47,6 +47,10 @@ The \fIlpstat\fR command supports the following options:
 .br
 Forces encryption when connecting to the server.
 .TP 5
+-H
+.br
+Shows the server hostname and port.
+.TP 5
 -R
 .br
 Shows the ranking of print jobs.
@@ -133,7 +137,7 @@ The Solaris "-f", "-P", and "-S" options are silently ignored.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007 by Apple Inc.
+Copyright 2007-2008 by Apple Inc.
 .\"
 .\" End of "$Id: lpstat.man 7600 2008-05-20 21:06:23Z mike $".
 .\"