Commits

Georg Brandl committed cc1a6ef Merge

merge with 0.6

Comments (0)

Files changed (2)

sphinx/domains/python.py

                     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)
 

sphinx/environment.py

File contents unchanged.