jfbu fcbabcd9b5 Merge branch 'stable' ...

Conflicts:
	sphinx/apidoc.py
	sphinx/application.py
	sphinx/quickstart.py

	modified:   CHANGES
	modified:   doc/config.rst
	modified:   doc/markup/inline.rst
	modified:   sphinx/application.py
	modified:   sphinx/builders/__init__.py
	modified:   sphinx/cmd/quickstart.py
	modified:   sphinx/ext/apidoc.py

2017-12-18 10:13:49 +01:00

..

code.rst

Merge branch 'stable'

2017-12-11 22:54:34 +01:00

index.rst

Add link to standard markup description.

2010-09-10 09:05:00 +02:00

inline.rst

Merge branch 'stable'

2017-12-18 10:13:49 +01:00

misc.rst

Improve access to table and math markup info in docs

2017-06-20 15:57:32 +02:00

para.rst

classifier of glossary terms can be used for index entries grouping key. The classifier also be used for translation. See also :ref:glossary-directive.

2016-02-14 19:28:58 +09:00

toctree.rst

Update toctree.rst

2017-01-31 01:29:18 +01:00