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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	zope.conf.in 
Log Message:
The SOFTWARE_HOME and ZOPE_HOME are being removed from the config
schema; these will always be computed based on the software that is
loading the configuration.

Update example for the CGI environment support.

Miscellaneous typo fixes and minor changes.


=== Zope/skel/etc/zope.conf.in 1.1.2.9 => 1.1.2.10 ===
--- Zope/skel/etc/zope.conf.in:1.1.2.9	Thu Feb 20 15:17:38 2003
+++ Zope/skel/etc/zope.conf.in	Fri Feb 21 10:50:40 2003
@@ -28,40 +28,6 @@
 
 instancehome $INSTANCE
 
-# Directive: softwarehome
-#
-# Description:
-#     The path to the majority of the Python software files used by Zope. One
-#     softwarehome can support many instancehomes.
-#
-# Influences: SOFTWARE_HOME environment variable
-#
-# Required (no default)
-#
-# Example:
-#
-#    softwarehome /home/chrism/software/Trunk/lib/python
-
-softwarehome $ZOPE/lib/python
-
-# Directive: zopehome
-#
-# Description:
-#     The 'top-level' Zope software directory (home of the Zserver
-#     directory, the doc directory, the utilities directory, etc.)
-#
-# Influences: ZOPE_HOME environment variable
-#
-# Default: two directories "up" from "softwarehome"
-#
-#     The directory in which the 'zope.py' file (or other executable file
-#     used to start Zope) lives.
-#
-# Example:
-#
-#    zopehome /home/chrism/software/Trunk
-
-
 # Directive: clienthome
 #
 # Description:
@@ -107,7 +73,7 @@
 #     will 'suid' after the server ports are bound. This directive only
 #     works under UNIX and if Zope is started as the root user.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: unset
 #
@@ -146,7 +112,7 @@
 #     supported by your system, an error will be raised and Zope will not
 #     start.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: unset
 #
@@ -161,7 +127,7 @@
 #     Specify the number of threads that Zope's Zserver web server will use
 #     to service requests. The default is 4.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: 4
 #
@@ -175,12 +141,12 @@
 # Description:
 #     Specify an integer representing the Python interpreter "check
 #     interval" This interval determines how often the interpreter checks
-#     for perioding things such as thread switches and signal handlers. The
+#     for periodic things such as thread switches and signal handlers. The
 #     Zope default is 500, but you may want to experiment with other values
 #     in order to attempt to increae performance in your particular
 #     environment.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: 500
 #
@@ -197,7 +163,7 @@
 #     be presented on standard output. Setting this directive 'on' causes
 #     pcgi, fastcgi, and daemon-related directives to have no effect.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: off
 #
@@ -212,7 +178,7 @@
 #     The path to the file in which the Zope process id(s) will be written.
 #     This defaults to client-home/Z2.pid.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: CLIENT_HOME/Z2.pid
 #
@@ -225,10 +191,10 @@
 #
 # Description:
 #     The path to a "lock file" which will be locked by Zope while it's
-#     running. This file is used by zopectl.py to determine if Zope is
-#     currently running. This defaults to client-home/Z2.lock.
+#     running.  This file is used by zopectl.py to determine if Zope is
+#     currently running.  This defaults to CLIENT_HOME/Z2.lock.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: CLIENT_HOME/Z2.lock
 #
@@ -280,14 +246,16 @@
 #     environment of the other web server.  This key may be defined
 #     multiple times to indicate more than one envvar.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: unset
 #
 # Example:
 #
-# cgi-environment-variable HTTPS_SERVER Foobar Server 1.0
-# cgi-environment-variable HTTPS_PORT 443
+# <cgi-environment>
+#   HTTPS_SERVER Foobar Server 1.0
+#   HTTPS_PORT 443
+# </cgi-environment>
 
 
 # Directive: dns-ip-address
@@ -297,7 +265,7 @@
 #     hostnames to be written to Zope's access log. By default, Zope will
 #     not resolve hostnames unless this is set.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: unset
 #
@@ -315,7 +283,7 @@
 #     directive can be overridden on a per-server basis in the servers
 #     section.
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default: unset
 #
@@ -597,7 +565,7 @@
 #     level but overrides the logger's level for the handler it's
 #     defined upon.  XXXX much more detail necessary here
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default:
 #
@@ -650,7 +618,7 @@
 #     is "left off", the default-ip-address is used as the hostname.
 #     XXX describe more
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default:
 #
@@ -704,7 +672,7 @@
 #     A database section allows the definition of custom database and
 #     storage types.  The standard 
 #
-# Influences: zope.py configuration
+# Influences: Zope configuration
 #
 # Default:
 #   If a root database (a database which includes a mount_point of '/')