From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 13 Oct 2008 17:16:02 +0000 (+0000)
Subject: Doco updates from CUPS 1.4svn-r8054.
X-Git-Tag: release-1.6.3~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=758a062febd4bd91eb33c545b14a690ea0687fc3;p=thirdparty%2Fcups.git

Doco updates from CUPS 1.4svn-r8054.


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

diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html
index cf466c39ce..5ad93f95f6 100644
--- a/doc/help/api-filedir.html
+++ b/doc/help/api-filedir.html
@@ -314,6 +314,7 @@ contain binary data.">cupsFileGetLine</a></li>
 <li><a href="#cupsFilePeekChar" title="Peek at the next character from a file.">cupsFilePeekChar</a></li>
 <li><a href="#cupsFilePrintf" title="Write a formatted string.">cupsFilePrintf</a></li>
 <li><a href="#cupsFilePutChar" title="Write a character.">cupsFilePutChar</a></li>
+<li><a href="#cupsFilePutConf" title="Write a configuration line.">cupsFilePutConf</a></li>
 <li><a href="#cupsFilePuts" title="Write a string.">cupsFilePuts</a></li>
 <li><a href="#cupsFileRead" title="Read from a file.">cupsFileRead</a></li>
 <li><a href="#cupsFileRewind" title="Set the current file position to the beginning of the
@@ -717,6 +718,29 @@ int cupsFilePutChar (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">0 on success, -1 on error</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.4&nbsp;</span><a name="cupsFilePutConf">cupsFilePutConf</a></h3>
+<p class="description">Write a configuration line.</p>
+<p class="code">
+ssize_t cupsFilePutConf (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_file_t">cups_file_t</a> *fp,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *directive,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *value<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>fp</dt>
+<dd class="description">CUPS file</dd>
+<dt>directive</dt>
+<dd class="description">Directive</dd>
+<dt>value</dt>
+<dd class="description">Value</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Number of bytes written or -1 on error</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">This function handles any comment escaping of the value.
+
+</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.2&nbsp;</span><a name="cupsFilePuts">cupsFilePuts</a></h3>
 <p class="description">Write a string.</p>
 <p class="code">
diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html
index 582871ec62..ae6f993298 100644
--- a/doc/help/api-filter.html
+++ b/doc/help/api-filter.html
@@ -334,7 +334,7 @@ div.contents ul.subcontents li {
 </ul></li>
 </ul>
 <!--
-  "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $"
+  "$Id: api-filter.shtml 7962 2008-09-18 17:31:33Z mike $"
 
   Filter and backend programming introduction for the Common UNIX Printing
   System (CUPS).
@@ -466,6 +466,10 @@ when running print filters and backends:</p>
 	<dt>CUPS_DATADIR</dt>
 	<dd>The directory where (read-only) CUPS data files can be found.</dd>
 
+	<dt>CUPS_FILETYPE</dt>
+	<dd>The type of file being printed: "job-sheet" for a banner page and
+	"document" for a regular print file.</dd>
+
 	<dt>CUPS_SERVERROOT</dt>
 	<dd>The root directory of the server.</dd>
 
diff --git a/man/cupsaccept.man b/man/cupsaccept.man
index 01ed7261cf..3f43a8bdf3 100644
--- a/man/cupsaccept.man
+++ b/man/cupsaccept.man
@@ -3,7 +3,7 @@
 .\"
 .\"   accept/reject 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,18 +12,18 @@
 .\"   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 accept 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
+.TH cupsaccept 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
-accept/reject \- accept/reject jobs sent to a destination
+cupsaccept/cupsreject \- accept/reject jobs sent to a destination
 .SH SYNOPSIS
-.B accept
+.B cupsaccept
 [ -E ] [ -U
 .I username
 ] [ -h
 .I hostname[:port]
 ] destination(s)
 .br
-.B reject
+.B cupsreject
 [ -E ] [ -U
 .I username
 ] [ -h
@@ -32,15 +32,15 @@ accept/reject \- accept/reject jobs sent to a destination
 .I reason
 ] destination(s)
 .SH DESCRIPTION
-\fIaccept\fR instructs the printing system to accept print jobs to the
+\fIcupsaccept\fR instructs the printing system to accept print jobs to the
 specified destinations.
 .LP
-\fIreject\fR instructs the printing system to reject print jobs to the
+\fIcupsreject\fR instructs the printing system to reject print jobs to the
 specified destinations. The \fI-r\fR option sets the reason for rejecting
 print jobs. If not specified the reason defaults to "Reason Unknown".
 .SH OPTIONS
-The following options are supported by both \fIaccept\fR and
-\fIreject\fR:
+The following options are supported by both \fIcupsaccept\fR and
+\fIcupsreject\fR:
 .TP 5
 -E
 .br
@@ -73,7 +73,7 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007 by Apple Inc.
+Copyright 2007-2008 by Apple Inc.
 .\"
 .\" End of "$Id: cupsaccept.man 7930 2008-09-10 22:25:54Z mike $".
 .\"