rename name option for toctree directive to caption.

sphinx/directives/other.py

@@ -40,7 +40,7 @@ class TocTree(Directive):
     final_argument_whitespace = False
     option_spec = {
         'maxdepth': int,
-        'name': str,
+        'caption': str,
         'glob': directives.flag,
         'hidden': directives.flag,
         'includehidden': directives.flag,
@@ -52,7 +52,7 @@ class TocTree(Directive):
         env = self.state.document.settings.env
         suffixes = env.config.source_suffix
         glob = 'glob' in self.options
-        name = self.options.get('name')
+        caption = self.options.get('caption')
 
         ret = []
         # (title, ref) pairs, where ref may be a document, or an external link,
@@ -111,7 +111,7 @@ class TocTree(Directive):
         # includefiles only entries that are documents
         subnode['includefiles'] = includefiles
         subnode['maxdepth'] = self.options.get('maxdepth', -1)
-        subnode['name'] = name
+        subnode['caption'] = caption
         subnode['glob'] = glob
         subnode['hidden'] = 'hidden' in self.options
         subnode['includehidden'] = 'includehidden' in self.options

sphinx/environment.py

@@ -1380,13 +1380,13 @@ class BuildEnvironment:
                                   separate=False, subtree=False):
             """Return TOC entries for a toctree node."""
             refs = [(e[0], e[1]) for e in toctreenode['entries']]
-            name = toctreenode.attributes.get('name')
+            caption = toctreenode.attributes.get('caption')
             entries = []
-            if name:
+            if caption:
                 entries.extend(
                         nodes.reference('', '', internal=False,
                                                     refuri='', anchorname='',
-                                                    *[nodes.Text(name)])
+                                                    *[nodes.Text(caption)])
                 )
 
             for (title, ref) in refs: