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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	zope.conf.in 
Log Message:
Change a number of spellings to match changes in the config API and schema
elsewhere.  Enable the HTTP server from the config file by default.


=== Zope/skel/etc/zope.conf.in 1.1.2.4 => 1.1.2.5 ===
--- Zope/skel/etc/zope.conf.in:1.1.2.4	Tue Feb 11 15:11:33 2003
+++ Zope/skel/etc/zope.conf.in	Fri Feb 14 01:05:24 2003
@@ -11,7 +11,7 @@
 
 %define INSTANCE_HOME <<INSTANCE_HOME>>
 
-# Directive: instance-home
+# Directive: instancehome
 #
 # Description:
 #     The path to the data files, local product files, import directory,
@@ -23,15 +23,15 @@
 #
 # Example:
 #
-#    instance-home /home/chrism/projects/sessions
+#    instancehome /home/chrism/projects/sessions
 
-instance-home ${instance_home}
+instancehome ${instance_home}
 
-# Directive: software-home
+# Directive: softwarehome
 #
 # Description:
 #     The path to the majority of the Python software files used by Zope. One
-#     software-home can support many instance-homes.
+#     softwarehome can support many instancehomes.
 #
 # Influences: SOFTWARE_HOME environment variable
 #
@@ -39,11 +39,11 @@
 #
 # Example:
 #
-#    software-home /home/chrism/software/Trunk/lib/python
+#    softwarehome /home/chrism/software/Trunk/lib/python
 
-software-home <<SOFTWARE_HOME>>
+softwarehome <<SOFTWARE_HOME>>
 
-# Directive: zope-home
+# Directive: zopehome
 #
 # Description:
 #     The 'top-level' Zope software directory (home of the Zserver
@@ -51,17 +51,17 @@
 #
 # Influences: ZOPE_HOME environment variable
 #
-# Default: two directories "up" from "software-home"
+# Default: two directories "up" from "softwarehome"
 #
 #     The directory in which the 'zope.py' file (or other executable file
 #     used to start Zope) lives.
 #
 # Example:
 #
-#    zope-home /home/chrism/software/Trunk
+#    zopehome /home/chrism/software/Trunk
 
 
-# Directive: client-home
+# Directive: clienthome
 #
 # Description:
 #     The directory in which a running Zope's process identifier files are
@@ -73,7 +73,7 @@
 #
 # Example:
 #
-#    client-home /home/chrism/projects/sessions/var
+#    clienthome /home/chrism/projects/sessions/var
 
 
 # Directive: debug-mode
@@ -658,11 +658,11 @@
 #
 # Examples:
 #
-#  <http-server>
-#    # valid keys are "address" and "force-connection-close"
-#    address 8080
-#    force-connection-close on
-#  </http-server>
+<http-server>
+  # valid keys are "address" and "force-connection-close"
+  address 8080
+  # force-connection-close on
+</http-server>
 #
 #  <webdav-source-server>
 #    # valid keys are "address" and "force-connection-close"