summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorJeppe Pihl <jpihl08@gmail.com>2014-10-06 10:35:33 +0200
committerJeppe Pihl <jpihl08@gmail.com>2014-10-06 10:35:33 +0200
commitbd0b5f19426148f0ead0c70e564d1b301da7fc53 (patch)
tree2ce09422e261f3e9b2e466cd0df97b298bca3a34 /CHANGES
parenta05d4b0f6f9928c5760130dfdf52b3e59cc50e76 (diff)
parent376f62970ff7b9276c77ef74e915bced88f5a212 (diff)
downloadsphinx-bd0b5f19426148f0ead0c70e564d1b301da7fc53.tar.gz
merge
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 0d768936..8bf02b3c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -91,6 +91,8 @@ Features added
Thanks to Takeshi Komiya.
* #1344: add :confval:`gettext_enables` to enable extracting 'index' to gettext
catalog output / applying translation catalog to generated documentation.
+* #1583: Allow the line numbering of the directive `literalinclude` to match
+ that of the included file, using a new ``lineno-match`` option.
* PR#299: add various options to sphinx-quickstart. Quiet mode option
``--quiet`` will skips wizard mode. Thanks to WAKAYAMA shirou.