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

Fred L. Drake, Jr. fred@zope.com
Thu, 6 Feb 2003 12:04:23 -0500


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

Modified Files:
      Tag: new-install-branch
	zope.conf.in 
Log Message:
Update to reflect effective schema changes associated with the
introduction of the ZServer schema component.


=== Zope/skel/etc/zope.conf.in 1.1.2.1 => 1.1.2.2 ===
--- Zope/skel/etc/zope.conf.in:1.1.2.1	Tue Feb  4 15:31:04 2003
+++ Zope/skel/etc/zope.conf.in	Thu Feb  6 12:04:22 2003
@@ -694,49 +694,49 @@
 # Examples:
 #
 #  <http-server>
-#    # valid keys are "port" (multi) and "force-connection-close" (single)
-#    port 8080
+#    # valid keys are "address" and "force-connection-close"
+#    address 8080
 #    force-connection-close on
 #  </http-server>
 #
 #  <webdav-source-server>
-#    # valid keys are "port" (multi) and "force-connection-close" (single)
-#    port 9980
+#    # valid keys are "address" and "force-connection-close"
+#    address 9980
 #    force-connection-close off
 #  </webdav-source-server>
 #
 #  <pcgi-server>
-#    # valid key is "file" (single)
-#    file somefile
+#    # valid key is "path"
+#    path somefile
 #  </pcgi-server>
 #
 #  <fcgi-server>
-#    # valid keys are "port" (single) and "file" (single).  "port" and
-#    # "file" are mutually exclusive.
-#    file somefile
+#    # valid key is "address"; the address may be hostname:port, port,
+#    # or a path for a Unix-domain socket
+#    address somefile
 #  </fcgi-server>
 #
 #  <monitor-server>
-#    # valid keys are "port" (multi)
-#    port 8099
+#    # valid keys are "address"
+#    address 8099
 #  </monitor-server>
 #
 #  <ftp-server>
-#    valid keys are "port" (multi)
-#    port 8021
+#    # valid key is "address"
+#    address 8021
 #  </ftp-server>
 #
 #  <icp-server>
-#    valid keys are "port" (multi)
-#    port 8888
+#    # valid key is "address"
+#    address 8888
 #  </icp-server>
 
 
-# Directives: database
+# Database section
 #
 # Description:
-#     A database section allows the definition of custom database and storage
-#     types.   XXX describe more.
+#     A database section allows the definition of custom database and
+#     storage types.  The standard 
 #
 # Influences: zope.py configuration
 #
@@ -746,16 +746,15 @@
 #
 # Example:
 #
-# <database>
+# <zodb>
 #    <filestorage>
 #      file-name ${instance_home}/var/Data.fs
 #    </filestorage>
 #    mount-point /
-#    db-class                       ZODB.DB
 #    cache-size                     5000
 #    pool-size                      7
 #    cache-deactivate-after         60
 #    version-pool-size              3
 #    version-cache-size             100
 #    version-cache-deactivate-after 10
-# </database>
+# </zodb>