--- a/cwvreg.py	Tue Jun 23 17:04:40 2015 +0200
+++ b/cwvreg.py	Thu Jul 02 19:54:25 2015 +0200
@@ -41,7 +41,6 @@
 - handling the registration process at startup time, and during automatic
   reloading in debug mode.
 
-.. _AppObjectRecording:
 
 Details of the recording process
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -80,9 +79,13 @@
 named `vreg`):
 
 .. automethod:: cubicweb.cwvreg.CWRegistryStore.register_all
+   :noindex:
 .. automethod:: cubicweb.cwvreg.CWRegistryStore.register_and_replace
+   :noindex:
 .. automethod:: cubicweb.cwvreg.CWRegistryStore.register
+   :noindex:
 .. automethod:: cubicweb.cwvreg.CWRegistryStore.unregister
+   :noindex:
 
 Examples:
 
@@ -122,7 +125,6 @@
 to the `register_all` method.
 
 
-.. _Selection:
 
 Runtime objects selection
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -171,7 +173,6 @@
 case. Among selectable objects, the `is_instance('Card')` selector will return a higher
 score since it's more specific, so the correct view will be selected as expected.
 
-.. _SelectionAPI:
 
 API for objects selections
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -182,12 +183,16 @@
 selectors that will inspect their content and return a score accordingly.
 
 .. automethod:: cubicweb.vregistry.Registry.select
+   :noindex:
 
 .. automethod:: cubicweb.vregistry.Registry.select_or_none
+   :noindex:
 
 .. automethod:: cubicweb.vregistry.Registry.possible_objects
+   :noindex:
 
 .. automethod:: cubicweb.vregistry.Registry.object_by_id
+   :noindex:
 """
 
 __docformat__ = "restructuredtext en"
@@ -269,7 +274,7 @@
 
     def selected(self, winner, args, kwargs):
         """overriden to avoid the default 'instanciation' behaviour, ie
-        winner(*args, **kwargs)
+        `winner(*args, **kwargs)`
         """
         return winner