diff --git a/llvm/docs/CommandGuide/bugpoint.rst b/llvm/docs/CommandGuide/bugpoint.rst
--- a/llvm/docs/CommandGuide/bugpoint.rst
+++ b/llvm/docs/CommandGuide/bugpoint.rst
@@ -194,4 +194,4 @@
 SEE ALSO
 --------
 
-opt|opt
+:manpage:`opt(1)`
diff --git a/llvm/docs/CommandGuide/llc.rst b/llvm/docs/CommandGuide/llc.rst
--- a/llvm/docs/CommandGuide/llc.rst
+++ b/llvm/docs/CommandGuide/llc.rst
@@ -211,4 +211,4 @@
 SEE ALSO
 --------
 
-lli
+:manpage:`lli(1)`
diff --git a/llvm/docs/CommandGuide/lli.rst b/llvm/docs/CommandGuide/lli.rst
--- a/llvm/docs/CommandGuide/lli.rst
+++ b/llvm/docs/CommandGuide/lli.rst
@@ -214,4 +214,4 @@
 SEE ALSO
 --------
 
-:program:`llc`
+:manpage:`llc(1)`
diff --git a/llvm/docs/CommandGuide/llvm-as.rst b/llvm/docs/CommandGuide/llvm-as.rst
--- a/llvm/docs/CommandGuide/llvm-as.rst
+++ b/llvm/docs/CommandGuide/llvm-as.rst
@@ -55,4 +55,4 @@
 SEE ALSO
 --------
 
-llvm-dis|llvm-dis, gccas|gccas
+:manpage:`llvm-dis(1)`, as(1)
diff --git a/llvm/docs/CommandGuide/llvm-bcanalyzer.rst b/llvm/docs/CommandGuide/llvm-bcanalyzer.rst
--- a/llvm/docs/CommandGuide/llvm-bcanalyzer.rst
+++ b/llvm/docs/CommandGuide/llvm-bcanalyzer.rst
@@ -303,4 +303,4 @@
 SEE ALSO
 --------
 
-:doc:`/CommandGuide/llvm-dis`, :doc:`/BitCodeFormat`
+:manpage:`llvm-dis(1)`, :doc:`/BitCodeFormat`
diff --git a/llvm/docs/CommandGuide/llvm-dis.rst b/llvm/docs/CommandGuide/llvm-dis.rst
--- a/llvm/docs/CommandGuide/llvm-dis.rst
+++ b/llvm/docs/CommandGuide/llvm-dis.rst
@@ -51,4 +51,4 @@
 SEE ALSO
 --------
 
-llvm-as|llvm-as
+:manpage:`llvm-as(1)`
diff --git a/llvm/docs/CommandGuide/llvm-extract.rst b/llvm/docs/CommandGuide/llvm-extract.rst
--- a/llvm/docs/CommandGuide/llvm-extract.rst
+++ b/llvm/docs/CommandGuide/llvm-extract.rst
@@ -77,4 +77,4 @@
 SEE ALSO
 --------
 
-bugpoint
+:manpage:`bugpoint(1)`