innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.5.x] Merge pull request #506 from gwrtheyrn/ipv6_doc_fix 

Fixed invalid ipv4 mapped ipv6 addresses in docs

Backport of 19eb56a277 from master
This commit is contained in:
Tim Graham 2012-11-09 02:48:32 -08:00
parent 087274d08f
commit 3344d8de3e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ref/forms/fields.txt
View File

@ -683,7 +683,7 @@ For each field, we describe the default widget used if you don't specify
.. attribute:: unpack_ipv4 .. 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 If this option is enabled that address would be unpacked to
``192.0.2.1``. Default is disabled. Can only be used ``192.0.2.1``. Default is disabled. Can only be used
when ``protocol`` is set to ``'both'``. when ``protocol`` is set to ``'both'``.

2
docs/ref/models/fields.txt
View File

@ -825,7 +825,7 @@ are converted to lowercase.
.. attribute:: GenericIPAddressField.unpack_ipv4 .. 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 If this option is enabled that address would be unpacked to
``192.0.2.1``. Default is disabled. Can only be used ``192.0.2.1``. Default is disabled. Can only be used
when ``protocol`` is set to ``'both'``. when ``protocol`` is set to ``'both'``.