Merge with sphinx-domains.

sphinx/directives/__init__.py

@@ -190,6 +190,7 @@ class DefaultDomain(Directive):
         #             domain_name = domain.name
         #             break
         env.temp_data['default_domain'] = env.domains.get(domain_name)
+        return []
 
 
 directives.register_directive('default-domain', DefaultDomain)

sphinx/domains/std.py

@@ -103,7 +103,7 @@ class Target(Directive):
     def run(self):
         env = self.state.document.settings.env
         # normalize whitespace in fullname like XRefRole does
-        fullname = ws_re.sub('', self.arguments[0].strip())
+        fullname = ws_re.sub(' ', self.arguments[0].strip())
         targetname = '%s-%s' % (self.name, fullname)
         node = nodes.target('', '', ids=[targetname])
         self.state.document.note_explicit_target(node)
@@ -118,7 +118,10 @@ class Target(Directive):
             inode = addnodes.index(entries=[(indextype, indexentry,
                                              targetname, targetname)])
             ret.insert(0, inode)
-        env.domaindata['std']['objects'][self.name, fullname] = \
+        name = self.name
+        if ':' in self.name:
+            _, name = self.name.split(':', 1)
+        env.domaindata['std']['objects'][name, fullname] = \
             env.docname, targetname
         return ret
 

sphinx/ext/intersphinx.py

@@ -158,8 +158,9 @@ def load_mappings(app):
     if update:
         env.intersphinx_inventory = {}
         for _, invdata in cache.itervalues():
-            if invdata:
-                env.intersphinx_inventory.update(invdata)
+            for type, objects in invdata.iteritems():
+                env.intersphinx_inventory.setdefault(
+                    type, {}).update(objects)
 
 
 def missing_reference(app, env, node, contnode):

sphinx/themes/basic/layout.html

@@ -91,7 +91,7 @@
     <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
     <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
     {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + cssfile, 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
     {%- endfor %}
     {%- if not embedded %}
     <script type="text/javascript">