From 92f7af3c36ec62e0b55c69ae8e359e53c8cfec15 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sat, 1 Sep 2012 18:32:27 +0200
Subject: [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.
---
 docs/releases/1.4.2.txt | 14 ++++++++++++++
 docs/releases/index.txt |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 docs/releases/1.4.2.txt

(limited to 'docs')

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
 
-- 
cgit v1.3