Merge changes from 1.1.x into 1.2 devel.

[thirdparty/cups.git] / conf / cupsd.conf

diff --git a/conf/cupsd.conf b/conf/cupsd.conf
index 462abc150280a17014a885f6163dffee13898bc6..e03f97e07981cdeb94e122cb0cb9c7422ae9c482 100644 (file)
--- a/conf/cupsd.conf
+++ b/conf/cupsd.conf
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf,v 1.32.2.1 2001/04/02 19:51:42 mike Exp $"
+# "$Id: cupsd.conf,v 1.32.2.2 2001/12/26 16:52:09 mike Exp $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.
@@ -75,6 +75,7 @@
 # Classification: the classification level of the server.  If set, this
 # classification is displayed on all pages, and raw printing is disabled.
 # The default is the empty string.
+#
 
 #Classification classified
 #Classification confidential
@@ -82,6 +83,17 @@
 #Classification topsecret
 #Classification unclassified
 
+#
+# ClassifyOverride: whether to allow users to override the classification
+# on printouts. If enabled, users can limit banner pages to before or
+# after the job, and can change the classification of a job, but cannot
+# completely eliminate the classification or banners.
+#
+# The default is off.
+#
+
+#ClassifyOverride off
+
 #
 # DataDir: the root directory for the CUPS data files.
 # By default /usr/share/cups.
@@ -184,10 +196,10 @@ LogLevel info
 
 #
 # MaxJobs: maximum number of jobs to keep in memory (active and completed.)
-# Default is 0 (no limit.)
+# Default is 500; the value 0 is used for no limit.
 #
 
-#MaxJobs 0
+#MaxJobs 500
 
 #
 # Printcap: the name of the printcap file.  Default is /etc/printcap.
@@ -370,6 +382,25 @@ Port 631
 
 #Browsing On
 
+#
+# BrowseProtocols: which protocols to use for browsing.  Can be
+# any of the following separated by whitespace and/or commas:
+#
+#     all  - Use all supported protocols.
+#     cups - Use the CUPS browse protocol.
+#     slp  - Use the SLPv2 protocol.
+#
+# The default is "cups".
+#
+# NOTE: If you choose to use SLPv2, it is *strongly* recommended that
+#       you have at least one SLP Directory Agent (DA) on your
+#       network.  Otherwise, browse updates can take several seconds,
+#       during which the scheduler will not response to client
+#       requests.
+#
+
+#BrowseProtocols cups
+
 #
 # BrowseAddress: specifies a broadcast address to be used.  By
 # default browsing information is not sent!
@@ -494,6 +525,36 @@ Port 631
 
 #ImplicitClasses On
 
+#
+# ImplicitAnyClasses: whether or not to create "AnyPrinter" implicit
+# classes.
+#
+# When ImplicitAnyClasses is On and a local queue of the same name
+# exists, e.g. "printer", "printer@server1", "printer@server1", then
+# an implicit class called "Anyprinter" is created instead.
+#
+# When ImplicitAnyClasses is Off, implicit classes are not created
+# when there is a local queue of the same name.
+#
+# Disabled by default.
+#
+
+#ImplicitAnyCLasses Off
+
+#
+# HideImplicitMembers: whether or not to show the members of an
+# implicit class.
+#
+# When HideImplicitMembers is On, any remote printers that are
+# part of an implicit class are hidden from the user, who will
+# then only see a single queue even though many queues will be
+# supporting the implicit class.
+#
+# Enabled by default.
+#
+
+#HideImplicitMembers On
+
 
 ########
 ######## Security Options
@@ -654,5 +715,5 @@ Allow From 127.0.0.1
 </Location>
 
 #
-# End of "$Id: cupsd.conf,v 1.32.2.1 2001/04/02 19:51:42 mike Exp $".
+# End of "$Id: cupsd.conf,v 1.32.2.2 2001/12/26 16:52:09 mike Exp $".
 #