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

[Jens Vagelpohl]

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

Modified Files:
      Tag: Zope-2_7-branch
	zope.conf.in 
Log Message:
- backporting Chris Withers' changes for Collector #1490: Added a new 
  zope.conf option to control the character set used to encode unicode 
  data that reaches ZPublisher without any specified encoding.


=== Zope/skel/etc/zope.conf.in 1.6.2.27 => 1.6.2.28 ===
--- Zope/skel/etc/zope.conf.in:1.6.2.27	Fri Apr  8 06:06:37 2005
+++ Zope/skel/etc/zope.conf.in	Sun Oct  9 19:53:57 2005
@@ -820,6 +820,18 @@
 #
 #    large-file-threshold 1Mb
 
+# Directive: default_zpublisher_encoding
+#
+# Description:
+#     This controls what character set is used to encode unicode
+#     data that reaches ZPublisher without any other specified encoding.
+#
+# Default: iso-8859-15
+#
+# Example:
+#
+#    default_zpublisher_encoding utf-8
+
 # Directives: servers
 #
 # Description: