oops

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1986 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/doc/customizing.txt b/doc/customizing.txt
index 67de904e00585a6267a5f1d8798c51514a72197f..0136601910ec8a56f34d249378bd9c36dd0a9db6 100644 (file)
--- a/doc/customizing.txt
+++ b/doc/customizing.txt
@@ -2,7 +2,7 @@
 Customising Roundup
 ===================
 
-:Version: $Revision: 1.104 $
+:Version: $Revision: 1.105 $
 
 .. This document borrows from the ZopeBook section on ZPT. The original is at:
    http://www.zope.org/Documentation/Books/ZopeBook/current/ZPT.stx
@@ -1023,7 +1023,7 @@ Two special form values are supported for backwards compatibility:
     This is equivalent to::
 
         @link@messages=msg-1
-        @msg-1@content=value
+        msg-1@content=value
 
     except that in addition, the "author" and "date" properties of
     "msg-1" are set to the userid of the submitter, and the current
@@ -1033,7 +1033,7 @@ Two special form values are supported for backwards compatibility:
     This is equivalent to::
 
         @link@files=file-1
-        @file-1@content=value
+        file-1@content=value
 
     The String content value is handled as described above for file
     uploads.

diff --git a/roundup/cgi/client.py b/roundup/cgi/client.py
index 29622035708ec0ecccb6ab9f9f5ee7b8589540f9..874796fb353d864a85afd311be79de0b7a502bcc 100644 (file)
--- a/roundup/cgi/client.py
+++ b/roundup/cgi/client.py
@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.145 2003-11-12 01:00:59 richard Exp $
+# $Id: client.py,v 1.146 2003-11-13 05:56:48 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -1471,7 +1471,7 @@ You should then receive another email with the new password.
                 This is equivalent to::
 
                     @link@messages=msg-1
-                    @msg-1@content=value
+                    msg-1@content=value
 
                 except that in addition, the "author" and "date"
                 properties of "msg-1" are set to the userid of the
@@ -1481,7 +1481,7 @@ You should then receive another email with the new password.
                 This is equivalent to::
 
                     @link@files=file-1
-                    @file-1@content=value
+                    file-1@content=value
 
                 The String content value is handled as described above for
                 file uploads.

diff --git a/setup.py b/setup.py
index df99ff30455b174ed7d19ef22727ead8abcf8ac5..9d08e5d161fcccc77a150ad46ec54fbb19e61b11 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: setup.py,v 1.57 2003-10-25 22:53:26 richard Exp $
+# $Id: setup.py,v 1.58 2003-11-13 05:56:48 richard Exp $
 
 from distutils.core import setup, Extension
 from distutils.util import get_platform
@@ -158,7 +158,7 @@ def main():
             'doc/roundup-mailgw.1', 'doc/roundup-server.1']))
 
     # add the templates to the data files lists
-    from roundup.admin import listTemplates
+    from roundup.init import listTemplates
     templates = [t['path'] for t in listTemplates('templates').values()]
     for tdir in templates:
         # scan for data files