diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-02 15:11:10 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-02 15:11:10 -0600 |
| commit | ffa70965d610d2f4523a7d9e7ded879a06c6c2c0 (patch) | |
| tree | 88c13e98d17370da0d8ca0e6459f3358197c7aa5 /docs | |
| parent | b8dbb89676836db16272e0485086191263f98c45 (diff) | |
| parent | c39559c6d629d68674d240d6e6bcdf44a15d90cf (diff) | |
| download | cryptography-ffa70965d610d2f4523a7d9e7ded879a06c6c2c0.tar.gz cryptography-ffa70965d610d2f4523a7d9e7ded879a06c6c2c0.tar.bz2 cryptography-ffa70965d610d2f4523a7d9e7ded879a06c6c2c0.zip | |
Merge branch 'master' into urandom-engine
* master:
Revert "Travis now has an up to date pypy"
Make capitalization in the glossary consistent and sort it
Make lib and ffi be private on backend
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/glossary.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 63e0a6ce..4421fca3 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -2,6 +2,7 @@ Glossary ======== .. glossary:: + :sorted: plaintext User-readable data you care about. @@ -35,7 +36,7 @@ Glossary symmetric or asymmetric. Authentication is necessary for effective encryption. - Ciphertext indistinguishability + ciphertext indistinguishability 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. |