From 3344d8de3e34f1134a2fa19fa4a82b5acee8af0d Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 9 Nov 2012 02:48:32 -0800 Subject: [PATCH] [1.5.x] Merge pull request #506 from gwrtheyrn/ipv6_doc_fix Fixed invalid ipv4 mapped ipv6 addresses in docs Backport of 19eb56a277291de8c25a0edcc7af111dac7518af from master --- docs/ref/forms/fields.txt | 2 +- docs/ref/models/fields.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 7c8d5090314..75d05c68291 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -683,7 +683,7 @@ For each field, we describe the default widget used if you don't specify .. attribute:: unpack_ipv4 - Unpacks IPv4 mapped addresses like ``::ffff::192.0.2.1``. + Unpacks IPv4 mapped addresses like ``::ffff:192.0.2.1``. If this option is enabled that address would be unpacked to ``192.0.2.1``. Default is disabled. Can only be used when ``protocol`` is set to ``'both'``. diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index d8ea6bb31dd..cd1185585c1 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -825,7 +825,7 @@ are converted to lowercase. .. attribute:: GenericIPAddressField.unpack_ipv4 - Unpacks IPv4 mapped addresses like ``::ffff::192.0.2.1``. + Unpacks IPv4 mapped addresses like ``::ffff:192.0.2.1``. If this option is enabled that address would be unpacked to ``192.0.2.1``. Default is disabled. Can only be used when ``protocol`` is set to ``'both'``.