summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-11 08:14:55 +0100
committerGeorg Brandl <georg@python.org>2014-01-11 08:14:55 +0100
commit7ae642f2b292e85c8f934fd05a48362e9b90d3c4 (patch)
tree2636476a5a2545aa5a2a55e8e039a7001d6bfbab /CHANGES
parent4238b992b5e047c00a8a94df263e64fc8d1260db (diff)
parent778bf598128f22b4cdd913dfed27edb9eeeb20d0 (diff)
downloadsphinx-7ae642f2b292e85c8f934fd05a48362e9b90d3c4.tar.gz
merge stable into default
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES13
1 files changed, 11 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index e8d72d06..58311eb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,14 @@
-Release 1.2.1 (in development)
-==============================
+Release 1.3 (in development)
+============================
+
+New features
+------------
+
+* PR#202: Allow "." and "~" prefixed references in ``:param:`` doc fields
+ for Python.
+
+* #925: Allow list-typed config values to be provided on the command line,
+ like ``-D key=val1,val2``.
Bugs fixed
----------