Merge pull request #5170 from reddevillg/patch-1

[thirdparty/cups.git] / man / cupsd.man.in

diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 7709943a83304dc8de1a820dd4099cb2ca3204ad..efb55ad44370825fb88b05ac5899f4a6a0aba6db 100644 (file)
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,45 +1,42 @@
 .\"
-.\" "$Id$"
-.\"
 .\" 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
-.\" property of Apple Inc. and are protected by Federal copyright
-.\" law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-.\" 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/".
+.\" Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 .\"
-.TH cupsd 8 "CUPS" "10 June 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
 ] [
 .B \-F
 ] [
 .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 +62,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,10 +109,11 @@ in the foreground with a test configuration file called
 .BR backend (7),
 .BR classes.conf (5),
 .BR cups (1),
-.BR cups-deviced (8),
-.BR cups-driverd (8),
+.BR cups-files.conf (5),
 .BR cups-lpd (8),
 .BR cupsd.conf (5),
+.BR cupsd-helper (8),
+.BR cupsd-logs (8),
 .BR filter (7),
 .BR launchd (8),
 .BR mime.convs (5),
@@ -121,7 +122,4 @@ in the foreground with a test configuration file called
 .BR systemd (8),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2014 by Apple Inc.
-.\"
-.\" End of "$Id$".
-.\"
+Copyright \[co] 2007-2017 by Apple Inc.