summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2007-07-26 22:45:43 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2007-07-26 22:45:43 +0000
commit355e94dc85c9adaf0ad76a1dc8f5ff960181059c (patch)
tree8acddd9c84526d8611c71ee89d299cf5c978084d /doc
parentcc0d019f5e08f870f94b8fee5f264b287fcecc3c (diff)
Merge changes from CUPS trunk, r6739.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@361 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile5
-rw-r--r--doc/help/api-httpipp.html54
-rw-r--r--doc/help/kerberos.html137
-rw-r--r--doc/help/policies.html80
-rw-r--r--doc/help/spec-ppd.html7
-rw-r--r--doc/images/button-accept-jobs.gifbin527 -> 442 bytes
-rw-r--r--doc/images/button-add-class.gifbin484 -> 387 bytes
-rw-r--r--doc/images/button-add-printer.gifbin487 -> 401 bytes
-rw-r--r--doc/images/button-add-rss-subscription.gifbin717 -> 624 bytes
-rw-r--r--doc/images/button-add-this-printer.gifbin577 -> 477 bytes
-rw-r--r--doc/images/button-cancel-all-jobs.gifbin568 -> 450 bytes
-rw-r--r--doc/images/button-cancel-job.gifbin474 -> 377 bytes
-rw-r--r--doc/images/button-cancel-subscription.gifbin663 -> 568 bytes
-rw-r--r--doc/images/button-change-settings.gifbin615 -> 521 bytes
-rw-r--r--doc/images/button-clean-print-heads.gifbin615 -> 503 bytes
-rw-r--r--doc/images/button-clear.gifbin359 -> 279 bytes
-rw-r--r--doc/images/button-continue.gifbin423 -> 345 bytes
-rw-r--r--doc/images/button-delete-class.gifbin520 -> 406 bytes
-rw-r--r--doc/images/button-delete-printer.gifbin508 -> 412 bytes
-rw-r--r--doc/images/button-edit-configuration-file.gifbin699 -> 562 bytes
-rw-r--r--doc/images/button-export-samba.gifbin771 -> 648 bytes
-rw-r--r--doc/images/button-find-new-printers.gifbin0 -> 509 bytes
-rw-r--r--doc/images/button-help.gifbin327 -> 256 bytes
-rw-r--r--doc/images/button-hold-job.gifbin436 -> 325 bytes
-rw-r--r--doc/images/button-list-available-printers.gifbin708 -> 0 bytes
-rw-r--r--doc/images/button-manage-classes.gifbin619 -> 522 bytes
-rw-r--r--doc/images/button-manage-jobs.gifbin556 -> 450 bytes
-rw-r--r--doc/images/button-manage-printers.gifbin610 -> 508 bytes
-rw-r--r--doc/images/button-manage-server.gifbin599 -> 493 bytes
-rw-r--r--doc/images/button-modify-class.gifbin559 -> 461 bytes
-rw-r--r--doc/images/button-modify-printer.gifbin559 -> 454 bytes
-rw-r--r--doc/images/button-move-job.gifbin463 -> 370 bytes
-rw-r--r--doc/images/button-move-jobs.gifbin574 -> 462 bytes
-rw-r--r--doc/images/button-print-self-test-page.gifbin674 -> 552 bytes
-rw-r--r--doc/images/button-print-test-page.gifbin564 -> 457 bytes
-rw-r--r--doc/images/button-publish-printer.gifbin550 -> 446 bytes
-rw-r--r--doc/images/button-reject-jobs.gifbin509 -> 395 bytes
-rw-r--r--doc/images/button-release-job.gifbin536 -> 428 bytes
-rw-r--r--doc/images/button-restart-job.gifbin493 -> 408 bytes
-rw-r--r--doc/images/button-save-changes.gifbin580 -> 482 bytes
-rw-r--r--doc/images/button-search.gifbin410 -> 332 bytes
-rw-r--r--doc/images/button-set-allowed-users.gifbin673 -> 549 bytes
-rw-r--r--doc/images/button-set-as-default.gifbin585 -> 479 bytes
-rw-r--r--doc/images/button-set-printer-options.gifbin649 -> 541 bytes
-rw-r--r--doc/images/button-show-active.gifbin662 -> 547 bytes
-rw-r--r--doc/images/button-show-all.gifbin570 -> 472 bytes
-rw-r--r--doc/images/button-show-completed.gifbin764 -> 626 bytes
-rw-r--r--doc/images/button-show-next.gifbin514 -> 419 bytes
-rw-r--r--doc/images/button-show-previous.gifbin582 -> 484 bytes
-rw-r--r--doc/images/button-sort-ascending.gifbin699 -> 577 bytes
-rw-r--r--doc/images/button-sort-descending.gifbin723 -> 606 bytes
-rw-r--r--doc/images/button-start-class.gifbin498 -> 397 bytes
-rw-r--r--doc/images/button-start-printer.gifbin500 -> 407 bytes
-rw-r--r--doc/images/button-stop-class.gifbin500 -> 390 bytes
-rw-r--r--doc/images/button-stop-printer.gifbin501 -> 383 bytes
-rw-r--r--doc/images/button-unpublish-printer.gifbin594 -> 499 bytes
-rw-r--r--doc/images/button-use-default-config.gifbin864 -> 731 bytes
-rw-r--r--doc/images/button-view-access-log.gifbin638 -> 534 bytes
-rw-r--r--doc/images/button-view-error-log.gifbin554 -> 473 bytes
-rw-r--r--doc/images/button-view-page-log.gifbin590 -> 496 bytes
-rw-r--r--doc/images/button-view-printable-version.gifbin743 -> 616 bytes
61 files changed, 245 insertions, 38 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 69d17e249..2414de04f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 6733 2007-07-26 18:09:46Z mike $"
#
# Documentation makefile for the Common UNIX Printing System (CUPS).
#
@@ -42,9 +42,9 @@ WEBBUTTONS = \
images/button-delete-printer.gif \
images/button-edit-configuration-file.gif \
images/button-export-samba.gif \
+ images/button-find-new-printers.gif \
images/button-help.gif \
images/button-hold-job.gif \
- images/button-list-available-printers.gif \
images/button-manage-classes.gif \
images/button-manage-jobs.gif \
images/button-manage-printers.gif \
@@ -115,6 +115,7 @@ HELPFILES = \
help/api-raster.html \
help/cgi.html \
help/glossary.html \
+ help/kerberos.html \
help/license.html \
help/man-accept.html \
help/man-backend.html \
diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html
index af6a40dd4..036d97082 100644
--- a/doc/help/api-httpipp.html
+++ b/doc/help/api-httpipp.html
@@ -936,6 +936,7 @@ require CUPS 1.1 or higher.</p>
<li><a href='#httpFlush'><tt>httpFlush()</tt></a> </li>
<li><a href='#httpFlushWrite'><tt>httpFlushWrite()</tt></a> <span class='info'>&nbsp;CUPS 1.2&nbsp;</span></li>
<li><a href='#httpGet'><tt>httpGet()</tt></a> </li>
+ <li><a href='#httpGetAuthString'><tt>httpGetAuthString()</tt></a> <span class='info'>&nbsp;CUPS 1.3&nbsp;</span></li>
<li><a href='#httpGetBlocking'><tt>httpGetBlocking()</tt></a> <span class='info'>&nbsp;CUPS 1.2&nbsp;</span></li>
<li><a href='#httpGetCookie'><tt>httpGetCookie()</tt></a> <span class='info'>&nbsp;CUPS 1.1.19&nbsp;</span></li>
<li><a href='#httpGetDateString'><tt>httpGetDateString()</tt></a> <span class='info'>&nbsp;DEPRECATED&nbsp;</span></li>
@@ -965,6 +966,7 @@ require CUPS 1.1 or higher.</p>
<li><a href='#httpSeparate'><tt>httpSeparate()</tt></a> <span class='info'>&nbsp;DEPRECATED&nbsp;</span></li>
<li><a href='#httpSeparate2'><tt>httpSeparate2()</tt></a> <span class='info'>&nbsp;CUPS 1.1.21&nbsp;</span></li>
<li><a href='#httpSeparateURI'><tt>httpSeparateURI()</tt></a> <span class='info'>&nbsp;CUPS 1.2&nbsp;</span></li>
+ <li><a href='#httpSetAuthString'><tt>httpSetAuthString()</tt></a> <span class='info'>&nbsp;CUPS 1.3&nbsp;</span></li>
<li><a href='#httpSetCookie'><tt>httpSetCookie()</tt></a> <span class='info'>&nbsp;CUPS 1.1.19&nbsp;</span></li>
<li><a href='#httpSetExpect'><tt>httpSetExpect()</tt></a> <span class='info'>&nbsp;CUPS 1.2&nbsp;</span></li>
<li><a href='#httpSetField'><tt>httpSetField()</tt></a> </li>
@@ -1741,6 +1743,30 @@ httpGet(
<h4>Returns</h4>
<p>Status of call (0 = success)</p>
<!-- NEW PAGE -->
+<h3 class='title'><span class='info'>&nbsp;CUPS 1.3&nbsp;</span><a name='httpGetAuthString'>httpGetAuthString()</a></h3>
+<h4>Description</h4>
+<p>Get the current authorization string.
+<p>The authorization string is set by cupsDoAuthentication() and
+httpSetAuthString(). Use httpGetAuthString() to retrieve the
+string to use with httpSetField() for the HTTP_FIELD_AUTHORIZATION
+value.
+
+
+<h4>Syntax</h4>
+<p><tt>
+char *<br>
+httpGetAuthString(
+ <a href='#http_t'>http_t</a> * http);
+</tt></p>
+<h4>Arguments</h4>
+<div class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' summary='Arguments'>
+<thead><tr><th>Name</th><th>Description</th></tr></thead>
+<tbody>
+<tr><td><tt>http</tt></td><td>HTTP connection</td></tr>
+</tbody></table></div>
+<h4>Returns</h4>
+<p>Authorization string</p>
+<!-- NEW PAGE -->
<h3 class='title'><span class='info'>&nbsp;CUPS 1.2&nbsp;</span><a name='httpGetBlocking'>httpGetBlocking()</a></h3>
<h4>Description</h4>
<p>Get the blocking/non-block state of a connection.
@@ -2420,6 +2446,34 @@ httpSeparateURI(
<h4>Returns</h4>
<p>Result of separation</p>
<!-- NEW PAGE -->
+<h3 class='title'><span class='info'>&nbsp;CUPS 1.3&nbsp;</span><a name='httpSetAuthString'>httpSetAuthString()</a></h3>
+<h4>Description</h4>
+<p>Set the current authorization string.
+<p>This function just stores a copy of the current authorization string in
+the HTTP connection object. You must still call httpSetField() to set
+HTTP_FIELD_AUTHORIZATION prior to issuing a HTTP request using httpGet(),
+httpHead(), httpOptions(), httpPost, or httpPut().
+
+
+<h4>Syntax</h4>
+<p><tt>
+void<br>
+httpSetAuthString(
+ <a href='#http_t'>http_t</a> * http,
+ const char * scheme,
+ const char * data);
+</tt></p>
+<h4>Arguments</h4>
+<div class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' summary='Arguments'>
+<thead><tr><th>Name</th><th>Description</th></tr></thead>
+<tbody>
+<tr><td><tt>http</tt></td><td>HTTP connection</td></tr>
+<tr><td><tt>scheme</tt></td><td>Auth scheme (NULL to clear it)</td></tr>
+<tr><td><tt>data</tt></td><td>Auth data (NULL for none)</td></tr>
+</tbody></table></div>
+<h4>Returns</h4>
+<p>Nothing.</p>
+<!-- NEW PAGE -->
<h3 class='title'><span class='info'>&nbsp;CUPS 1.1.19&nbsp;</span><a name='httpSetCookie'>httpSetCookie()</a></h3>
<h4>Description</h4>
<p>Set the cookie value(s)...
diff --git a/doc/help/kerberos.html b/doc/help/kerberos.html
new file mode 100644
index 000000000..a7b0e5ed0
--- /dev/null
+++ b/doc/help/kerberos.html
@@ -0,0 +1,137 @@
+<HTML>
+<!-- SECTION: Getting Started -->
+<HEAD>
+ <TITLE>Using Kerberos Authentication</TITLE>
+</HEAD>
+<BODY>
+
+<P>CUPS 1.3 adds Kerberos support which allows you to use a Key Distribution
+Center (KDC) for authentication on your local CUPS server and when printing
+to a remote authenticated queue. This document describes how to configure
+CUPS to use Kerberos authentication and provides helpful links to the MIT
+help pages for configuring Kerberos on your systems and network.</P>
+
+
+<H2 CLASS="title"><A NAME="KRB5">Configuring Kerberos on Your System</A></H2>
+
+<P>Before you can use Kerberos with CUPS, you will need to configure
+Kerberos on your system and setup a system as a KDC. Because this
+configuration is highly system and site-specific, please consult
+the following on-line resources provided by the creators of Kerberos
+at the Massachussetts Institute of Technology (MIT):</P>
+
+<UL>
+
+ <LI><A HREF="http://web.mit.edu/kerberos/">Kerberos: The Network
+ Authentication Protocol</A></LI>
+
+ <LI><A HREF="http://web.mit.edu/macdev/KfM/Common/Documentation/faq-osx.html">Kerberos
+ on Mac OS X Frequently Asked Questions</A></LI>
+
+</UL>
+
+<P>The Linux Documentation Project also has a HOWTO on Kerberos:</P>
+
+<UL>
+
+ <LI><A HREF="http://tldp.org/HOWTO/html_single/Kerberos-Infrastructure-HOWTO/">Kerberos
+ Infrastructure HOWTO</A></LI>
+
+</UL>
+
+
+<H2 CLASS="title"><A NAME="CUPS">Configuring CUPS to Use Kerberos</A></H2>
+
+<P>Once you have configured Kerberos on your system(s), you can then
+enable Kerberos authentication by selecting the <tt>Negotiate</tt>
+authentication type. The simplest way to do this is using the
+<tt>cupsctl(8)</tt> command:</P>
+
+<PRE CLASS="command">
+<KBD>cupsctl DefaultAuthType=Negotiate</KBD>
+</PRE>
+
+<P>You can also enable Kerberos from the web interface by checking the
+<VAR>Use Kerberos Authentication</VAR> box and clicking <VAR>Change
+Settings</VAR>:</P>
+
+<PRE CLASS="command">
+http://localhost:631/admin
+</PRE>
+
+<P>After you have enabled Kerberos authentication, add <tt>AuthType Default</tt>
+lines to the policies you want to protect with authentication, for example:</P>
+
+<PRE CLASS="command">
+<EM>Listing 1: <A NAME="LISTING01">Remote Printer Operation Policy</A></EM>
+
+ 1 &lt;Policy remote>
+ 2 # Job-related operations must be done by the owner or an
+ administrator...
+ 3 &lt;Limit Send-Document Send-URI Hold-Job Release-Job
+ Restart-Job Purge-Jobs Set-Job-Attributes
+ Create-Job-Subscription Renew-Subscription
+ Cancel-Subscription Get-Notifications Reprocess-Job
+ Cancel-Current-Job Suspend-Current-Job Resume-Job
+ CUPS-Move-Job>
+ 4 AuthType Default
+ 5 Require user @OWNER @SYSTEM
+ 6 Order deny,allow
+ 7 &lt;/Limit>
+ 8
+ 9 # Require authentication when creating jobs
+10 &lt;Limit Create-Job Print-Job Print-URI>
+11 AuthType Default
+12 Require valid-user
+13 Order deny,allow
+14 &lt;/Limit>
+15
+16 # All administration operations require an administrator
+ to authenticate...
+17 &lt;Limit CUPS-Add-Printer CUPS-Delete-Printer
+ CUPS-Add-Class CUPS-Delete-Class CUPS-Set-Default>
+18 AuthType Default
+19 Require user @SYSTEM
+20 Order deny,allow
+21 &lt;/Limit>
+22
+23 # All printer operations require a printer operator
+ to authenticate...
+24 &lt;Limit Pause-Printer Resume-Printer
+ Set-Printer-Attributes Enable-Printer Disable-Printer
+ Pause-Printer-After-Current-Job Hold-New-Jobs
+ Release-Held-New-Jobs Deactivate-Printer Activate-Printer
+ Restart-Printer Shutdown-Printer Startup-Printer
+ Promote-Job Schedule-Job-After CUPS-Accept-Jobs
+ CUPS-Reject-Jobs>
+25 AuthType Default
+26 Require user <em>varies by OS</em>
+27 Order deny,allow
+28 &lt;/Limit>
+29
+30 # Only the owner or an administrator can cancel or
+ authenticate a job...
+31 &lt;Limit Cancel-Job CUPS-Authenticate-Job>
+32 Require user @OWNER @SYSTEM
+33 Order deny,allow
+34 &lt;/Limit>
+35
+36 &lt;Limit All>
+37 Order deny,allow
+38 &lt;/Limit>
+39 &lt;/Policy>
+</PRE>
+
+
+<H2 CLASS="title"><A NAME="IMPLEMENT">Implementation Information</A></H2>
+
+<P>CUPS implements Kerberos over HTTP using GSS API and the service name
+"ipp". Delegation of credentials (needed for remote printers with
+authentication) is only supported when using a single KDC on your network.</P>
+
+<P>After getting a user's Kerberos credentials, CUPS strips the "@KDC"
+portion of the username so that it can check the group membership locally,
+effectively treating the Kerberos account as a local user account.</P>
+
+</BODY>
+</HTML>
diff --git a/doc/help/policies.html b/doc/help/policies.html
index 804fc3e9e..a90617968 100644
--- a/doc/help/policies.html
+++ b/doc/help/policies.html
@@ -54,7 +54,7 @@ trying to use the new policy.</P>
1 &lt;Policy default>
2 # Job-related operations must be done by the owner or an
- adminstrator...
+ administrator...
3 &lt;Limit Send-Document Send-URI Hold-Job Release-Job
Restart-Job Purge-Jobs Set-Job-Attributes
Create-Job-Subscription Renew-Subscription
@@ -65,32 +65,40 @@ trying to use the new policy.</P>
5 Order deny,allow
6 &lt;/Limit>
7
- 8 # All administration operations require an adminstrator
+ 8 # All administration operations require an administrator
to authenticate...
- 9 &lt;Limit Pause-Printer Resume-Printer
- Set-Printer-Attributes Enable-Printer Disable-Printer
- Pause-Printer-After-Current-Job Hold-New-Jobs
- Release-Held-New-Jobs Deactivate-Printer Activate-Printer
- Restart-Printer Shutdown-Printer Startup-Printer
- Promote-Job Schedule-Job-After CUPS-Add-Printer
- CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class
- CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
-10 AuthType Basic
+ 9 &lt;Limit CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class
+ CUPS-Delete-Class CUPS-Set-Default>
+10 AuthType Default
11 Require user @SYSTEM
12 Order deny,allow
13 &lt;/Limit>
14
-15 # Only the owner or an administrator can cancel or
+15 # All printer operations require a printer operator
+ to authenticate...
+16 &lt;Limit Pause-Printer Resume-Printer
+ Set-Printer-Attributes Enable-Printer Disable-Printer
+ Pause-Printer-After-Current-Job Hold-New-Jobs
+ Release-Held-New-Jobs Deactivate-Printer Activate-Printer
+ Restart-Printer Shutdown-Printer Startup-Printer
+ Promote-Job Schedule-Job-After CUPS-Accept-Jobs
+ CUPS-Reject-Jobs>
+17 AuthType Default
+18 Require user <em>varies by OS</em>
+19 Order deny,allow
+20 &lt;/Limit>
+21
+22 # Only the owner or an administrator can cancel or
authenticate a job...
-16 &lt;Limit Cancel-Job CUPS-Authenticate-Job>
-17 Require user @OWNER @SYSTEM
-18 Order deny,allow
-19 &lt;/Limit>
-20
-21 &lt;Limit All>
-22 Order deny,allow
-23 &lt;/Limit>
-24 &lt;/Policy>
+23 &lt;Limit Cancel-Job CUPS-Authenticate-Job>
+24 Require user @OWNER @SYSTEM
+25 Order deny,allow
+26 &lt;/Limit>
+27
+28 &lt;Limit All>
+29 Order deny,allow
+30 &lt;/Limit>
+31 &lt;/Policy>
</PRE>
<H3>The Default CUPS Operation Policy</H3>
@@ -139,18 +147,26 @@ however, <em>do</em> use the <TT>AuthType</TT> directive, and so
administrative operations need to be authenticated:</P>
<PRE CLASS="command">
- 9 &lt;Limit Pause-Printer Resume-Printer
+ 9 &lt;Limit CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class
+ CUPS-Delete-Class CUPS-Set-Default>
+10 AuthType Default
+11 Require user @SYSTEM
+12 Order deny,allow
+13 &lt;/Limit>
+14
+15 # All printer operations require a printer operator
+ to authenticate...
+16 &lt;Limit Pause-Printer Resume-Printer
Set-Printer-Attributes Enable-Printer Disable-Printer
Pause-Printer-After-Current-Job Hold-New-Jobs
Release-Held-New-Jobs Deactivate-Printer Activate-Printer
Restart-Printer Shutdown-Printer Startup-Printer
- Promote-Job Schedule-Job-After CUPS-Add-Printer
- CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class
- CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
-10 AuthType Basic
-11 Require user @SYSTEM
-12 Order deny,allow
-13 &lt;/Limit>
+ Promote-Job Schedule-Job-After CUPS-Accept-Jobs
+ CUPS-Reject-Jobs>
+17 AuthType Default
+18 Require user <em>varies by OS</em>
+19 Order deny,allow
+20 &lt;/Limit>
</PRE>
<P>The "Order deny,allow" line at the end of both <TT>Limit</TT>
@@ -602,7 +618,7 @@ management operations.</P>
1 &lt;Policy lab999>
2 # Job- and subscription-related operations must be done
- by the owner, a lab technician, or an adminstrator...
+ by the owner, a lab technician, or an administrator...
3 &lt;Limit Send-Document Send-URI Hold-Job Release-Job
Restart-Job Purge-Jobs Set-Job-Attributes
Create-Job-Subscription Renew-Subscription
@@ -615,7 +631,7 @@ management operations.</P>
7 &lt;/Limit>
8
9 # All administration operations require a lab technician
- or an adminstrator to authenticate...
+ or an administrator to authenticate...
10 &lt;Limit Pause-Printer Resume-Printer
Set-Printer-Attributes Enable-Printer Disable-Printer
Pause-Printer-After-Current-Job Hold-New-Jobs
@@ -623,7 +639,7 @@ management operations.</P>
Restart-Printer Shutdown-Printer Startup-Printer
Promote-Job Schedule-Job-After CUPS-Accept-Jobs
CUPS-Reject-Jobs CUPS-Set-Default>
-11 AuthType Basic
+11 AuthType Default
12 Require user @lab999 @SYSTEM
13 Order allow,deny
14 Allow from 10.0.2.0/24
diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index 07562a660..b8f420dde 100644
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -8,7 +8,7 @@
</head>
<body>
<!--
- "$Id: spec-ppd.html 6646 2007-07-10 22:56:04Z mike $"
+ "$Id: spec-ppd.html 6726 2007-07-25 20:50:26Z mike $"
CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
@@ -95,8 +95,7 @@ for this printer driver.</p>
<p>This boolean attribute notifies the RIP filters that the
destination printer does not require the top and bottom margins
of the <tt>ImageableArea</tt> swapped for the back page. The
-default is <tt>true</tt> when <tt>cupsFlipDuplex</tt> is
-<tt>true</tt> or <tt>cupsBackSide</tt> is <tt>Flipped</tt>
+default is <tt>true</tt> when <tt>cupsBackSide</tt> is <tt>Flipped</tt>
and <tt>false</tt> otherwise.</p>
<p>Example:</p>
@@ -228,7 +227,7 @@ specified, <tt>cupsFlipDuplex</tt> will be ignored.</blockquote>
*cupsBackSide: Rotated
</pre>
-<p>Also see the related <tt>APDuplexRequiresFlippedMargins</tt>
+<p>Also see the related <tt>APDuplexRequiresFlippedMargin</tt>
attribute.</p>
<h3>cupsEvenDuplex</h3>
diff --git a/doc/images/button-accept-jobs.gif b/doc/images/button-accept-jobs.gif
index acbf73f66..e50ef1b79 100644
--- a/doc/images/button-accept-jobs.gif
+++ b/doc/images/button-accept-jobs.gif
Binary files differ
diff --git a/doc/images/button-add-class.gif b/doc/images/button-add-class.gif
index 14de2d082..c02d95f04 100644
--- a/doc/images/button-add-class.gif
+++ b/doc/images/button-add-class.gif
Binary files differ
diff --git a/doc/images/button-add-printer.gif b/doc/images/button-add-printer.gif
index 4c4f96d53..91fe87158 100644
--- a/doc/images/button-add-printer.gif
+++ b/doc/images/button-add-printer.gif
Binary files differ
diff --git a/doc/images/button-add-rss-subscription.gif b/doc/images/button-add-rss-subscription.gif
index 07fff27d1..541f196ec 100644
--- a/doc/images/button-add-rss-subscription.gif
+++ b/doc/images/button-add-rss-subscription.gif
Binary files differ
diff --git a/doc/images/button-add-this-printer.gif b/doc/images/button-add-this-printer.gif
index 418958e2d..fec894382 100644
--- a/doc/images/button-add-this-printer.gif
+++ b/doc/images/button-add-this-printer.gif
Binary files differ
diff --git a/doc/images/button-cancel-all-jobs.gif b/doc/images/button-cancel-all-jobs.gif
index 7a8b64ec2..17254fe75 100644
--- a/doc/images/button-cancel-all-jobs.gif
+++ b/doc/images/button-cancel-all-jobs.gif
Binary files differ
diff --git a/doc/images/button-cancel-job.gif b/doc/images/button-cancel-job.gif
index 41d347f33..cdbd346a5 100644
--- a/doc/images/button-cancel-job.gif
+++ b/doc/images/button-cancel-job.gif
Binary files differ
diff --git a/doc/images/button-cancel-subscription.gif b/doc/images/button-cancel-subscription.gif
index aebdb2a9f..93a5d1dde 100644
--- a/doc/images/button-cancel-subscription.gif
+++ b/doc/images/button-cancel-subscription.gif
Binary files differ
diff --git a/doc/images/button-change-settings.gif b/doc/images/button-change-settings.gif
index 86fc66803..b13ebbf2c 100644
--- a/doc/images/button-change-settings.gif
+++ b/doc/images/button-change-settings.gif
Binary files differ
diff --git a/doc/images/button-clean-print-heads.gif b/doc/images/button-clean-print-heads.gif
index 94d42c1cd..8218b7f06 100644
--- a/doc/images/button-clean-print-heads.gif
+++ b/doc/images/button-clean-print-heads.gif
Binary files differ
diff --git a/doc/images/button-clear.gif b/doc/images/button-clear.gif
index dcb9c44f1..381083af9 100644
--- a/doc/images/button-clear.gif
+++ b/doc/images/button-clear.gif
Binary files differ
diff --git a/doc/images/button-continue.gif b/doc/images/button-continue.gif
index ea84c2b01..6219b3dbd 100644
--- a/doc/images/button-continue.gif
+++ b/doc/images/button-continue.gif
Binary files differ
diff --git a/doc/images/button-delete-class.gif b/doc/images/button-delete-class.gif
index c60b07118..200875537 100644
--- a/doc/images/button-delete-class.gif
+++ b/doc/images/button-delete-class.gif
Binary files differ
diff --git a/doc/images/button-delete-printer.gif b/doc/images/button-delete-printer.gif
index 6812fc5ad..a46c7c738 100644
--- a/doc/images/button-delete-printer.gif
+++ b/doc/images/button-delete-printer.gif
Binary files differ
diff --git a/doc/images/button-edit-configuration-file.gif b/doc/images/button-edit-configuration-file.gif
index 933f3bb4f..927185981 100644
--- a/doc/images/button-edit-configuration-file.gif
+++ b/doc/images/button-edit-configuration-file.gif
Binary files differ
diff --git a/doc/images/button-export-samba.gif b/doc/images/button-export-samba.gif
index 168b20f64..7a953f3a6 100644
--- a/doc/images/button-export-samba.gif
+++ b/doc/images/button-export-samba.gif
Binary files differ
diff --git a/doc/images/button-find-new-printers.gif b/doc/images/button-find-new-printers.gif
new file mode 100644
index 000000000..7c2fff66a
--- /dev/null
+++ b/doc/images/button-find-new-printers.gif
Binary files differ
diff --git a/doc/images/button-help.gif b/doc/images/button-help.gif
index f08a95f85..5a16732cf 100644
--- a/doc/images/button-help.gif
+++ b/doc/images/button-help.gif
Binary files differ
diff --git a/doc/images/button-hold-job.gif b/doc/images/button-hold-job.gif
index 0d20d50a6..d128740f2 100644
--- a/doc/images/button-hold-job.gif
+++ b/doc/images/button-hold-job.gif
Binary files differ
diff --git a/doc/images/button-list-available-printers.gif b/doc/images/button-list-available-printers.gif
deleted file mode 100644
index e9a18fa10..000000000
--- a/doc/images/button-list-available-printers.gif
+++ /dev/null
Binary files differ
diff --git a/doc/images/button-manage-classes.gif b/doc/images/button-manage-classes.gif
index 264d9f885..6110a8ebb 100644
--- a/doc/images/button-manage-classes.gif
+++ b/doc/images/button-manage-classes.gif
Binary files differ
diff --git a/doc/images/button-manage-jobs.gif b/doc/images/button-manage-jobs.gif
index 07d2543c2..4f5bba5c4 100644
--- a/doc/images/button-manage-jobs.gif
+++ b/doc/images/button-manage-jobs.gif
Binary files differ
diff --git a/doc/images/button-manage-printers.gif b/doc/images/button-manage-printers.gif
index fd87b6b9f..eb1fae65d 100644
--- a/doc/images/button-manage-printers.gif
+++ b/doc/images/button-manage-printers.gif
Binary files differ
diff --git a/doc/images/button-manage-server.gif b/doc/images/button-manage-server.gif
index 79e8325cb..1cd47a5b8 100644
--- a/doc/images/button-manage-server.gif
+++ b/doc/images/button-manage-server.gif
Binary files differ
diff --git a/doc/images/button-modify-class.gif b/doc/images/button-modify-class.gif
index 2db094a45..52c4cb6cc 100644
--- a/doc/images/button-modify-class.gif
+++ b/doc/images/button-modify-class.gif
Binary files differ
diff --git a/doc/images/button-modify-printer.gif b/doc/images/button-modify-printer.gif
index 14bda3e71..d654c8021 100644
--- a/doc/images/button-modify-printer.gif
+++ b/doc/images/button-modify-printer.gif
Binary files differ
diff --git a/doc/images/button-move-job.gif b/doc/images/button-move-job.gif
index 1de4b99e0..5f4d59262 100644
--- a/doc/images/button-move-job.gif
+++ b/doc/images/button-move-job.gif
Binary files differ
diff --git a/doc/images/button-move-jobs.gif b/doc/images/button-move-jobs.gif
index c71163346..e5415e403 100644
--- a/doc/images/button-move-jobs.gif
+++ b/doc/images/button-move-jobs.gif
Binary files differ
diff --git a/doc/images/button-print-self-test-page.gif b/doc/images/button-print-self-test-page.gif
index 28363adc9..d8c59ad09 100644
--- a/doc/images/button-print-self-test-page.gif
+++ b/doc/images/button-print-self-test-page.gif
Binary files differ
diff --git a/doc/images/button-print-test-page.gif b/doc/images/button-print-test-page.gif
index 1e8490087..faea1b340 100644
--- a/doc/images/button-print-test-page.gif
+++ b/doc/images/button-print-test-page.gif
Binary files differ
diff --git a/doc/images/button-publish-printer.gif b/doc/images/button-publish-printer.gif
index 0b4f529b1..7b20e0250 100644
--- a/doc/images/button-publish-printer.gif
+++ b/doc/images/button-publish-printer.gif
Binary files differ
diff --git a/doc/images/button-reject-jobs.gif b/doc/images/button-reject-jobs.gif
index 8bf99f4a4..093bfc9f9 100644
--- a/doc/images/button-reject-jobs.gif
+++ b/doc/images/button-reject-jobs.gif
Binary files differ
diff --git a/doc/images/button-release-job.gif b/doc/images/button-release-job.gif
index b3824c30e..ca9ef1443 100644
--- a/doc/images/button-release-job.gif
+++ b/doc/images/button-release-job.gif
Binary files differ
diff --git a/doc/images/button-restart-job.gif b/doc/images/button-restart-job.gif
index cdeb955ee..bd319cab0 100644
--- a/doc/images/button-restart-job.gif
+++ b/doc/images/button-restart-job.gif
Binary files differ
diff --git a/doc/images/button-save-changes.gif b/doc/images/button-save-changes.gif
index cdadb398e..b23a8249e 100644
--- a/doc/images/button-save-changes.gif
+++ b/doc/images/button-save-changes.gif
Binary files differ
diff --git a/doc/images/button-search.gif b/doc/images/button-search.gif
index 6db926b53..a3f7f895b 100644
--- a/doc/images/button-search.gif
+++ b/doc/images/button-search.gif
Binary files differ
diff --git a/doc/images/button-set-allowed-users.gif b/doc/images/button-set-allowed-users.gif
index 27c003704..768f34c6b 100644
--- a/doc/images/button-set-allowed-users.gif
+++ b/doc/images/button-set-allowed-users.gif
Binary files differ
diff --git a/doc/images/button-set-as-default.gif b/doc/images/button-set-as-default.gif
index fa89e6601..ec976a024 100644
--- a/doc/images/button-set-as-default.gif
+++ b/doc/images/button-set-as-default.gif
Binary files differ
diff --git a/doc/images/button-set-printer-options.gif b/doc/images/button-set-printer-options.gif
index 04cd56bc7..174cfde2a 100644
--- a/doc/images/button-set-printer-options.gif
+++ b/doc/images/button-set-printer-options.gif
Binary files differ
diff --git a/doc/images/button-show-active.gif b/doc/images/button-show-active.gif
index b2e8cbe22..99cb9c64d 100644
--- a/doc/images/button-show-active.gif
+++ b/doc/images/button-show-active.gif
Binary files differ
diff --git a/doc/images/button-show-all.gif b/doc/images/button-show-all.gif
index 764fb5928..fca881dab 100644
--- a/doc/images/button-show-all.gif
+++ b/doc/images/button-show-all.gif
Binary files differ
diff --git a/doc/images/button-show-completed.gif b/doc/images/button-show-completed.gif
index 2a5c0e9c6..c93f1d458 100644
--- a/doc/images/button-show-completed.gif
+++ b/doc/images/button-show-completed.gif
Binary files differ
diff --git a/doc/images/button-show-next.gif b/doc/images/button-show-next.gif
index 181779544..bc1576a2d 100644
--- a/doc/images/button-show-next.gif
+++ b/doc/images/button-show-next.gif
Binary files differ
diff --git a/doc/images/button-show-previous.gif b/doc/images/button-show-previous.gif
index b0c74b287..823f42822 100644
--- a/doc/images/button-show-previous.gif
+++ b/doc/images/button-show-previous.gif
Binary files differ
diff --git a/doc/images/button-sort-ascending.gif b/doc/images/button-sort-ascending.gif
index ec3510647..bc90aa4cf 100644
--- a/doc/images/button-sort-ascending.gif
+++ b/doc/images/button-sort-ascending.gif
Binary files differ
diff --git a/doc/images/button-sort-descending.gif b/doc/images/button-sort-descending.gif
index 1b826f865..12ff5f44f 100644
--- a/doc/images/button-sort-descending.gif
+++ b/doc/images/button-sort-descending.gif
Binary files differ
diff --git a/doc/images/button-start-class.gif b/doc/images/button-start-class.gif
index 8d66a46a8..8022c64f5 100644
--- a/doc/images/button-start-class.gif
+++ b/doc/images/button-start-class.gif
Binary files differ
diff --git a/doc/images/button-start-printer.gif b/doc/images/button-start-printer.gif
index 33660a011..34acfa218 100644
--- a/doc/images/button-start-printer.gif
+++ b/doc/images/button-start-printer.gif
Binary files differ
diff --git a/doc/images/button-stop-class.gif b/doc/images/button-stop-class.gif
index 6d84fb2f6..794cbe628 100644
--- a/doc/images/button-stop-class.gif
+++ b/doc/images/button-stop-class.gif
Binary files differ
diff --git a/doc/images/button-stop-printer.gif b/doc/images/button-stop-printer.gif
index 1c71ee69f..c0cac7e6c 100644
--- a/doc/images/button-stop-printer.gif
+++ b/doc/images/button-stop-printer.gif
Binary files differ
diff --git a/doc/images/button-unpublish-printer.gif b/doc/images/button-unpublish-printer.gif
index 5e79064d2..e2d1af3f8 100644
--- a/doc/images/button-unpublish-printer.gif
+++ b/doc/images/button-unpublish-printer.gif
Binary files differ
diff --git a/doc/images/button-use-default-config.gif b/doc/images/button-use-default-config.gif
index 5f1e7219e..0e3a90df3 100644
--- a/doc/images/button-use-default-config.gif
+++ b/doc/images/button-use-default-config.gif
Binary files differ
diff --git a/doc/images/button-view-access-log.gif b/doc/images/button-view-access-log.gif
index 16c953b29..b27a13d36 100644
--- a/doc/images/button-view-access-log.gif
+++ b/doc/images/button-view-access-log.gif
Binary files differ
diff --git a/doc/images/button-view-error-log.gif b/doc/images/button-view-error-log.gif
index caa62b8c4..ae62813c0 100644
--- a/doc/images/button-view-error-log.gif
+++ b/doc/images/button-view-error-log.gif
Binary files differ
diff --git a/doc/images/button-view-page-log.gif b/doc/images/button-view-page-log.gif
index c49bfb5ac..c3291b17c 100644
--- a/doc/images/button-view-page-log.gif
+++ b/doc/images/button-view-page-log.gif
Binary files differ
diff --git a/doc/images/button-view-printable-version.gif b/doc/images/button-view-printable-version.gif
index 693dd43a1..903a51af6 100644
--- a/doc/images/button-view-printable-version.gif
+++ b/doc/images/button-view-printable-version.gif
Binary files differ