nixos/make-options-doc: rearrange paras in related packages/defaults/examples

this mirrors what we will be able to create with markdown. no change to
rendered outputs.

2 files changed, 7 insertions, 5 deletions

diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py
index cdbf7cc21f0..ef9f321e114 100644
--- a/nixos/lib/make-options-doc/mergeJSON.py
+++ b/nixos/lib/make-options-doc/mergeJSON.py
@@ -220,8 +220,11 @@ def convertMD(options: Dict[str, Any]) -> str:
             # inline literals need a space to separate ticks from content, code blocks
             # need newlines. inline literals need one extra tick, code blocks need three.
             ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ')
-            docbook = convertString(name, f"*{key.capitalize()}:*\n{ticks}{sep}{code}{sep}{ticks}")
-            option[rendered] = f"<para>{docbook}</para>"
+            docbook = convertString(name, f"{ticks}{sep}{code}{sep}{ticks}")
+            if multiline:
+                option[rendered] = f"<para><emphasis>{key.capitalize()}:</emphasis></para> {docbook}"
+            else:
+                option[rendered] = f"<para><emphasis>{key.capitalize()}:</emphasis> {docbook}</para>"
         elif optionIs(option, key, 'literalDocBook'):
             option[rendered] = f"<para><emphasis>{key.capitalize()}:</emphasis> {option[key]['text']}</para>"
         elif key in option:
diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl
index 7a80931df0d..a74429596b8 100644
--- a/nixos/lib/make-options-doc/options-to-docbook.xsl
+++ b/nixos/lib/make-options-doc/options-to-docbook.xsl
@@ -85,10 +85,9 @@
               <xsl:if test="attr[@name = 'relatedPackages']">
                 <para>
                   <emphasis>Related packages:</emphasis>
-                  <xsl:text> </xsl:text>
-                  <xsl:value-of disable-output-escaping="yes"
-                                select="attr[@name = 'relatedPackages']/string/@value" />
                 </para>
+                <xsl:value-of disable-output-escaping="yes"
+                              select="attr[@name = 'relatedPackages']/string/@value" />
               </xsl:if>
 
               <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">