diff --git a/docs/bin/plugin_formatter.py b/docs/bin/plugin_formatter.py
index 216a537fc5..d1e6e659e2 100755
--- a/docs/bin/plugin_formatter.py
+++ b/docs/bin/plugin_formatter.py
@@ -89,7 +89,7 @@ def rst_ify(text):
     try:
         t = _ITALIC.sub(r"*\1*", text)
         t = _BOLD.sub(r"**\1**", t)
-        t = _MODULE.sub(r":ref:`\1`", t)
+        t = _MODULE.sub(r":ref:`\1 <\1>`", t)
         t = _URL.sub(r"\1", t)
         t = _CONST.sub(r"`\1`", t)
     except Exception as e:
diff --git a/docs/templates/plugin.rst.j2 b/docs/templates/plugin.rst.j2
index 4cdc6c1a8a..aae36a2e72 100644
--- a/docs/templates/plugin.rst.j2
+++ b/docs/templates/plugin.rst.j2
@@ -115,7 +115,7 @@ Options
                     <div class="outer-elbow-container">
                 </td>
                 {# required #}
-                <td><div class="cell-border">{% if value.get('required', False) %}yes{% else %}no{% endif %}</div></td>
+                <td><div class="cell-border">{% if value.get('required', False) %}required{% else %}optional{% endif %}</div></td>
                 {# default value #}
                 <td><div class="cell-border">{% if value.default %}@{ value.default }@{% endif %}</div></td>
                 {# choices #}