Bend some recent changes to standards (#669)

5 files changed, 14 insertions, 21 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9d435e9..738ceab 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,12 +25,9 @@ Deprecations:
 Changes:
 ^^^^^^^^
 
-- Fixed a bug causing ``Context.set_default_verify_paths()`` to not work with 
-  cryptography ``manylinux1`` wheels on Python 3.x.
+- Fixed a bug causing ``Context.set_default_verify_paths()`` to not work with cryptography ``manylinux1`` wheels on Python 3.x.
   `#665 <https://github.com/pyca/pyopenssl/pull/665>`_
 
-*none*
-
 
 ----
 
diff --git a/README.rst b/README.rst
index 0a0f84e..36046ca 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ pyOpenSSL -- A Python wrapper around the OpenSSL library
 ========================================================
 
 .. image:: https://readthedocs.org/projects/pyopenssl/badge/?version=stable
-   :target: https://pyopenssl.readthedocs.io/
+   :target: https://pyopenssl.org/en/stable/
    :alt: Stable Docs
 
 .. image:: https://travis-ci.org/pyca/pyopenssl.svg?branch=master
@@ -37,7 +37,7 @@ We maintain a cryptography-dev_ mailing list for both user and development discu
 You can also join ``#cryptography-dev`` on Freenode to ask questions or get involved.
 
 
-.. _documentation: https://pyopenssl.readthedocs.io/
+.. _documentation: https://pyopenssl.org/
 .. _`issue tracker`: https://github.com/pyca/pyopenssl/issues
 .. _cryptography-dev: https://mail.python.org/mailman/listinfo/cryptography-dev
 .. _GitHub: https://github.com/pyca/pyopenssl
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 @@ Context objects have the following methods:
 
 .. 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)
 
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 399c574..3f56798 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -14,7 +14,7 @@ __all__ = [
 __version__ = "17.2.0.dev0.0"
 
 __title__ = "pyOpenSSL"
-__uri__ = "https://pyopenssl.readthedocs.io/"
+__uri__ = "https://pyopenssl.org/"
 __summary__ = "Python wrapper module around the OpenSSL library"
 __author__ = "The pyOpenSSL developers"
 __email__ = "cryptography-dev@python.org"