aboutsummaryrefslogtreecommitdiffstats
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-01-30 08:25:23 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-01-30 08:25:23 -0600
commitd5852cb6605ae4270b4fe2f8b783e25e019b147d (patch)
tree970026d9bb641f42880fa575fb6bbf9efd872176 /docs/glossary.rst
parent912d3fbc84d72ea112e3a64494e9de69a105b0c3 (diff)
downloadcryptography-d5852cb6605ae4270b4fe2f8b783e25e019b147d.tar.gz
cryptography-d5852cb6605ae4270b4fe2f8b783e25e019b147d.tar.bz2
cryptography-d5852cb6605ae4270b4fe2f8b783e25e019b147d.zip
update docs
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index ef422a6e..4d5faef1 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -60,3 +60,7 @@ Glossary
This is a property of encryption systems whereby two encrypted messages
aren't distinguishable without knowing the encryption key. This is
considered a basic, necessary property for a working encryption system.
+
+ text
+ This type corresponds to `unicode` on Python 2 and `str` on Python 3.
+ This is equivalent to `six.text_type`.