diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-19 07:38:19 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-19 07:38:19 -0800 |
| commit | b29a6b2e4623fa87fecaccc05551b996f684cd53 (patch) | |
| tree | f3579a5536862a304eaba25612f07f0c2515c8bd /docs/glossary.rst | |
| parent | 867acfa0300ca75f2c11c15490e04b556d8bfe99 (diff) | |
| parent | 62e96cbb0698d8f7d65d8dd2d301ef975a829d9e (diff) | |
| download | cryptography-b29a6b2e4623fa87fecaccc05551b996f684cd53.tar.gz cryptography-b29a6b2e4623fa87fecaccc05551b996f684cd53.tar.bz2 cryptography-b29a6b2e4623fa87fecaccc05551b996f684cd53.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index e4fc8283..b6f2d06f 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -27,4 +27,4 @@ Glossary asymmetric cryptography Cryptographic operations where encryption and decryption use different - keys. There are seperate encryption and decryption keys. + keys. There are separate encryption and decryption keys. |