diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst
index 25c1aaf4dc..7ec494da63 100644
--- a/doc/source/gerrit.rst
+++ b/doc/source/gerrit.rst
@@ -8,7 +8,7 @@ Gerrit
Gerrit is the code review system used by the OpenStack project. For a
full description of how the system fits into the OpenStack workflow,
see `the development workflow guide
-`_.
+`_.
This section describes how Gerrit is configured for use in the
OpenStack project and the tools used to manage that configuration.
diff --git a/doc/source/github.rst b/doc/source/github.rst
index 119d5f984f..337ec9d9ce 100644
--- a/doc/source/github.rst
+++ b/doc/source/github.rst
@@ -48,7 +48,7 @@ submitted and closes them with a helpful message pointing people to the
documentation on `Contributing to OpenStack`_. More information on this can
be found in the :ref:`jeepyb` document at :ref:`closing_pull_requests`.
-.. _Contributing to OpenStack: http://docs.openstack.org/infra/manual/developers.html#getting-started
+.. _Contributing to OpenStack: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#getting-started
.. _openstack_zuul_app:
diff --git a/doc/source/index.rst b/doc/source/index.rst
index a9448952fa..2e8fd871af 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -9,7 +9,7 @@ projects that want to set up similar infrastructure systems for their
developers.
OpenStack developers or users do not need to read this documentation.
-Instead, see the `Infra Manual `_
+Instead, see the `Infra Manual `_
to learn how contribute to or the `OpenStack documentation
`_ on how to use OpenStack.
diff --git a/doc/source/project.rst b/doc/source/project.rst
index 9c28ea6c4a..815126a733 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -260,4 +260,4 @@ please note them in a review, for example, with "(nit)" or "(not a
anyway".
Please also see the section in the Infrastructure Manual on `peer review
-`_.
+`_.
diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst
index e0ec2d8d6b..6a7737292c 100644
--- a/doc/source/sysadmin.rst
+++ b/doc/source/sysadmin.rst
@@ -100,7 +100,7 @@ project. You can edit the contents of the system-config repo and
iterate ``puppet apply`` as needed. When you're ready to propose the
change for review, you can propose the change with git-review. See the
`Development workflow section in the Developer's Guide
-`_
+`_
for more information.
Accessing Clouds
diff --git a/doc/source/unofficial_project_hosting.rst b/doc/source/unofficial_project_hosting.rst
index 1d31bc8a04..b3d004b226 100644
--- a/doc/source/unofficial_project_hosting.rst
+++ b/doc/source/unofficial_project_hosting.rst
@@ -55,11 +55,11 @@ is current OpenStack developers who are assumed to already be familiar
with how changes are uploaded and reviewed within OpenStack projects. As
an introduction to OpenStack contribution, it is recommend to first read
https://wiki.openstack.org/wiki/How_To_Contribute and then
-the `Developer's Guide `_.
+the `Developer's Guide `_.
Create an Unofficial Project
****************************
For information on adding an unofficial project, see the `Project
Creator's Guide
-`_.
+`_.
diff --git a/modules/openstack_project/files/gerrit/system-cla.html b/modules/openstack_project/files/gerrit/system-cla.html
index e970a56a77..44b56195e0 100644
--- a/modules/openstack_project/files/gerrit/system-cla.html
+++ b/modules/openstack_project/files/gerrit/system-cla.html
@@ -6,7 +6,7 @@ Gerrit System Role Accounts Proxy CLA
This is not a real CLA and cannot be signed. See the
+href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html#account-setup">the
account setup instructions for more information on OpenStack Contributor
License Agreements.
diff --git a/modules/openstack_project/files/gerrit/usg-cla.html b/modules/openstack_project/files/gerrit/usg-cla.html
index 832fe152c9..9a17031045 100644
--- a/modules/openstack_project/files/gerrit/usg-cla.html
+++ b/modules/openstack_project/files/gerrit/usg-cla.html
@@ -8,7 +8,7 @@ OpenStack Project U.S. Government Contributor License Agreement
This agreement is not managed through Gerrit. If you need to sign the U.S.
Government Contributor License Agreement, please contact the OpenStack
Foundation to initiate the process. See the
+href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html#account-setup">the
account setup instructions for more information on OpenStack Contributor
License Agreements.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archidxfoot.html b/modules/openstack_project/files/mailman/html-templates-en/archidxfoot.html
index 60bf4ca80f..05f6d10806 100644
--- a/modules/openstack_project/files/mailman/html-templates-en/archidxfoot.html
+++ b/modules/openstack_project/files/mailman/html-templates-en/archidxfoot.html
@@ -35,7 +35,7 @@
Events
Jobs
Companies
- Contribute
+ Contribute
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archtoc.html b/modules/openstack_project/files/mailman/html-templates-en/archtoc.html
index 96b1a71c8d..ce347f12d5 100644
--- a/modules/openstack_project/files/mailman/html-templates-en/archtoc.html
+++ b/modules/openstack_project/files/mailman/html-templates-en/archtoc.html
@@ -101,7 +101,7 @@
Events
Jobs
Companies
-
Contribute
+
Contribute
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archtocnombox.html b/modules/openstack_project/files/mailman/html-templates-en/archtocnombox.html
index 62fda7b02d..7cc51ff75d 100644
--- a/modules/openstack_project/files/mailman/html-templates-en/archtocnombox.html
+++ b/modules/openstack_project/files/mailman/html-templates-en/archtocnombox.html
@@ -101,7 +101,7 @@
Events
Jobs
Companies
-
Contribute
+
Contribute
diff --git a/modules/openstack_project/files/mailman/html-templates-en/article.html b/modules/openstack_project/files/mailman/html-templates-en/article.html
index a2d6410954..57a0adb9c5 100644
--- a/modules/openstack_project/files/mailman/html-templates-en/article.html
+++ b/modules/openstack_project/files/mailman/html-templates-en/article.html
@@ -139,7 +139,7 @@ mailing list
Events
Jobs
Companies
-
Contribute
+
Contribute
diff --git a/modules/openstack_project/files/mailman/html-templates-en/emptyarchive.html b/modules/openstack_project/files/mailman/html-templates-en/emptyarchive.html
index 250b007860..bda52d8064 100644
--- a/modules/openstack_project/files/mailman/html-templates-en/emptyarchive.html
+++ b/modules/openstack_project/files/mailman/html-templates-en/emptyarchive.html
@@ -96,7 +96,7 @@ i