Index: doc/help/ref-cupsd-conf.html
===================================================================
--- doc/help/ref-cupsd-conf.html	(revision 6431)
+++ doc/help/ref-cupsd-conf.html	(working copy)
@@ -1078,6 +1078,41 @@
 information to the system log instead of a plain file.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.3</SPAN><A NAME="ErrorPolicy">ErrorPolicy</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+ErrorPolicy abort-job
+ErrorPolicy retry-job
+ErrorPolicy stop-printer
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>ErrorPolicy</CODE> directive defines the default policy that
+is used when a backend is unable to send a print job to the
+printer.</P>
+
+<P>The following values are supported:</P>
+
+<UL>
+
+	<LI><CODE>abort-job</CODE> - Abort the job and proceed
+	with the next job in the queue</LI>
+
+	<LI><CODE>retry-job</CODE> - Retry the job after waiting
+	for N seconds; the <VAR>cupsd.conf</VAR> <A
+	HREF="#JobRetryInterval"><CODE>JobRetryInterval</CODE></A>
+	directive controls the value of N</LI>
+
+	<LI><CODE>stop-printer</CODE> - Stop the printer and keep
+	the job for future printing; this is the default
+	value</LI>
+
+</UL>
+
+
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
 
 <H3>Examples</H3>
Index: scheduler/conf.c
===================================================================
--- scheduler/conf.c	(revision 6431)
+++ scheduler/conf.c	(working copy)
@@ -116,6 +116,7 @@
   { "DefaultShared",		&DefaultShared,		CUPSD_VARTYPE_BOOLEAN },
   { "DocumentRoot",		&DocumentRoot,		CUPSD_VARTYPE_STRING },
   { "ErrorLog",			&ErrorLog,		CUPSD_VARTYPE_STRING },
+  { "ErrorPolicy",		&ErrorPolicy,		CUPSD_VARTYPE_STRING },
   { "FileDevice",		&FileDevice,		CUPSD_VARTYPE_BOOLEAN },
   { "FilterLimit",		&FilterLimit,		CUPSD_VARTYPE_INTEGER },
   { "FilterNice",		&FilterNice,		CUPSD_VARTYPE_INTEGER },
@@ -431,6 +432,8 @@
   cupsdClearString(&BrowseLocalOptions);
   cupsdClearString(&BrowseRemoteOptions);
 
+  cupsdSetString(&ErrorPolicy, "stop-printer");
+
 #ifdef HAVE_LDAP
   cupsdClearString(&BrowseLDAPBindDN);
   cupsdClearString(&BrowseLDAPDN);
Index: scheduler/conf.h
===================================================================
--- scheduler/conf.h	(revision 6431)
+++ scheduler/conf.h	(working copy)
@@ -97,6 +97,8 @@
 					/* Default charset */
 			*DefaultLocale		VALUE(NULL),
 					/* Default locale */
+			*ErrorPolicy		VALUE(NULL),
+					/* Default printer-error-policy */
 			*RIPCache		VALUE(NULL),
 					/* Amount of memory for RIPs */
 			*TempDir		VALUE(NULL),
Index: scheduler/printers.c
===================================================================
--- scheduler/printers.c	(revision 6433)
+++ scheduler/printers.c	(working copy)
@@ -124,7 +124,7 @@
   cupsdSetString(&p->job_sheets[0], "none");
   cupsdSetString(&p->job_sheets[1], "none");
 
-  cupsdSetString(&p->error_policy, "stop-printer");
+  cupsdSetString(&p->error_policy, ErrorPolicy);
   cupsdSetString(&p->op_policy, DefaultPolicy);
 
   p->op_policy_ptr = DefaultPolicyPtr;