diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html
index 7a1d126ac5..9ef5fac4b0 100644
--- a/layouts/_default/cli.html
+++ b/layouts/_default/cli.html
@@ -96,7 +96,6 @@
         <thead>
           <tr>
             <th>Option</th>
-            <th>Short</th>
             <th>Default</th>
             <th>Description</th>
           </tr>
@@ -104,8 +103,17 @@
         <tbody>
           {{ range where . "hidden" false }}
             <tr>
-              <td>{{ with .option }}<code>--{{ . }}</code>{{ end }}</td>
-              <td>{{ with .shorthand }}<code>-{{ . }}</code>{{ end }}</td>
+              {{ $short := .shorthand }}
+              {{ $long := .option }}
+              <td>
+                {{ with .details_url }}
+                <a class="link" href="{{ . }}">
+                  <code>{{ with $short }}-{{ . }}, {{end}}--{{ $long }}</code>
+                </a>
+                {{ else }}
+                <code>{{ with $short }}-{{ . }}, {{end}}--{{ $long }}</code>
+                {{ end }}
+              </td>
               {{ $skipDefault := `[],map[],false,0,0s,default,'',""` }}
               <td>
                 {{ with .default_value }}