[Zope-Checkins] CVS: Zope/inst/skel/inst/in - zope.conf.in:1.1.2.10

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/inst/skel/inst/in
In directory cvs.zope.org:/tmp/cvs-serv13603

Modified Files:
      Tag: chrism-install-branch
	zope.conf.in 
Log Message:
Use hyphen instead of underscores, since the schema's been fixed for
that.  Admins should not be taught about shift keys.  ;-)


=== Zope/inst/skel/inst/in/zope.conf.in 1.1.2.9 => 1.1.2.10 === (574/674 lines abridged)
--- Zope/inst/skel/inst/in/zope.conf.in:1.1.2.9	Fri Jan  3 01:21:21 2003
+++ Zope/inst/skel/inst/in/zope.conf.in	Fri Jan 10 14:33:10 2003
@@ -11,7 +11,7 @@
 
 %define INSTANCE_HOME <<INSTANCE_HOME>>
 
-# Directive: instance_home
+# Directive: instance-home
 #
 # Description:
 #     The path to the data files, local product files, import directory,
@@ -23,15 +23,15 @@
 #
 # Example:
 #
-#    instance_home /home/chrism/projects/sessions
+#    instance-home /home/chrism/projects/sessions
 
-instance_home ${instance_home}
+instance-home ${instance_home}
 
-# Directive: software_home
+# Directive: software-home
 #
 # Description:
 #     The path to the majority of the Python software files used by Zope. One
-#     software_home can support many instance_homes.
+#     software-home can support many instance-homes.
 #
 # Influences: SOFTWARE_HOME environment variable
 #
@@ -39,11 +39,11 @@
 #
 # Example:
 #
-#    software_home /home/chrism/software/Trunk/lib/python
+#    software-home /home/chrism/software/Trunk/lib/python
 
-software_home <<SOFTWARE_HOME>>
+software-home <<SOFTWARE_HOME>>
 
-# Directive: zope_home
+# Directive: zope-home
 #
 # Description:
 #     The 'top-level' Zope software directory (home of the Zserver
@@ -51,17 +51,17 @@
 #
 # Influences: ZOPE_HOME environment variable
 #

[-=- -=- -=- 574 lines omitted -=- -=- -=-]

+#  </monitor-server>
 #
-#  <ftp_server>
+#  <ftp-server>
 #    valid keys are "port" (multi)
 #    port 8021
-#  </ftp_server>
+#  </ftp-server>
 #
-#  <icp_server>
+#  <icp-server>
 #    valid keys are "port" (multi)
 #    port 8888
-#  </icp_server>
+#  </icp-server>
 
 
 # Directives: database
@@ -742,21 +742,20 @@
 #
 # Default:
 #   If a root database (a database which includes a mount_point of '/') 
-#   is not specified, a FileStorage in client_home is used.
+#   is not specified, a FileStorage in client-home is used.
 #
 # Example:
 #
 # <database>
 #    <filestorage>
-#      file_name ${instance_home}/var/Data.fs
+#      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
+#    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>
-