Merge changes from CUPS 1.6svn-r10437.

[thirdparty/cups.git] / doc / help / ref-printers-conf.html

diff --git a/doc/help/ref-printers-conf.html b/doc/help/ref-printers-conf.html
index 9568fc7c83bc4c6b16dd166eb958af1a56f38182..bb44c4c68f25443eb24b756ab4b53e7c81345c9e 100644 (file)
--- a/doc/help/ref-printers-conf.html
+++ b/doc/help/ref-printers-conf.html
@@ -151,7 +151,7 @@ HREF="#AllowUser"><CODE>AllowUser</CODE></A></P>
 
 <H3>Description</H3>
 
-<P>The <CODE>DeviceURI</CODE> directive defines the value of the 
+<P>The <CODE>DeviceURI</CODE> directive defines the value of the
 <VAR>device-uri-attribute</VAR> attribute. It is normally set
 using the <CODE>lpadmin(8)</CODE> command:</P>
 
@@ -248,7 +248,7 @@ in the printer's PPD file.</P>
 
 <H3>Description</H3>
 
-<P>The <CODE>Info</CODE> directive defines the string for the 
+<P>The <CODE>Info</CODE> directive defines the string for the
 <VAR>printer-info</VAR> attribute. It is normally set using the
 <CODE>lpadmin(8)</CODE> command:</P>
 
@@ -337,7 +337,7 @@ section.</P>
 
 <H3>Description</H3>
 
-<P>The <CODE>KLimit</CODE> directive defines the value of the 
+<P>The <CODE>KLimit</CODE> directive defines the value of the
 <VAR>job-k-limit</VAR> attribute. It is normally set using the
 <CODE>lpadmin(8)</CODE> command:</P>
 
@@ -364,7 +364,7 @@ section.</P>
 
 <H3>Description</H3>
 
-<P>The <CODE>Location</CODE> directive defines the string for the 
+<P>The <CODE>Location</CODE> directive defines the string for the
 <VAR>printer-location</VAR> attribute. It is normally set using the
 <CODE>lpadmin(8)</CODE> command:</P>
 
@@ -449,7 +449,7 @@ section.</P>
 
 <H3>Description</H3>
 
-<P>The <CODE>PageLimit</CODE> directive defines the value of the 
+<P>The <CODE>PageLimit</CODE> directive defines the value of the
 <VAR>job-page-limit</VAR> attribute. It can be set using the
 <CODE>lpadmin(8)</CODE> command:</P>
 
@@ -665,7 +665,7 @@ section.</P>
 <PRE CLASS="command">
 &lt;Printer name&gt;
   ...
-  StateMessage Ready to print.
+  StateMessage Printer is lonely.
 &lt;/Printer&gt;
 </PRE>
 
@@ -682,7 +682,6 @@ StateMessage Network host host_name is busy; will retry in 30 seconds...
 StateMessage Printer busy; will retry in 10 seconds...
 StateMessage Printer is busy; retrying print job...
 StateMessage Print file accepted - job ID id_number.
-StateMessage Ready to print.
 StateMessage Waiting for job to complete
 </PRE>