diff --git a/doc/doc-contrib-guide/source/doc-tools/template-generator.rst b/doc/doc-contrib-guide/source/doc-tools/template-generator.rst
index f61dbdc581..1a89ce591b 100644
--- a/doc/doc-contrib-guide/source/doc-tools/template-generator.rst
+++ b/doc/doc-contrib-guide/source/doc-tools/template-generator.rst
@@ -107,7 +107,7 @@ Here are a few representative files under ``www/``:
   * ``README.rst``
   * ``schema.yaml``
 
-* ``redirect-tests.txt`` -- input file for `whereto <http://whereto.readthedocs.io/en/latest/>`_
+* ``redirect-tests.txt`` -- input file for `whereto <https://docs.openstack.org/whereto/>`_
   to test ``.htaccess``;
   see http://files.openstack.org/docs-404s/ for a list of recent 404
   errors
diff --git a/doc/doc-contrib-guide/source/project-deploy-guide.rst b/doc/doc-contrib-guide/source/project-deploy-guide.rst
index 8f0c1e8914..21eac65212 100644
--- a/doc/doc-contrib-guide/source/project-deploy-guide.rst
+++ b/doc/doc-contrib-guide/source/project-deploy-guide.rst
@@ -6,7 +6,7 @@ As of the Newton release, a new method of publishing deployment guides has
 been implemented. This allows each deployment projects to create their own
 deployment guide, based on a standard template, in their own repository.
 These guides are then centrally published to
-`Deployment Guides <https://docs.openstack.org/newton/deploy/newton/>`_.
+`Deployment Guides <https://docs.openstack.org/newton/deploy/>`_.
 
 .. note::
 
diff --git a/doc/image-guide/source/virt-install.rst b/doc/image-guide/source/virt-install.rst
index 903f2266e3..c32365b027 100644
--- a/doc/image-guide/source/virt-install.rst
+++ b/doc/image-guide/source/virt-install.rst
@@ -11,8 +11,7 @@ console from a VNC client installed on your local machine.
 
 Because VNC is a standard protocol, there are multiple clients
 available that implement the VNC spec, including
-`TigerVNC <http://sourceforge.net/apps/mediawiki/tigervnc/
-index.php?title=Welcome_to_TigerVNC>`_ (multiple platforms),
+`TigerVNC <https://tigervnc.org/>`_ (multiple platforms),
 `TightVNC <http://tightvnc.com/>`_ (multiple platforms),
 `RealVNC <http://realvnc.com/>`_ (multiple platforms),
 `Chicken <http://sourceforge.net/projects/chicken/>`_ (Mac OS X),
diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst
index a756f07839..4d4dc9aa1b 100644
--- a/releasenotes/source/mitaka.rst
+++ b/releasenotes/source/mitaka.rst
@@ -13,19 +13,19 @@ Configuration Reference
 High Availability Guide
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-* Added the `Highly available Shared File Systems API <https://docs.openstack.org/ha-guide/storage-ha-file-systems.html>`_
+* Added the `Highly available Shared File Systems API  <https://docs.openstack.org/ha-guide/storage-ha-file-systems.html>`_
   section.
 
-* Improved `Pacemaker/Corosync cluster <https://docs.openstack.org/ha-guide/controller-ha-pacemaker.html>`_
-  installation and configuration details.
+* Improved Pacemaker/Corosync cluster installation and configuration
+  details.
 
-* Documented the `Pacemaker cluster manager <https://docs.openstack.org/ha-guide/intro-ha-arch-pacemaker.html>`_
-  and Keepalived architecture details and limitations.
+* Documented the Pacemaker cluster manager and Keepalived architecture
+  details and limitations.
 
-* Added the `MariaDB Galera cluster <https://docs.openstack.org/ha-guide/shared-database.html>`_
-  installation, configuration, and management details.
+* Added the MariaDB Galera cluster installation, configuration, and
+  management details.
 
-* Improved the `RabbitMQ section <https://docs.openstack.org/ha-guide/shared-messaging.html>`_.
+* Improved the RabbitMQ section.
 
 Installation Guide
 ~~~~~~~~~~~~~~~~~~