From 3b433010280aef5393e925fb80543f12ac0fa8e0 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 12 Feb 2016 18:53:04 +0000 Subject: [PATCH] Update documentation for cupsd - "-s" option was not mentioned (STR #4772) Also update usage (-h) output. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13086 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-2.1.txt | 5 +++++ man/cupsd.man.in | 25 ++++++++++++++++--------- scheduler/main.c | 7 +++---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt index 9461454859..502226b7f5 100644 --- a/CHANGES-2.1.txt +++ b/CHANGES-2.1.txt @@ -1,6 +1,11 @@ CHANGES-2.1.txt --------------- +CHANGES IN CUPS V2.1.4 + + - Documentation update (STR #4772) + + CHANGES IN CUPS V2.1.3 - The default password function did not work on some platforms diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 7cecd82869..226fc5079f 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -3,7 +3,7 @@ .\" .\" 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$". .\" diff --git a/scheduler/main.c b/scheduler/main.c index 225892e621..8bfb05fc52 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -2193,12 +2193,11 @@ usage(int status) /* O - Exit status */ _cupsLangPuts(fp, _("Options:")); _cupsLangPuts(fp, _(" -c cupsd.conf Set cupsd.conf file to use.")); _cupsLangPuts(fp, _(" -f Run in the foreground.")); - _cupsLangPuts(fp, _(" -F Run in the foreground but " - "detach from console.")); + _cupsLangPuts(fp, _(" -F Run in the foreground but detach from console.")); _cupsLangPuts(fp, _(" -h Show this usage message.")); _cupsLangPuts(fp, _(" -l Run cupsd on demand.")); - _cupsLangPuts(fp, _(" -t Test the configuration " - "file.")); + _cupsLangPuts(fp, _(" -s cups-files.conf Set cups-files.conf file to use.")); + _cupsLangPuts(fp, _(" -t Test the configuration file.")); exit(status); } -- 2.47.2