Imported Upstream version 2.1.4upstream/2.1.4

Change-Id: I5de7162ffaaa8407bae93279df54273b2dfe4e22
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

3 files changed, 30 insertions, 23 deletions

diff --git a/man/cupsctl.man b/man/cupsctl.man
index 47ac9e2..1c14d6e 100644
--- a/man/cupsctl.man
+++ b/man/cupsctl.man
@@ -3,7 +3,7 @@
 .\"
 .\" cupsctl man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 2007 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -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 cupsctl 8 "CUPS" "11 June 2014" "Apple Inc."
+.TH cupsctl 8 "CUPS" "30 May 2016" "Apple Inc."
 .SH NAME
 cupsctl \- configure cupsd.conf options
 .SH SYNOPSIS
@@ -54,19 +54,19 @@ Specifies an alternate username to use when authenticating with the scheduler.
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Specifies the server address.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBdebug\-logging
+\fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
 Enables (disables) debug logging to the \fIerror_log\fR file.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBremote\-admin
+\fB\-\-\fR[\fBno\-\fR]\fBremote\-admin\fR
 Enables (disables) remote administration.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBremote\-any
+\fB\-\-\fR[\fBno\-\fR]\fBremote\-any\fR
 Enables (disables) printing from any address, e.g., the Internet.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBshare\-printers
+\fB\-\-\fR[\fBno\-\fR]\fBshare\-printers\fR
 Enables (disables) sharing of local printers with other computers.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBuser\-cancel\-any
+\fB\-\-\fR[\fBno\-\fR]\fBuser\-cancel\-any\fR
 Allows (prevents) users to cancel jobs owned by others.
 .SH EXAMPLES
 Display the current settings:
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 5b16c8a..73cf362 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.man.in 12854 2015-08-28 14:08:00Z msweet $"
+.\" "$Id: cupsd.man.in 13087 2016-02-12 18:53:24Z msweet $"
 .\"
 .\" cupsd man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 1997-2006 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,14 +12,14 @@
 .\" 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 8 "CUPS" "8 July 2014" "Apple Inc."
+.TH cupsd 8 "CUPS" "12 February 2016" "Apple Inc."
 .SH NAME
 cupsd \- cups scheduler
 .SH SYNOPSIS
 .B cupsd
 [
 .B \-c
-.I config-file
+.I cupsd.conf
 ] [
 .B \-f
 ] [
@@ -27,19 +27,22 @@ cupsd \- cups scheduler
 ] [
 .B \-h
 ] [
-.B -l
+.B \-l
+] [
+.B \-s
+.I cups-files.conf
 ] [
-.B -t
+.B \-t
 ]
 .SH DESCRIPTION
 .B cupsd
-is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1. If no options are specified on the command-line then the default configuration file
+is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1, and supports most of the requirements for IPP Everywhere. If no options are specified on the command-line then the default configuration file
 .I /etc/cups/cupsd.conf
 will be used.
 .SH OPTIONS
 .TP 5
-.BI \-c \ config-file
-Uses the named configuration file.
+.BI \-c \ cupsd.conf
+Uses the named cupsd.conf configuration file.
 .TP 5
 .B \-f
 Run
@@ -65,6 +68,9 @@ when it is run from
 or
 .BR systemd (8).
 .TP 5
+.BI \-s \ cups-files.conf
+Uses the named cups-files.conf configuration file.
+.TP 5
 .B \-t
 Test the configuration file for syntax errors.
 .SH FILES
@@ -109,6 +115,7 @@ in the foreground with a test configuration file called
 .BR backend (7),
 .BR classes.conf (5),
 .BR cups (1),
+.BR cups-files.conf (5),
 .BR cups-lpd (8),
 .BR cupsd.conf (5),
 .BR cupsd-helper (8),
@@ -121,7 +128,7 @@ in the foreground with a test configuration file called
 .BR systemd (8),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2015 by Apple Inc.
+Copyright \[co] 2007-2016 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 12854 2015-08-28 14:08:00Z msweet $".
+.\" End of "$Id: cupsd.man.in 13087 2016-02-12 18:53:24Z msweet $".
 .\"
diff --git a/man/ppdcfile.man b/man/ppdcfile.man
index 79ec4eb..01e4965 100644
--- a/man/ppdcfile.man
+++ b/man/ppdcfile.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdcfile.man 12854 2015-08-28 14:08:00Z msweet $"
+.\" "$Id: ppdcfile.man 13117 2016-03-07 18:36:16Z msweet $"
 .\"
 .\" ppdcfile man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 1997-2007 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -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 ppdcfile 5 "CUPS" "12 June 2014" "Apple Inc."
+.TH ppdcfile 5 "CUPS" "5 March 2016" "Apple Inc."
 .SH NAME
 ppdcfile \- cups ppd compiler source file format
 .SH DESCRIPTION
@@ -82,7 +82,7 @@ Directives may be placed anywhere on a line and are followed by one or more valu
 .TP 5
 \fBDuplex \fItype\fR
 .TP 5
-\fBFilter \Imime-type cost program\fR
+\fBFilter \fImime-type cost program\fR
 .TP 5
 \fBFinishing \fIname\fR
 .TP 5
@@ -161,5 +161,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id: ppdcfile.man 12854 2015-08-28 14:08:00Z msweet $".
+.\" End of "$Id: ppdcfile.man 13117 2016-03-07 18:36:16Z msweet $".
 .\"