#470: Fix generated target names for reST domain objects; they are not in the same namespace.

CHANGES

@@ -1,6 +1,9 @@
 Release 1.0.1 (in development)
 ==============================
 
+* #470: Fix generated target names for reST domain objects; they
+  are not in the same namespace.
+
 * #266: Add Bengali language.
 
 * #473: Fix a bug in parsing JavaScript object names.

sphinx/domains/rst.py

@@ -29,8 +29,9 @@ class ReSTMarkup(ObjectDescription):
 
     def add_target_and_index(self, name, sig, signode):
         if name not in self.state.document.ids:
-            signode['names'].append(name)
-            signode['ids'].append(name)
+            targetname = name + '-' + self.objtype
+            signode['names'].append(targetname)
+            signode['ids'].append(targetname)
             signode['first'] = (not self.names)
             self.state.document.note_explicit_target(signode)
 
@@ -47,7 +48,7 @@ class ReSTMarkup(ObjectDescription):
         indextext = self.get_index_text(self.objtype, name)
         if indextext:
             self.indexnode['entries'].append(('single', indextext,
-                                              name, name))
+                                              targetname, targetname))
 
     def get_index_text(self, objectname, name):
         if self.objtype == 'directive':

sphinx/environment.py

@@ -63,7 +63,7 @@ default_settings = {
 
 # This is increased every time an environment attribute is added
 # or changed to properly invalidate pickle files.
-ENV_VERSION = 36
+ENV_VERSION = 37
 
 
 default_substitutions = set([