[Zope-CVS] CVS: Zope - zope.py:1.1.2.3

[Chris McDonough]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv12167

Modified Files:
      Tag: chrism-install-branch
	zope.py 
Log Message:
Bring usage text in line with URL-based configurations.


=== Zope/zope.py 1.1.2.2 => 1.1.2.3 ===
--- Zope/zope.py:1.1.2.2	Tue Sep 10 00:15:59 2002
+++ Zope/zope.py	Mon Sep 16 02:23:37 2002
@@ -10,8 +10,8 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""This is a replacement for z2.py which uses a config file or
-a config retrieved via XML-RPC directly.
+"""
+This is a replacement for z2.py which uses a config file.
 
 Do not change this file unless you know what you're doing. ;-)
 """
@@ -53,17 +53,15 @@
 
 def usage():
     print """
-zope.py [--config-file=filename] [--config-url=url]
+zope.py [--config-location=filename-or-url]
 
 zope.py starts a Zope instance.
 
 If no config- options are passed, an attempt is made to obtain configuration
-info from a file in the current working directory named 'zope.conf'.  If both
-a configuration url and a configuration filename are specified, the
-configuration url is used and the filename is ignored.  The url should point
-to a valid XML-RPC server methodname and the XML-RPC server method should
-return a dictionary of configuration directives in the same format as
-a configuration file.
+info from a file in the current working directory named 'zope.conf'.  An
+alternate absolute or relative filename may be provided, or a URL may be
+provided.  If a URL is specified, it should begin with 'http://'.  The url
+should return a file in the same format as the filesystem config file.
 """ % {'me':sys.argv[0]}
 
 if __name__ == '__main__':