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 remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	sphinx/application.py
	sphinx/builders/html.py
This commit is contained in:
Jellby
2016-12-06 19:04:58 +01:00
parent f105b737ed 82ef05431a
commit 6ce1bb1f00
347 changed files with 21676 additions and 10771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/extdev/nodes.rst
View File

@@ -10,6 +10,7 @@ Nodes for domain-specific object descriptions
.. autoclass:: desc
.. autoclass:: desc_signature
.. autoclass:: desc_signature_line
.. autoclass:: desc_addname
.. autoclass:: desc_type
.. autoclass:: desc_returns