commit 6a37d27953f2d6075c6834eea46bb762ca523c22
author Alex Gaynor <alex.gaynor@gmail.com> Sat Aug 10 15:18:47 2013 -0400
committer Alex Gaynor <alex.gaynor@gmail.com> Sat Aug 10 15:18:47 2013 -0400
tree adbeafd125f3d579d2e9918024bf8dfcd4aa50db
parent adacdb85a6e102a0b9ee188ccfce93c22bde182e
parent 34c7a91c08413b92d6eec033a350d1d9423a3a9d

Merge branch 'master' into simple-symmetric-encryption

docs/primitives/symmetric-encryption.rst

diff --git a/docs/primitives/symmetric-encryption.rst b/docs/primitives/symmetric-encryption.rst
index 29eb282..090e8e2 100644
--- a/docs/primitives/symmetric-encryption.rst
+++ b/docs/primitives/symmetric-encryption.rst
@@ -61,9 +61,3 @@
                                         ``block_size`` of the cipher. Do not
                                         reuse an ``initialization_vector`` with
                                         a given ``key``.
-    :param padding: One of the paddings described below.
-
-Paddings
-~~~~~~~~
-
-.. class:: cryptography.primitives.block.padding.PKCS7()