Commit 19eb56a2 authored by Tim Graham's avatar Tim Graham
Browse files

Merge pull request #506 from gwrtheyrn/ipv6_doc_fix 

Fixed invalid ipv4 mapped ipv6 addresses in docs
parents a79d920a b0c72d0a

docs/ref/forms/fields.txt

+1 −1
Original line number Diff line number Diff line
@@ -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'``.

docs/ref/models/fields.txt

+1 −1
Original line number Diff line number Diff line
@@ -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'``.