diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-05-17 22:17:05 -0400 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-05-17 22:17:05 -0400 |
commit | 0b0179f7311162084f2b8dc6a028e301ca2eb7b2 (patch) | |
tree | 24bb7fa8d9818272739bd2ad03dd2c6d32058e86 /docs/x509.rst | |
parent | 509bacbd475fce046524015ebb5e400e278c73fb (diff) | |
parent | eb177931f825308f9b4df9c789f76b7ce04751f6 (diff) | |
download | cryptography-0b0179f7311162084f2b8dc6a028e301ca2eb7b2.tar.gz cryptography-0b0179f7311162084f2b8dc6a028e301ca2eb7b2.tar.bz2 cryptography-0b0179f7311162084f2b8dc6a028e301ca2eb7b2.zip |
Merge pull request #1972 from reaperhulk/expand-ipaddress
IPAddress needs to support networks for nameconstraints
Diffstat (limited to 'docs/x509.rst')
-rw-r--r-- | docs/x509.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/x509.rst b/docs/x509.rst index ff43be01..850e3df1 100644 --- a/docs/x509.rst +++ b/docs/x509.rst @@ -509,8 +509,9 @@ General Name Classes .. attribute:: value - :type: :class:`~ipaddress.IPv4Address` or - :class:`~ipaddress.IPv6Address`. + :type: :class:`~ipaddress.IPv4Address`, + :class:`~ipaddress.IPv6Address`, :class:`~ipaddress.IPv4Network`, + or :class:`~ipaddress.IPv6Network`. .. class:: RegisteredID |