merge with 0.6

This commit is contained in:
Georg Brandl 2010-05-23 10:48:40 +02:00
commit f5ccb53294

View File

@ -188,7 +188,8 @@ class PyObject(ObjectDescription):
self.env.docname,
'duplicate object description of %s, ' % fullname +
'other instance in ' +
self.env.doc2path(objects[fullname][0]),
self.env.doc2path(objects[fullname][0]) +
', use :noindex: for one of them',
self.lineno)
objects[fullname] = (self.env.docname, self.objtype)