aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-04-28 17:35:08 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-04-28 17:35:08 -0400
commit813c3280a47dfb163367cc12e7b85e6f301a7695 (patch)
tree40385fb33c3ecf0581c901bff694f39ca284a042 /docs
parent9ef13b9e23396f56420ef2aa3334d8c8af50bc73 (diff)
parentb8ef82e3f7aba8c1fce95a4f65bd655790ad1e45 (diff)
downloadcryptography-813c3280a47dfb163367cc12e7b85e6f301a7695.tar.gz
cryptography-813c3280a47dfb163367cc12e7b85e6f301a7695.tar.bz2
cryptography-813c3280a47dfb163367cc12e7b85e6f301a7695.zip
Merge pull request #1862 from reaperhulk/san-uri
add URI general name support
Diffstat (limited to 'docs')
-rw-r--r--docs/x509.rst7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/x509.rst b/docs/x509.rst
index 035fa87f..5f36a921 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -452,7 +452,12 @@ General Name Classes
.. versionadded:: 0.9
This corresponds to a uniform resource identifier. For example,
- ``https://cryptography.io``.
+ ``https://cryptography.io``. The URI is parsed and IDNA decoded (see
+ :rfc:`5895`).
+
+ .. note::
+
+ URIs that do not contain ``://`` in them will not be decoded.
.. attribute:: value