X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=man%2Fcupsd.man.in;h=55b4dd7372d1ed2ba904175aa92501a9c55f8bcc;hb=c277f98cbca425b2a69c9bd2363f54e10406c51c;hp=831890f97dd839f81c0fceb636be2efaae400f00;hpb=c07d5b2daf136da7af01c48ff78135d06d2762fc;p=thirdparty%2Fcups.git

diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 831890f97..55b4dd737 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,78 +1,65 @@
 .\"
-.\" "$Id: cupsd.man.in 177 2006-06-21 00:20:03Z jlovell $"
+.\" "$Id$"
 .\"
-.\"   cupsd man page for the Common UNIX Printing System (CUPS).
+.\" cupsd man page for CUPS.
 .\"
-.\"   Copyright 1997-2006 by Easy Software Products.
+.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 1997-2006 by Easy Software Products.
 .\"
-.\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-.\"   at:
+.\" 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/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupsd 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cupsd 8 "CUPS" "4 March 2014" "Apple Inc."
 .SH NAME
-cupsd \- common unix printing system daemon
+cupsd \- cups scheduler
 .SH SYNOPSIS
 .B cupsd
 [ -c
 .I config-file
-] [ -f ] [ -F ] [ -h ] [ -l ]
+] [ -f ] [ -F ] [ -h ] [ -l ] [ -t ]
 .SH DESCRIPTION
-\fIcupsd\fR is the scheduler for the Common UNIX Printing System. It
-implements a printing system based upon the Internet Printing Protocol,
-version 1.1.  If no options are specified on the command-line then the
-default configuration file \fI@CUPS_SERVERROOT@/cupsd.conf\fR will be
-used.
+.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
+.I /etc/cups/cupsd.conf
+will be used.
 .SH OPTIONS
 .TP 5
 -c config-file
-.br
 Uses the named configuration file.
 .TP 5
 -f
-.br
-Run \fIcupsd\fR in the foreground; the default is to run in the
-background as a "daemon".
+Run
+.B cupsd
+in the foreground; the default is to run in the background as a "daemon".
 .TP 5
 -F
-.br
-Run \fIcupsd\fR in the foreground but detach the process from the
-controlling terminal and current directory. This is useful for
-running \fIcupsd\fR from \fIinit(8)\fR.
+Run
+.B cupsd
+in the foreground but detach the process from the controlling terminal and current directory. This is useful for running
+.BR cupsd from init (8).
 .TP 5
 -h
-.br
 Shows the program usage.
 .TP 5
 -l
-.br
-This option is passed to \fIcupsd\fR when it is run from
-\fIlaunchd(8)\fR.
+This option is passed to
+.B cupsd
+when it is run from
+.BR launchd (8).
+.TP 5
+-t
+Test the configuration file for syntax errors.
 .SH COMPATIBILITY
-\fIcupsd\fR implements all of the required IPP/1.1 attributes and
-operations. It also implements several CUPS-specific administration
-operations.
+.B cupsd
+implements all of the required IPP/2.1 attributes and operations. It also implements several CUPS-specific administration operations.
 .SH SEE ALSO
-\fIbackend(7)\fR, \fIclasses.conf(5)\fR, \fIcups-deviced(8)\fR,
-\fIcups-driverd(8)\fR, \fIcups-lpd(8)\fR, \fIcups-polld(8)\fR,
-\fIcupsd.conf(5)\fR, \fIfilter(7)\fR, \fIlaunchd(8)\fR,
-\fImime.convs(5)\fR, \fImime.types(5)\fR, \fIprinters.conf(5)\fR,
-.br
+.BR backend (7), classes.conf (5), cups-deviced (8), cups-driverd (8), cups-lpd (8), cupsd.conf (5), filter (7), launchd (8), mime.convs (5), mime.types (5), printers.conf (5),
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright \[co] 2007-2014 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 177 2006-06-21 00:20:03Z jlovell $".
+.\" End of "$Id$".
 .\"