aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-05-29 17:09:05 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2017-05-29 18:09:05 -0400
commit0db218e7d89dfb07c01c5891bea91aa5c8a4ae15 (patch)
treeeca8e35c14063af51a4d239061e34617cded9364 /docs
parentcc78c30fd95bb57fe75330ff7c702eb1f2ac4695 (diff)
downloadcryptography-0db218e7d89dfb07c01c5891bea91aa5c8a4ae15.tar.gz
cryptography-0db218e7d89dfb07c01c5891bea91aa5c8a4ae15.tar.bz2
cryptography-0db218e7d89dfb07c01c5891bea91aa5c8a4ae15.zip
reorder the primitives list and improve a few titles (#3640)
Diffstat (limited to 'docs')
-rw-r--r--docs/hazmat/primitives/cryptographic-hashes.rst4
-rw-r--r--docs/hazmat/primitives/index.rst10
-rw-r--r--docs/hazmat/primitives/padding.rst4
3 files changed, 9 insertions, 9 deletions
diff --git a/docs/hazmat/primitives/cryptographic-hashes.rst b/docs/hazmat/primitives/cryptographic-hashes.rst
index 55af21ac..521ae094 100644
--- a/docs/hazmat/primitives/cryptographic-hashes.rst
+++ b/docs/hazmat/primitives/cryptographic-hashes.rst
@@ -1,7 +1,7 @@
.. hazmat::
-Message digests
-===============
+Message digests (Hashing)
+=========================
.. module:: cryptography.hazmat.primitives.hashes
diff --git a/docs/hazmat/primitives/index.rst b/docs/hazmat/primitives/index.rst
index 022cb9fb..78beb3d9 100644
--- a/docs/hazmat/primitives/index.rst
+++ b/docs/hazmat/primitives/index.rst
@@ -6,12 +6,12 @@ Primitives
.. toctree::
:maxdepth: 1
- cryptographic-hashes
+ asymmetric/index
+ constant-time
+ key-derivation-functions
+ keywrap
mac/index
+ cryptographic-hashes
symmetric-encryption
padding
- key-derivation-functions
- keywrap
- asymmetric/index
- constant-time
twofactor
diff --git a/docs/hazmat/primitives/padding.rst b/docs/hazmat/primitives/padding.rst
index 916b9bcd..45bcc139 100644
--- a/docs/hazmat/primitives/padding.rst
+++ b/docs/hazmat/primitives/padding.rst
@@ -1,7 +1,7 @@
.. hazmat::
-Padding
-=======
+Symmetric Padding
+=================
.. module:: cryptography.hazmat.primitives.padding