summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Close unneeded branch.fslenz/examples-nicos-added-sphinx-itself-remov-1390580978166Georg Brandl2014-03-250-0/+0
* EXAMPLES: NICOS added, Sphinx itself removed.Alexander Lenz2014-01-241-1/+1
* fix print statementGeorg Brandl2014-01-231-1/+1
* consistency nitsGeorg Brandl2014-01-224-3/+8
* merge with stableGeorg Brandl2014-01-22129-1051/+3946
|\
| * Resolve some conflictsDmitry Shachnev2014-01-222-47/+11
| * Fix formattingDmitry Shachnev2014-01-222-3/+3
| * MergeDmitry Shachnev2014-01-2218-90/+403
| |\
| | * merge with stableGeorg Brandl2014-01-2086-668/+3548
| | |\
| | | * Fix an exception introduced by b69b59480cba for __init__ with no docstring.Ben Darnell2014-01-202-2/+19
| * | | Modernize newly written code as wellDmitry Shachnev2014-01-202-61/+62
| * | | MergeDmitry Shachnev2014-01-2064-310/+365
| |\ \ \ | | |_|/ | |/| |
| | * | Modernize the code now that Python 2.5 is no longer supportedDmitry Shachnev2014-01-1964-320/+338
| * | | merge with stableGeorg Brandl2014-01-201-15/+16
| |\ \ \
| * | | | changelog: make napoleon more visibleGeorg Brandl2014-01-201-3/+3
| * | | | Merging changesRob Ruana2014-01-199-64/+41
| |\ \ \ \
| | * \ \ \ Merged birkenfeld/sphinx into defaultRob Ruana2014-01-1916-2/+3021
| | |\ \ \ \
| | * \ \ \ \ merge with stableGeorg Brandl2014-01-199-64/+41
| | |\ \ \ \ \
| * | | | | | | Makes suggested changes before adding napoleon to sphinxRob Ruana2014-01-196-134/+160
| | |_|/ / / / | |/| | | | |
| * | | | | | Merged birkenfeld/sphinx into defaultRob Ruana2014-01-1938-290/+659
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | The deprecated config values ``exclude_trees``, ``exclude_dirnames`` and ``un...Georg Brandl2014-01-196-44/+4
| | * | | | | merge with stableGeorg Brandl2014-01-1973-620/+506
| | |\ \ \ \ \
| | | * \ \ \ \ merge with stableGeorg Brandl2014-01-1973-620/+506
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merged in saschpe/sphinx (pull request #193)Georg Brandl2014-01-19130-1148/+1715
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merged in keimlink/sphinx/improve-tags-docs (pull request #167)Georg Brandl2014-01-191-1/+2
| | | | | |\ \ \ \ \
| | | | | | * | | | | Explain that only tags set via command-line or tags.add() are availableMarkus Zapke-Gr?ndemann2013-09-191-1/+2
| | | | | * | | | | | Add :filename: also for literalinclude. Changelog entry.Georg Brandl2014-01-193-0/+29
| | | | | * | | | | | Merge in pull request #172 from https://bitbucket.org/nsmgr8/sphinx/branch/de...Georg Brandl2014-01-1910-0/+59
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Add filename option to code-blockM Nasimul Haque2013-09-2610-0/+96
| | | | | * | | | | | | mock: little changes, changelog and versionaddedGeorg Brandl2014-01-193-10/+18
| | | | | * | | | | | | mergeGeorg Brandl2014-01-194-44/+40
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ merge with stableGeorg Brandl2014-01-1962-607/+332
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | |_|_|_|/ / | | | | | | | |/| | | | |
| | | | | * | | | | | | | Merged in guibog/sphinx2 (pull request #184)Georg Brandl2014-01-195-0/+60
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | autodoc extension: add autodoc_mock_imports config valueguibog2013-10-235-0/+60
| | | | | * | | | | | | | | Merged in tomprince/sphinx (pull request #187)Georg Brandl2014-01-19122-1094/+1606
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / | | | | | | |/| | | | | | |
| | | | | | * | | | | | | | changelog: bette note about literal_strongGeorg Brandl2014-01-191-5/+6
| | | | | * | | | | | | | | Make latex commands customizable.tom prince2013-10-291-12/+16
| | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | BuildDoc shouldn't fail on Unicode paths.Sascha Peilicke2013-11-131-0/+14
| * | | | | | | | | | | | Merge conflictsRob Ruana2014-01-1841-555/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | merge headsshimizukawa2014-01-1826-383/+55
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix: The application now check extra Python versions (3.0, 3.1) to stop invok...shimizukawa2014-01-182-5/+5
| | | * | | | | | | | | | | merge headsshimizukawa2014-01-1591-503/+1228
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Drop python-3.1 and remove support codesshimizukawa2013-12-159-16/+10
| | | * | | | | | | | | | | | Drop python-2.5 and remove 2.4,2.5 support codesshimizukawa2013-12-1526-377/+55
| | * | | | | | | | | | | | | merge with stableGeorg Brandl2014-01-1740-224/+276
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Remove sphinx.ext.oldcmarkup compatibility extension.Georg Brandl2014-01-178-119/+6
| | | * | | | | | | | | | | | | Merged in westurner/sphinx/aria (pull request #204)Georg Brandl2014-01-177-39/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Added WAI-ARIA roles to themes (document, banner, navigation, main, contentin...Wes Turner2014-01-147-39/+47
| | | * | | | | | | | | | | | | merge with stableshimizukawa2014-01-151-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merges napoleon extension into mainline sphinxRob Ruana2014-01-1816-2/+3022
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |