Bend some recent changes to standards (#669)
diff --git a/doc/api/crypto.rst b/doc/api/crypto.rst
index 04d7ccf..7b21d4f 100644
--- a/doc/api/crypto.rst
+++ b/doc/api/crypto.rst
@@ -8,12 +8,10 @@
.. note::
- `pyca/cryptography`_ is likely a better choice than using this module. It
- contains a complete set of cryptographic primitives as well as a
- significantly better and more powerful X509 API. If necessary you can
- convert to and from cryptography objects using the ``to_cryptography``
- and ``from_cryptography`` methods on ``X509``, ``X509Req``, ``CRL``,
- and ``PKey``.
+ `pyca/cryptography`_ is likely a better choice than using this module.
+ It contains a complete set of cryptographic primitives as well as a significantly better and more powerful X509 API.
+ If necessary you can convert to and from cryptography objects using the ``to_cryptography`` and ``from_cryptography`` methods on ``X509``, ``X509Req``, ``CRL``, and ``PKey``.
+
Elliptic curves
---------------
diff --git a/doc/api/ssl.rst b/doc/api/ssl.rst
index 53bcf40..6e856ce 100644
--- a/doc/api/ssl.rst
+++ b/doc/api/ssl.rst
@@ -306,16 +306,14 @@
.. py:method:: Context.set_default_verify_paths()
- Specify that the platform provided CA certificates are to be used for
- verification purposes. This method has some caveats related to the
- binary wheels that cryptography (pyOpenSSL's primary dependency) ships:
+ Specify that the platform provided CA certificates are to be used for verification purposes.
+ This method has some caveats related to the binary wheels that cryptography (pyOpenSSL's primary dependency) ships:
- * macOS will only load certificates using this method if the user has
- the ``openssl@1.1`` Homebrew formula installed in the default location.
+ * macOS will only load certificates using this method if the user has the ``openssl@1.1`` `Homebrew <https://brew.sh>`_ formula installed in the default location.
* Windows will not work.
- * manylinux1 cryptography wheels will work on most common Linux distributions
- in pyOpenSSL 17.1.0 and above. pyOpenSSL detects the manylinux1 wheel and
- attempts to load roots via a fallback path.
+ * manylinux1 cryptography wheels will work on most common Linux distributions in pyOpenSSL 17.1.0 and above.
+ pyOpenSSL detects the manylinux1 wheel and attempts to load roots via a fallback path.
+
.. py:method:: Context.load_tmp_dh(dhfile)