[Zope-Checkins] CVS: Zope/skel/etc - zope.conf.in:1.6.2.12

[Chris McDonough]

Update of /cvs-repository/Zope/skel/etc
In directory cvs.zope.org:/tmp/cvs-serv15277/skel/etc

Modified Files:
      Tag: Zope-2_7-branch
	zope.conf.in 
Log Message:
Backport the warnfilter and mime-types features from the HEAD into the 2.7 branch.


=== Zope/skel/etc/zope.conf.in 1.6.2.11 => 1.6.2.12 ===
--- Zope/skel/etc/zope.conf.in:1.6.2.11	Sat Dec 20 12:03:06 2003
+++ Zope/skel/etc/zope.conf.in	Sun Dec 21 21:33:43 2003
@@ -278,6 +278,18 @@
 #    lock-filename /home/chrism/projects/sessions/var/Z2.lock
 
 
+# Directive: mime-types
+#
+# Description:
+#     Tells Zope about additional mime.types files that should be
+#     loaded.  The files have the same format as the mime.types file
+#     distributed with Apache.  The "mime-types" setting may be given
+#     more than once in the configuration file.
+#
+# Example:
+#
+#     mime-types  $INSTANCE/etc/mime.types
+
 
 # Directive: structured-text-header-level
 #
@@ -680,6 +692,51 @@
 #   </nteventlog-handler>
 # </logger>
 
+# Directive: warnfilter
+#
+# Description:
+#     A section that allows you to define a warning filter.
+#     The following keys are valid within a warnfilter section:
+#
+#      action:  one of the following strings:
+#
+#           "error"   turn matching warnings into exceptions
+#           "ignore"  never print matching warnings
+#           "always"  always print matching warnings
+#           "default" print the first occurrence of matching warnings
+#                     for each location where the warning is issued
+#           "module"  print the first occurrence of matching warnings
+#                     for each module where the warning is issued
+#           "once"    print only the first occurrence of matching
+#                     warnings, regardless of location
+#
+#      message:  a string containing a regular expression that the
+#                warning message must match (the match is compiled to
+#                always be case-insensitive)
+#
+#      category: a Python dotted-path classname (must be a subclass of
+#                Warning) of which the warning category must be a subclass in
+#                order to match
+#
+#      module:   a string containing a regular expression that the
+#                module name must match (the match is compiled to be
+#                case-sensitive)
+#
+#      lineno:   an integer that the line number where the warning
+#                occurred must match, or 0 to match all line numbers
+#
+#     All keys within a warnfilter section are optional.  More than
+#     one warnfilter section may be specified.
+#
+# Default: unset
+#
+# Example:
+#
+#    <warnfilter>
+#       action ignore
+#       category exceptions.DeprecationWarning
+#    </warnfilter>
+
 
 # Directive: max-listen-sockets
 #
@@ -797,4 +854,3 @@
 #     var $INSTANCE/var
 #   </zeoclient>
 # </zodb_db>
-