diff --git a/doc/source/cli/nova-api-metadata.rst b/doc/source/cli/nova-api-metadata.rst
index 7e97f99ea5..443792920c 100644
--- a/doc/source/cli/nova-api-metadata.rst
+++ b/doc/source/cli/nova-api-metadata.rst
@@ -42,8 +42,8 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
-* :nova-doc:`Using WSGI with Nova <wsgi.html>`
+:doc:`nova-api(1) <nova-api>`,
+:doc:`nova-api-os-compute(1) <nova-api-os-compute>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-api-os-compute.rst b/doc/source/cli/nova-api-os-compute.rst
index c789472bcb..60996effd5 100644
--- a/doc/source/cli/nova-api-os-compute.rst
+++ b/doc/source/cli/nova-api-os-compute.rst
@@ -40,8 +40,8 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
-* :nova-doc:`Using WSGI with Nova <user/wsgi.html>`
+:doc:`nova-api(1) <nova-api>`,
+:doc:`nova-api-metadata(1) <nova-api-metadata>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-api.rst b/doc/source/cli/nova-api.rst
index ef649fe079..fa9a3ba247 100644
--- a/doc/source/cli/nova-api.rst
+++ b/doc/source/cli/nova-api.rst
@@ -40,8 +40,8 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
-* :nova-doc:`Using WSGI with Nova <user/wsgi.html>`
+:doc:`nova-api-metadata(1) <nova-api-metadata>`,
+:doc:`nova-api-os-compute(1) <nova-api-os-compute>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-compute.rst b/doc/source/cli/nova-compute.rst
index f670d0916b..8b9fa49880 100644
--- a/doc/source/cli/nova-compute.rst
+++ b/doc/source/cli/nova-compute.rst
@@ -41,7 +41,11 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-conductor(1) <nova-conductor>`,
+:doc:`nova-manage(1) <nova-manage>`,
+:doc:`nova-rootwrap(1) <nova-rootwrap>`,
+:doc:`nova-scheduler(1) <nova-scheduler>`,
+:doc:`nova-status(1) <nova-status>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-conductor.rst b/doc/source/cli/nova-conductor.rst
index 38aa927b90..3020250e39 100644
--- a/doc/source/cli/nova-conductor.rst
+++ b/doc/source/cli/nova-conductor.rst
@@ -36,7 +36,11 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-compute(1) <nova-compute>`,
+:doc:`nova-manage(1) <nova-manage>`,
+:doc:`nova-rootwrap(1) <nova-rootwrap>`,
+:doc:`nova-scheduler(1) <nova-scheduler>`,
+:doc:`nova-status(1) <nova-status>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-manage.rst b/doc/source/cli/nova-manage.rst
index 3440279c13..8995c570b3 100644
--- a/doc/source/cli/nova-manage.rst
+++ b/doc/source/cli/nova-manage.rst
@@ -1508,8 +1508,7 @@ within an environment.
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
-
+:doc:`nova-status(1) <nova-status>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-novncproxy.rst b/doc/source/cli/nova-novncproxy.rst
index 816a9a0be9..03dcca0f22 100644
--- a/doc/source/cli/nova-novncproxy.rst
+++ b/doc/source/cli/nova-novncproxy.rst
@@ -87,7 +87,8 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-serialproxy(1) <nova-serialproxy>`,
+:doc:`nova-spicehtml5proxy(1) <nova-spicehtml5proxy>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-rootwrap.rst b/doc/source/cli/nova-rootwrap.rst
index f5865b3367..4fcae829fc 100644
--- a/doc/source/cli/nova-rootwrap.rst
+++ b/doc/source/cli/nova-rootwrap.rst
@@ -45,7 +45,7 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-compute(1) <nova-compute>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-scheduler.rst b/doc/source/cli/nova-scheduler.rst
index 361979e88b..41d3671d5d 100644
--- a/doc/source/cli/nova-scheduler.rst
+++ b/doc/source/cli/nova-scheduler.rst
@@ -40,7 +40,8 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-compute(1) <nova-compute>`,
+:doc:`nova-conductor(1) <nova-conductor>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-serialproxy.rst b/doc/source/cli/nova-serialproxy.rst
index e2ea551dd6..1d5d8bf0d9 100644
--- a/doc/source/cli/nova-serialproxy.rst
+++ b/doc/source/cli/nova-serialproxy.rst
@@ -60,7 +60,8 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-novncproxy(1) <nova-novncproxy>`,
+:doc:`nova-spicehtml5proxy(1) <nova-spicehtml5proxy>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-spicehtml5proxy.rst b/doc/source/cli/nova-spicehtml5proxy.rst
index 5718a8f294..162a2f4101 100644
--- a/doc/source/cli/nova-spicehtml5proxy.rst
+++ b/doc/source/cli/nova-spicehtml5proxy.rst
@@ -61,7 +61,8 @@ Files
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-novncproxy(1) <nova-novncproxy>`,
+:doc:`nova-serialproxy(1) <nova-serialproxy>`
 
 Bugs
 ====
diff --git a/doc/source/cli/nova-status.rst b/doc/source/cli/nova-status.rst
index 6341bf0e99..96e9ae1258 100644
--- a/doc/source/cli/nova-status.rst
+++ b/doc/source/cli/nova-status.rst
@@ -151,7 +151,7 @@ Upgrade
 See Also
 ========
 
-* :nova-doc:`OpenStack Nova <>`
+:doc:`nova-manage(1) <nova-manage>`
 
 Bugs
 ====