summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--sphinx/ext/apidoc.py6
-rw-r--r--sphinx/templates/apidoc/module.rst_t (renamed from sphinx/templates/apidoc/module.rst)0
-rw-r--r--sphinx/templates/apidoc/package.rst_t (renamed from sphinx/templates/apidoc/package.rst)0
-rw-r--r--sphinx/templates/apidoc/toc.rst_t (renamed from sphinx/templates/apidoc/toc.rst)0
5 files changed, 5 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 6e38020e8..efa7223b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@ Dependencies
Incompatible changes
--------------------
+* apidoc: template files are renamed to ``.rst_t``
+
Deprecated
----------
diff --git a/sphinx/ext/apidoc.py b/sphinx/ext/apidoc.py
index d38b749f0..18b5481f9 100644
--- a/sphinx/ext/apidoc.py
+++ b/sphinx/ext/apidoc.py
@@ -121,7 +121,7 @@ def create_module_file(package, basename, opts):
'qualname': qualname,
'automodule_options': OPTIONS,
}
- text = ReSTRenderer(template_dir).render('module.rst', context)
+ text = ReSTRenderer(template_dir).render('module.rst_t', context)
write_file(qualname, text, opts)
@@ -151,7 +151,7 @@ def create_package_file(root, master_package, subroot, py_files, opts, subs, is_
'automodule_options': OPTIONS,
'show_headings': not opts.noheadings,
}
- text = ReSTRenderer(template_dir).render('package.rst', context)
+ text = ReSTRenderer(template_dir).render('package.rst_t', context)
write_file(pkgname, text, opts)
if submodules and opts.separatemodules:
@@ -176,7 +176,7 @@ def create_modules_toc_file(modules, opts, name='modules'):
'maxdepth': opts.maxdepth,
'docnames': modules,
}
- text = ReSTRenderer(template_dir).render('toc.rst', context)
+ text = ReSTRenderer(template_dir).render('toc.rst_t', context)
write_file(name, text, opts)
diff --git a/sphinx/templates/apidoc/module.rst b/sphinx/templates/apidoc/module.rst_t
index 249027855..249027855 100644
--- a/sphinx/templates/apidoc/module.rst
+++ b/sphinx/templates/apidoc/module.rst_t
diff --git a/sphinx/templates/apidoc/package.rst b/sphinx/templates/apidoc/package.rst_t
index ed9f669ea..ed9f669ea 100644
--- a/sphinx/templates/apidoc/package.rst
+++ b/sphinx/templates/apidoc/package.rst_t
diff --git a/sphinx/templates/apidoc/toc.rst b/sphinx/templates/apidoc/toc.rst_t
index f0877eeb2..f0877eeb2 100644
--- a/sphinx/templates/apidoc/toc.rst
+++ b/sphinx/templates/apidoc/toc.rst_t