Reapply "fixup: update a few lingering docstring and message variable references to '_t'-suffix templates"

This reverts commit f0f22fd.

Author: jayaddison

doc/man/sphinx-apidoc.rst

@@ -142,15 +142,15 @@ These options are used when :option:`--full` is specified:
    sphinx project files generated by apidoc.  Following Jinja2 template
    files are allowed:
 
-   * ``module.rst_t``
-   * ``package.rst_t``
-   * ``toc.rst_t``
-   * ``root_doc.rst_t``
-   * ``conf.py_t``
-   * ``Makefile_t``
-   * ``Makefile.new_t``
-   * ``make.bat_t``
-   * ``make.bat.new_t``
+   * ``module.rst.jinja``
+   * ``package.rst.jinja``
+   * ``toc.rst.jinja``
+   * ``root_doc.rst.jinja``
+   * ``conf.py.jinja``
+   * ``Makefile.jinja``
+   * ``Makefile.new.jinja``
+   * ``make.bat.jinja``
+   * ``make.bat.new.jinja``
 
    In detail, please refer the system template files Sphinx provides.
    (``sphinx/templates/apidoc`` and ``sphinx/templates/quickstart``)

doc/man/sphinx-quickstart.rst

@@ -152,12 +152,12 @@ Options
    sphinx project files generated by quickstart.  Following Jinja2 template
    files are allowed:
 
-   * ``root_doc.rst_t``
-   * ``conf.py_t``
-   * ``Makefile_t``
-   * ``Makefile.new_t``
-   * ``make.bat_t``
-   * ``make.bat.new_t``
+   * ``root_doc.rst.jinja``
+   * ``conf.py.jinja``
+   * ``Makefile.jinja``
+   * ``Makefile.new.jinja``
+   * ``make.bat.jinja``
+   * ``make.bat.new.jinja``
 
    In detail, please refer the system template files Sphinx provides.
    (``sphinx/templates/quickstart``)

sphinx/cmd/quickstart.py

@@ -382,8 +382,8 @@ def write_file(fpath: str, content: str, newline: str | None = None) -> None:
 
     masterfile = path.join(srcdir, d['master'] + d['suffix'])
     if template._has_custom_template('quickstart/master_doc.rst.jinja'):
-        msg = ('A custom template `master_doc.rst_t` found. It has been renamed to '
-               '`root_doc.rst_t`.  Please rename it on your project too.')
+        msg = ('A custom template `master_doc.rst.jinja` found. It has been renamed to '
+               '`root_doc.rst.jinja`.  Please rename it on your project too.')
         print(colorize('red', msg))
         write_file(masterfile, template.render('quickstart/master_doc.rst.jinja', d))
     else: