summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-09-01 18:32:27 +0200
committerClaude Paroz <claude@2xlibre.net>2012-09-01 18:39:51 +0200
commit92f7af3c36ec62e0b55c69ae8e359e53c8cfec15 (patch)
tree88408a89339382163cb3522a5bafd8bc8a19e008 /docs
parentc2f1aa5a3c605927f1fb86c0d4eaa9f9067a0313 (diff)
[1.4.x] Fixed #18212 -- Standardized arguments of GenericIPAddressField
Unlike other model fields, the newly introduced (1.4) GenericIPAddressField did not accept verbose_name and name as the first positional arguments. This commit fixes it. Thanks Dan McGee for the report and the patch. Backport of 306d34873cff2 from master.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.4.2.txt14
-rw-r--r--docs/releases/index.txt1
2 files changed, 15 insertions, 0 deletions
diff --git a/docs/releases/1.4.2.txt b/docs/releases/1.4.2.txt
new file mode 100644
index 0000000000..6f2e9aca2e
--- /dev/null
+++ b/docs/releases/1.4.2.txt
@@ -0,0 +1,14 @@
+==========================
+Django 1.4.2 release notes
+==========================
+
+*TO BE RELEASED*
+
+This is the second security release in the Django 1.4 series.
+
+Backwards incompatible changes
+==============================
+
+* The newly introduced :class:`~django.db.models.GenericIPAddressField`
+ constructor arguments have been adapted to match those of all other model
+ fields. The first two keyword arguments are now verbose_name and name.
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 61d1eb9971..3166cb4b96 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -20,6 +20,7 @@ Final releases
.. toctree::
:maxdepth: 1
+ .. 1.4.2 (uncomment on release)
1.4.1
1.4