IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.x' into new-tutorial-part-ii

Browse Source
This commit is contained in:
Juan Luis Cano Rodríguez
2021-07-05 20:12:53 +02:00
parent cb846a39e0 f2c5c6383e
commit b9da1577b6
148 changed files with 3778 additions and 3376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/usage/configuration.rst
View File

@@ -2689,6 +2689,14 @@ Options for the C domain
.. versionadded:: 3.0
.. confval:: c_extra_keywords
A list of identifiers to be recognized as keywords by the C parser.
It defaults to ``['alignas', 'alignof', 'bool', 'complex', 'imaginary',
'noreturn', 'static_assert', 'thread_local']``.
.. versionadded:: 4.0.3
.. confval:: c_allow_pre_v3
A boolean (default ``False``) controlling whether to parse and try to

6
doc/usage/extensions/napoleon.rst
View File

@@ -325,9 +325,9 @@ sure that "sphinx.ext.napoleon" is enabled in `conf.py`::
**If True**::
def __init__(self):
\"\"\"
"""
This will be included in the docs because it has a docstring
\"\"\"
"""
def __init__(self):
# This will NOT be included in the docs
@@ -509,7 +509,7 @@ sure that "sphinx.ext.napoleon" is enabled in `conf.py`::
.. confval:: napoleon_preprocess_types
True to convert the type definitions in the docstrings as references.
Defaults to *True*.
Defaults to *False*.
.. versionadded:: 3.2.1
.. versionchanged:: 3.5