diff options
| author | Tim Graham <timograham@gmail.com> | 2012-11-09 02:48:32 -0800 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2012-11-09 02:48:32 -0800 |
| commit | 19eb56a277291de8c25a0edcc7af111dac7518af (patch) | |
| tree | 9b85b76cd36036f22ba51b4d81f06b0f2d66956b | |
| parent | a79d920a56e7200b6259e60f7811162c07c7651d (diff) | |
| parent | b0c72d0a308bcb41c676d36c24e6b2f85e00cd95 (diff) | |
Merge pull request #506 from gwrtheyrn/ipv6_doc_fix
Fixed invalid ipv4 mapped ipv6 addresses in docs
| -rw-r--r-- | docs/ref/forms/fields.txt | 2 | ||||
| -rw-r--r-- | 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 7c8d509031..75d05c6829 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 d8ea6bb31d..cd1185585c 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'``. |