summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-03-06 10:13:22 +0100
committerClaude Paroz <claude@2xlibre.net>2014-03-06 10:20:01 +0100
commit06efeae598c6dafbe56d2ea323a0dccdd5bf2b8e (patch)
treea41cb5ac13ab4bed39c4d7ef413c6a86aba79665 /docs/ref
parent20948612c79b936424cb12cf9988713708232ced (diff)
Added --previous flag to msgmerge command used by makemessages
Also took the opportunity to slightly refactor gettext options so as to ease customization by subclassing the command. Thanks Michal Čihař for the report and initial patch.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/django-admin.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 853f64b936..4571c24d3d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -569,6 +569,11 @@ Example usage::
Added the ability to specify multiple locales.
+.. versionchanged:: 1.7
+
+ Added the ``--previous`` option to the ``msgmerge`` command when merging
+ with existing po files.
+
.. django-admin-option:: --domain
Use the ``--domain`` or ``-d`` option to change the domain of the messages files.