--- a/CHANGES.txt	Mon Jul 18 02:30:00 2005 +0000
+++ b/CHANGES.txt	Wed Jul 27 22:54:12 2005 +0000
@@ -1,7 +1,12 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
-2005-??-?? 0.8.4
+2005-??-?? 0.8.5
+Fixed:
+- Display of Multilinks where linked Class labelprop values are None
+
+
+2005-07-18 0.8.4
 Fixed:
 - extra CRs in CSV export files on Windows platform (sf bug 1195742)
 - activity RDBMS columns were being reported in changes

--- a/doc/Makefile	Mon Jul 18 02:30:00 2005 +0000
+++ b/doc/Makefile	Wed Jul 27 22:54:12 2005 +0000
@@ -1,4 +1,4 @@
-STXTOHTML = rst2html.py
+STXTOHTML = rest2html
 STXTOHT = rst2ht.py
 WEBDIR = ../../htdocs/htdocs/doc-0.8
 

--- a/roundup/__init__.py	Mon Jul 18 02:30:00 2005 +0000
+++ b/roundup/__init__.py	Wed Jul 27 22:54:12 2005 +0000
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.31.2.5 2005-05-02 06:13:10 richard Exp $
+# $Id: __init__.py,v 1.31.2.6 2005-07-27 22:54:12 richard Exp $
 
 '''Roundup - issue tracking for knowledge workers.
 
@@ -68,6 +68,6 @@
 '''
 __docformat__ = 'restructuredtext'
 
-__version__ = '0.8.3'
+__version__ = '0.8.4'
 
 # vim: set filetype=python ts=4 sw=4 et si

--- a/roundup/cgi/templating.py	Mon Jul 18 02:30:00 2005 +0000
+++ b/roundup/cgi/templating.py	Wed Jul 27 22:54:12 2005 +0000
@@ -382,7 +382,10 @@
     l = []
     for entry in ids:
         if num_re.match(entry):
-            l.append(linkcl.get(entry, key))
+            label = linkcl.get(entry, key)
+            # fall back to designator if label is None
+            if label is None: label = '%s%s'%(linkcl.classname, entry)
+            l.append(label)
         else:
             l.append(entry)
     return l
@@ -934,6 +937,9 @@
                                     if hrefable:
                                         subml.append('<a href="%s%s">%s</a>'%(
                                             classname, linkid, label))
+                                    elif label is None:
+                                        subml.append('%s%s'%(classname,
+                                            linkid))
                                     else:
                                         subml.append(label)
                             ml.append(sublabel + ', '.join(subml))
@@ -1806,7 +1812,10 @@
         k = linkcl.labelprop(1)
         labels = []
         for v in self._value:
-            labels.append(linkcl.get(v, k))
+            label = linkcl.get(v, k)
+            # fall back to designator if label is None
+            if label is None: label = '%s%s'%(self._prop.classname, k)
+            labels.append(label)
         value = ', '.join(labels)
         if escape:
             value = cgi.escape(value)

--- a/setup.py	Mon Jul 18 02:30:00 2005 +0000
+++ b/setup.py	Wed Jul 27 22:54:12 2005 +0000
@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: setup.py,v 1.77.2.9 2005-05-02 06:13:10 richard Exp $
+# $Id: setup.py,v 1.77.2.10 2005-07-27 22:54:10 richard Exp $
 
 from distutils.core import setup, Extension
 from distutils.util import get_platform
@@ -348,39 +348,35 @@
 command-line, web and e-mail interfaces. It is based on the winning design
 from Ka-Ping Yee in the Software Carpentry "Track" design competition.
 
-
-This 0.8.3 release adds one feature and fixes some bugs:
-
-Feature:
-
-- chinese translation by limodou
+This 0.8.4 release fixes some bugs:
 
 Fixed:
 
-- fix reference to The Zope Book in Roundup FAQ
-- disabled file logging in Roundup test suite (sf bug 1155649)
-- return original string if message issue xref isn't valid
-- fix nosyreaction.py to stop it setting the nosy list unnecessarily
-  (see doc/upgrading.txt for how to fix in your trackers)
-- after logout, always display tracker home page
-- web forms don't create new items if no item properties are set from UI
-- item creation failed if multilink fields had invalid entries (sf bug
-  1177602)
-- fix bdist_rpm (sf bug 1164328)
-- fix checking of "Email Access" for Anonymous email registration (sf bug
-  1177057)
-- disable "Email Access" for Anonymous by default to stop spam regsitering
-  users on public trackers
-- send errors in the web interface to a logfile by default. Use the
-  "debug" multiprocess mode (roundup-server) or the DEBUG_TO_CLIENT var
-  (roundup.cgi) to have the errors appear in your browser
-- fix setgid typo (sf bug 1171346)
-- fix faulty find_template filename facility (sf bug 1163629)
-- fix roundup-admin "export" so it creates the target dir if needed
-- "fix" roundup-admin "import" to not use "universal newline support" since
-  the csv module appears to have its own ideas about such things (sf bug
-  1163890)
-- fix installation docs referring to old-style configuration variables
+- extra CRs in CSV export files on Windows platform (sf bug 1195742)
+- activity RDBMS columns were being reported in changes
+- fix name collision in roundup.cgi script (sf bug 1203795)
+- fix handling of invalid interval input
+- search locale files relative ro roundup installation path (sf bug 1219689)
+- use translation for boolean property rendering (sf bug 1225152)
+- enabled disabling of REMOTE_USER for when it's not a valid username (sf
+  bug 1190187)
+- fix invocation of hasPermission from templating code (sf bug 1224172)
+- have 'roundup-admin security' display property restrictions (sf bug
+  1222135)
+- fixed templating menu() sort_on handling (sf bug 1221936)
+- allow specification of pagesize, sorting and filtering in "classhelp"
+  popups (sf bug 1211800)
+- handle dropped properies in rdbms/metakit journal export (sf bug 1203569)
+- handle missing Subject lines better (sf bug 1198729)
+- sort/group by missing values correctly (sf bugs 1198623, 1176897)
+- discard, don't bounce messages to the mailgw when the messages's sender
+  is invalid (ie. when we try to bounce, we get a 550 "unknown user
+  account" response from the SMTP server) (sf bug 1190906)
+- removed debugging code from cgi/actions.py
+- refactored hyperdb.rawToHyperdb, allowing a number of improvements
+  (thanks Ralf Schlatterbeck)
+- don't try to set a timeout for IMAPS (thanks Paul Jimenez)
+- present Reject exception messages to web users (sf bug 1237685)
 
 If you're upgrading from an older version of Roundup you *must* follow
 the "Software Upgrade" guidelines given in the maintenance documentation.