aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-09-29 14:33:51 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-09-29 14:33:51 -0700
commit1cbe0a026ad01c250ef575289bb9c01ba303511b (patch)
tree868349630a53df5defe9f98b4ec0bfe41d78b663
parent1e9e7bd2989056d66c19ec61d2c6b6dde0e587ea (diff)
parentcd34ca64c00c0c01b40711b518ecb4e5248cdab1 (diff)
downloadcryptography-1cbe0a026ad01c250ef575289bb9c01ba303511b.tar.gz
cryptography-1cbe0a026ad01c250ef575289bb9c01ba303511b.tar.bz2
cryptography-1cbe0a026ad01c250ef575289bb9c01ba303511b.zip
Merge pull request #1368 from reaperhulk/update-doc8
add an ignore path for doc8 + fix a long line causing failures
-rw-r--r--docs/development/test-vectors.rst4
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index 32128681..8d046dad 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -29,8 +29,8 @@ Asymmetric ciphers
* OpenSSL PEM DSA serialization vectors from the `GnuTLS example keys`_.
* PKCS #8 PEM serialization vectors from
- * GnuTLS: `enc-rsa-pkcs8.pem`_, `enc2-rsa-pkcs8.pem`_, `unenc-rsa-pkcs8.pem`_,
- `pkcs12_s2k_pem.c`_.
+ * GnuTLS: `enc-rsa-pkcs8.pem`_, `enc2-rsa-pkcs8.pem`_,
+ `unenc-rsa-pkcs8.pem`_, `pkcs12_s2k_pem.c`_.
* `Botan's ECC private keys`_.
Hashes
diff --git a/tox.ini b/tox.ini
index 7d64be80..d47beac2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ commands =
sphinx-build -W -b latex -d {envtmpdir}/doctrees docs docs/_build/latex
sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
sphinx-build -W -b spelling docs docs/_build/html
- doc8 --allow-long-titles README.rst CHANGELOG.rst docs/
+ doc8 --allow-long-titles README.rst CHANGELOG.rst docs/ --ignore-path docs/_build/
[testenv:docs-linkcheck]
deps =