doc: ran `make format`

With visual inspection that nothing got worse.

1 files changed, 285 insertions, 141 deletions

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 78fa1d209b5..f6180d5ca6a 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -361,7 +361,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Variables specifying dependencies</title>
    <varlistentry>
-    <term><varname>depsBuildBuild</varname>
+    <term>
+     <varname>depsBuildBuild</varname>
     </term>
     <listitem>
      <para>
@@ -386,7 +387,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>nativeBuildInputs</varname>
+    <term>
+     <varname>nativeBuildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -412,7 +414,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsBuildTarget</varname>
+    <term>
+     <varname>depsBuildTarget</varname>
     </term>
     <listitem>
      <para>
@@ -451,7 +454,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsHostHost</varname>
+    <term>
+     <varname>depsHostHost</varname>
     </term>
     <listitem>
      <para>
@@ -469,7 +473,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>buildInputs</varname>
+    <term>
+     <varname>buildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -492,7 +497,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsTargetTarget</varname>
+    <term>
+     <varname>depsTargetTarget</varname>
     </term>
     <listitem>
      <para>
@@ -508,7 +514,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsBuildBuildPropagated</varname>
+    <term>
+     <varname>depsBuildBuildPropagated</varname>
     </term>
     <listitem>
      <para>
@@ -519,7 +526,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>propagatedNativeBuildInputs</varname>
+    <term>
+     <varname>propagatedNativeBuildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -539,7 +547,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsBuildTargetPropagated</varname>
+    <term>
+     <varname>depsBuildTargetPropagated</varname>
     </term>
     <listitem>
      <para>
@@ -549,7 +558,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsHostHostPropagated</varname>
+    <term>
+     <varname>depsHostHostPropagated</varname>
     </term>
     <listitem>
      <para>
@@ -558,7 +568,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>propagatedBuildInputs</varname>
+    <term>
+     <varname>propagatedBuildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -569,7 +580,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsTargetTarget</varname>
+    <term>
+     <varname>depsTargetTarget</varname>
     </term>
     <listitem>
      <para>
@@ -586,7 +598,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Variables affecting <literal>stdenv</literal> initialisation</title>
    <varlistentry>
-    <term><varname>NIX_DEBUG</varname>
+    <term>
+     <varname>NIX_DEBUG</varname>
     </term>
     <listitem>
      <para>
@@ -607,7 +620,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Variables affecting build properties</title>
    <varlistentry>
-    <term><varname>enableParallelBuilding</varname>
+    <term>
+     <varname>enableParallelBuilding</varname>
     </term>
     <listitem>
      <para>
@@ -624,7 +638,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>preferLocalBuild</varname>
+    <term>
+     <varname>preferLocalBuild</varname>
     </term>
     <listitem>
      <para>
@@ -642,7 +657,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Special variables</title>
    <varlistentry>
-    <term><varname>passthru</varname>
+    <term>
+     <varname>passthru</varname>
     </term>
     <listitem>
      <para>
@@ -707,7 +723,8 @@ passthru = {
     <variablelist>
      <title>Variables affecting phase control</title>
      <varlistentry>
-      <term><varname>phases</varname>
+      <term>
+       <varname>phases</varname>
       </term>
       <listitem>
        <para>
@@ -727,7 +744,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>prePhases</varname>
+      <term>
+       <varname>prePhases</varname>
       </term>
       <listitem>
        <para>
@@ -736,7 +754,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preConfigurePhases</varname>
+      <term>
+       <varname>preConfigurePhases</varname>
       </term>
       <listitem>
        <para>
@@ -745,7 +764,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preBuildPhases</varname>
+      <term>
+       <varname>preBuildPhases</varname>
       </term>
       <listitem>
        <para>
@@ -754,7 +774,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preInstallPhases</varname>
+      <term>
+       <varname>preInstallPhases</varname>
       </term>
       <listitem>
        <para>
@@ -763,7 +784,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preFixupPhases</varname>
+      <term>
+       <varname>preFixupPhases</varname>
       </term>
       <listitem>
        <para>
@@ -772,7 +794,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preDistPhases</varname>
+      <term>
+       <varname>preDistPhases</varname>
       </term>
       <listitem>
        <para>
@@ -781,7 +804,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>postPhases</varname>
+      <term>
+       <varname>postPhases</varname>
       </term>
       <listitem>
        <para>
@@ -804,7 +828,9 @@ passthru = {
     default:
     <variablelist>
      <varlistentry>
-      <term>Tar files</term>
+      <term>
+       Tar files
+      </term>
       <listitem>
        <para>
         These can optionally be compressed using <command>gzip</command>
@@ -817,7 +843,9 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Zip files</term>
+      <term>
+       Zip files
+      </term>
       <listitem>
        <para>
         Zip files are unpacked using <command>unzip</command>. However,
@@ -827,7 +855,9 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Directories in the Nix store</term>
+      <term>
+       Directories in the Nix store
+      </term>
       <listitem>
        <para>
         These are simply copied to the current directory. The hash part of the
@@ -847,7 +877,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the unpack phase</title>
     <varlistentry>
-     <term><varname>srcs</varname> / <varname>src</varname>
+     <term>
+      <varname>srcs</varname> / <varname>src</varname>
      </term>
      <listitem>
       <para>
@@ -857,7 +888,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>sourceRoot</varname>
+     <term>
+      <varname>sourceRoot</varname>
      </term>
      <listitem>
       <para>
@@ -869,7 +901,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>setSourceRoot</varname>
+     <term>
+      <varname>setSourceRoot</varname>
      </term>
      <listitem>
       <para>
@@ -881,7 +914,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preUnpack</varname>
+     <term>
+      <varname>preUnpack</varname>
      </term>
      <listitem>
       <para>
@@ -890,7 +924,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postUnpack</varname>
+     <term>
+      <varname>postUnpack</varname>
      </term>
      <listitem>
       <para>
@@ -899,7 +934,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontMakeSourcesWritable</varname>
+     <term>
+      <varname>dontMakeSourcesWritable</varname>
      </term>
      <listitem>
       <para>
@@ -911,7 +947,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>unpackCmd</varname>
+     <term>
+      <varname>unpackCmd</varname>
      </term>
      <listitem>
       <para>
@@ -935,7 +972,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the patch phase</title>
     <varlistentry>
-     <term><varname>patches</varname>
+     <term>
+      <varname>patches</varname>
      </term>
      <listitem>
       <para>
@@ -948,7 +986,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>patchFlags</varname>
+     <term>
+      <varname>patchFlags</varname>
      </term>
      <listitem>
       <para>
@@ -959,7 +998,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>prePatch</varname>
+     <term>
+      <varname>prePatch</varname>
      </term>
      <listitem>
       <para>
@@ -968,7 +1008,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postPatch</varname>
+     <term>
+      <varname>postPatch</varname>
      </term>
      <listitem>
       <para>
@@ -991,7 +1032,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the configure phase</title>
     <varlistentry>
-     <term><varname>configureScript</varname>
+     <term>
+      <varname>configureScript</varname>
      </term>
      <listitem>
       <para>
@@ -1003,7 +1045,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>configureFlags</varname>
+     <term>
+      <varname>configureFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1013,7 +1056,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>configureFlagsArray</varname>
+     <term>
+      <varname>configureFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1024,7 +1068,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontAddPrefix</varname>
+     <term>
+      <varname>dontAddPrefix</varname>
      </term>
      <listitem>
       <para>
@@ -1034,7 +1079,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>prefix</varname>
+     <term>
+      <varname>prefix</varname>
      </term>
      <listitem>
       <para>
@@ -1045,7 +1091,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontAddDisableDepTrack</varname>
+     <term>
+      <varname>dontAddDisableDepTrack</varname>
      </term>
      <listitem>
       <para>
@@ -1056,7 +1103,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontFixLibtool</varname>
+     <term>
+      <varname>dontFixLibtool</varname>
      </term>
      <listitem>
       <para>
@@ -1076,7 +1124,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontDisableStatic</varname>
+     <term>
+      <varname>dontDisableStatic</varname>
      </term>
      <listitem>
       <para>
@@ -1090,7 +1139,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>configurePlatforms</varname>
+     <term>
+      <varname>configurePlatforms</varname>
      </term>
      <listitem>
       <para>
@@ -1111,7 +1161,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preConfigure</varname>
+     <term>
+      <varname>preConfigure</varname>
      </term>
      <listitem>
       <para>
@@ -1120,7 +1171,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postConfigure</varname>
+     <term>
+      <varname>postConfigure</varname>
      </term>
      <listitem>
       <para>
@@ -1146,7 +1198,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the build phase</title>
     <varlistentry>
-     <term><varname>dontBuild</varname>
+     <term>
+      <varname>dontBuild</varname>
      </term>
      <listitem>
       <para>
@@ -1155,7 +1208,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makefile</varname>
+     <term>
+      <varname>makefile</varname>
      </term>
      <listitem>
       <para>
@@ -1164,15 +1218,19 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-      <term><varname>checkInputs</varname>
-      </term>
-      <listitem><para>
-        A list of dependencies used by the phase. This gets included in
-        <varname>buildInputs</varname> when <varname>doCheck</varname> is set.
-      </para></listitem>
+     <term>
+      <varname>checkInputs</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of dependencies used by the phase. This gets included in
+       <varname>buildInputs</varname> when <varname>doCheck</varname> is set.
+      </para>
+     </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makeFlags</varname>
+     <term>
+      <varname>makeFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1193,7 +1251,8 @@ makeFlags = [ "PREFIX=$(out)" ];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makeFlagsArray</varname>
+     <term>
+      <varname>makeFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1211,7 +1270,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname>
+     <term>
+      <varname>buildFlags</varname> / <varname>buildFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1222,7 +1282,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preBuild</varname>
+     <term>
+      <varname>preBuild</varname>
      </term>
      <listitem>
       <para>
@@ -1231,7 +1292,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postBuild</varname>
+     <term>
+      <varname>postBuild</varname>
      </term>
      <listitem>
       <para>
@@ -1266,7 +1328,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
    <variablelist>
     <title>Variables controlling the check phase</title>
     <varlistentry>
-     <term><varname>doCheck</varname>
+     <term>
+      <varname>doCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1282,9 +1345,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makeFlags</varname> /
-    <varname>makeFlagsArray</varname> /
-    <varname>makefile</varname>
+     <term>
+      <varname>makeFlags</varname> / <varname>makeFlagsArray</varname> / <varname>makefile</varname>
      </term>
      <listitem>
       <para>
@@ -1293,7 +1355,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>checkTarget</varname>
+     <term>
+      <varname>checkTarget</varname>
      </term>
      <listitem>
       <para>
@@ -1303,7 +1366,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname>
+     <term>
+      <varname>checkFlags</varname> / <varname>checkFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1314,7 +1378,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preCheck</varname>
+     <term>
+      <varname>preCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1323,7 +1388,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postCheck</varname>
+     <term>
+      <varname>postCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1347,9 +1413,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
    <variablelist>
     <title>Variables controlling the install phase</title>
     <varlistentry>
-     <term><varname>makeFlags</varname> /
-    <varname>makeFlagsArray</varname> /
-    <varname>makefile</varname>
+     <term>
+      <varname>makeFlags</varname> / <varname>makeFlagsArray</varname> / <varname>makefile</varname>
      </term>
      <listitem>
       <para>
@@ -1358,7 +1423,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>installTargets</varname>
+     <term>
+      <varname>installTargets</varname>
      </term>
      <listitem>
       <para>
@@ -1370,7 +1436,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>installFlags</varname> / <varname>installFlagsArray</varname>
+     <term>
+      <varname>installFlags</varname> / <varname>installFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1381,7 +1448,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preInstall</varname>
+     <term>
+      <varname>preInstall</varname>
      </term>
      <listitem>
       <para>
@@ -1390,7 +1458,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postInstall</varname>
+     <term>
+      <varname>postInstall</varname>
      </term>
      <listitem>
       <para>
@@ -1444,7 +1513,8 @@ installTargets = "install-bin install-doc";</programlisting>
    <variablelist>
     <title>Variables controlling the fixup phase</title>
     <varlistentry>
-     <term><varname>dontStrip</varname>
+     <term>
+      <varname>dontStrip</varname>
      </term>
      <listitem>
       <para>
@@ -1454,7 +1524,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontStripHost</varname>
+     <term>
+      <varname>dontStripHost</varname>
      </term>
      <listitem>
       <para>
@@ -1466,7 +1537,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontStripTarget</varname>
+     <term>
+      <varname>dontStripTarget</varname>
      </term>
      <listitem>
       <para>
@@ -1478,7 +1550,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontMoveSbin</varname>
+     <term>
+      <varname>dontMoveSbin</varname>
      </term>
      <listitem>
       <para>
@@ -1488,7 +1561,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripAllList</varname>
+     <term>
+      <varname>stripAllList</varname>
      </term>
      <listitem>
       <para>
@@ -1500,7 +1574,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripAllFlags</varname>
+     <term>
+      <varname>stripAllFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1511,7 +1586,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripDebugList</varname>
+     <term>
+      <varname>stripDebugList</varname>
      </term>
      <listitem>
       <para>
@@ -1522,7 +1598,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripDebugFlags</varname>
+     <term>
+      <varname>stripDebugFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1533,7 +1610,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontPatchELF</varname>
+     <term>
+      <varname>dontPatchELF</varname>
      </term>
      <listitem>
       <para>
@@ -1543,7 +1621,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontPatchShebangs</varname>
+     <term>
+      <varname>dontPatchShebangs</varname>
      </term>
      <listitem>
       <para>
@@ -1553,7 +1632,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>forceShare</varname>
+     <term>
+      <varname>forceShare</varname>
      </term>
      <listitem>
       <para>
@@ -1564,7 +1644,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>setupHook</varname>
+     <term>
+      <varname>setupHook</varname>
      </term>
      <listitem>
       <para>
@@ -1579,7 +1660,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preFixup</varname>
+     <term>
+      <varname>preFixup</varname>
      </term>
      <listitem>
       <para>
@@ -1588,7 +1670,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postFixup</varname>
+     <term>
+      <varname>postFixup</varname>
      </term>
      <listitem>
       <para>
@@ -1597,7 +1680,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="stdenv-separateDebugInfo">
-     <term><varname>separateDebugInfo</varname>
+     <term>
+      <varname>separateDebugInfo</varname>
      </term>
      <listitem>
       <para>
@@ -1639,7 +1723,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
    <variablelist>
     <title>Variables controlling the installCheck phase</title>
     <varlistentry>
-     <term><varname>doInstallCheck</varname>
+     <term>
+      <varname>doInstallCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1655,16 +1740,20 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-      <term><varname>installCheckInputs</varname>
-      </term>
-      <listitem><para>
-        A list of dependencies used by the phase. This gets included in
-        <varname>buildInputs</varname> when <varname>doInstallCheck</varname>
-        is set.
-      </para></listitem>
+     <term>
+      <varname>installCheckInputs</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of dependencies used by the phase. This gets included in
+       <varname>buildInputs</varname> when <varname>doInstallCheck</varname> is
+       set.
+      </para>
+     </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preInstallCheck</varname>
+     <term>
+      <varname>preInstallCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1673,7 +1762,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postInstallCheck</varname>
+     <term>
+      <varname>postInstallCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1698,7 +1788,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
    <variablelist>
     <title>Variables controlling the distribution phase</title>
     <varlistentry>
-     <term><varname>distTarget</varname>
+     <term>
+      <varname>distTarget</varname>
      </term>
      <listitem>
       <para>
@@ -1708,7 +1799,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>distFlags</varname> / <varname>distFlagsArray</varname>
+     <term>
+      <varname>distFlags</varname> / <varname>distFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1717,7 +1809,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>tarballs</varname>
+     <term>
+      <varname>tarballs</varname>
      </term>
      <listitem>
       <para>
@@ -1728,7 +1821,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontCopyDist</varname>
+     <term>
+      <varname>dontCopyDist</varname>
      </term>
      <listitem>
       <para>
@@ -1737,7 +1831,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preDist</varname>
+     <term>
+      <varname>preDist</varname>
      </term>
      <listitem>
       <para>
@@ -1746,7 +1841,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postDist</varname>
+     <term>
+      <varname>postDist</varname>
      </term>
      <listitem>
       <para>
@@ -1766,7 +1862,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
 
   <variablelist>
    <varlistentry xml:id='fun-makeWrapper'>
-    <term><function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable>
+    <term>
+     <function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable>
     </term>
     <listitem>
      <para>
@@ -1791,7 +1888,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substitute'>
-    <term><function>substitute</function><replaceable>infile</replaceable><replaceable>outfile</replaceable><replaceable>subs</replaceable>
+    <term>
+     <function>substitute</function><replaceable>infile</replaceable><replaceable>outfile</replaceable><replaceable>subs</replaceable>
     </term>
     <listitem>
      <para>
@@ -1801,7 +1899,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
       <replaceable>subs</replaceable> are of the following form:
       <variablelist>
        <varlistentry>
-        <term><option>--replace</option><replaceable>s1</replaceable><replaceable>s2</replaceable>
+        <term>
+         <option>--replace</option><replaceable>s1</replaceable><replaceable>s2</replaceable>
         </term>
         <listitem>
          <para>
@@ -1811,7 +1910,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term><option>--subst-var</option><replaceable>varName</replaceable>
+        <term>
+         <option>--subst-var</option><replaceable>varName</replaceable>
         </term>
         <listitem>
          <para>
@@ -1826,7 +1926,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term><option>--subst-var-by</option><replaceable>varName</replaceable><replaceable>s</replaceable>
+        <term>
+         <option>--subst-var-by</option><replaceable>varName</replaceable><replaceable>s</replaceable>
         </term>
         <listitem>
          <para>
@@ -1860,7 +1961,8 @@ substitute ./foo.in ./foo.out \
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substituteInPlace'>
-    <term><function>substituteInPlace</function><replaceable>file</replaceable><replaceable>subs</replaceable>
+    <term>
+     <function>substituteInPlace</function><replaceable>file</replaceable><replaceable>subs</replaceable>
     </term>
     <listitem>
      <para>
@@ -1870,7 +1972,8 @@ substitute ./foo.in ./foo.out \
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substituteAll'>
-    <term><function>substituteAll</function><replaceable>infile</replaceable><replaceable>outfile</replaceable>
+    <term>
+     <function>substituteAll</function><replaceable>infile</replaceable><replaceable>outfile</replaceable>
     </term>
     <listitem>
      <para>
@@ -1909,7 +2012,8 @@ echo @foo@
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substituteAllInPlace'>
-    <term><function>substituteAllInPlace</function><replaceable>file</replaceable>
+    <term>
+     <function>substituteAllInPlace</function><replaceable>file</replaceable>
     </term>
     <listitem>
      <para>
@@ -1919,7 +2023,8 @@ echo @foo@
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-stripHash'>
-    <term><function>stripHash</function><replaceable>path</replaceable>
+    <term>
+     <function>stripHash</function><replaceable>path</replaceable>
     </term>
     <listitem>
      <para>
@@ -1939,7 +2044,8 @@ someVar=$(stripHash $name)
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-wrapProgram'>
-    <term><function>wrapProgram</function><replaceable>executable</replaceable><replaceable>makeWrapperArgs</replaceable>
+    <term>
+     <function>wrapProgram</function><replaceable>executable</replaceable><replaceable>makeWrapperArgs</replaceable>
     </term>
     <listitem>
      <para>
@@ -2039,7 +2145,9 @@ addEnvHooks "$hostOffset" myBashFunction
    mechanism is only to be used as a last resort, it might be.
    <variablelist>
     <varlistentry>
-     <term>Bintools Wrapper</term>
+     <term>
+      Bintools Wrapper
+     </term>
      <listitem>
       <para>
        Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous
@@ -2109,7 +2217,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>CC Wrapper</term>
+     <term>
+      CC Wrapper
+     </term>
      <listitem>
       <para>
        CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
@@ -2140,7 +2250,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Perl</term>
+     <term>
+      Perl
+     </term>
      <listitem>
       <para>
        Adds the <filename>lib/site_perl</filename> subdirectory of each build
@@ -2152,7 +2264,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Python</term>
+     <term>
+      Python
+     </term>
      <listitem>
       <para>
        Adds the <filename>lib/${python.libPrefix}/site-packages</filename>
@@ -2162,7 +2276,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>pkg-config</term>
+     <term>
+      pkg-config
+     </term>
      <listitem>
       <para>
        Adds the <filename>lib/pkgconfig</filename> and
@@ -2172,7 +2288,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Automake</term>
+     <term>
+      Automake
+     </term>
      <listitem>
       <para>
        Adds the <filename>share/aclocal</filename> subdirectory of each build
@@ -2181,7 +2299,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Autoconf</term>
+     <term>
+      Autoconf
+     </term>
      <listitem>
       <para>
        The <varname>autoreconfHook</varname> derivation adds
@@ -2192,7 +2312,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>libxml2</term>
+     <term>
+      libxml2
+     </term>
      <listitem>
       <para>
        Adds every file named <filename>catalog.xml</filename> found under the
@@ -2203,7 +2325,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>teTeX / TeX Live</term>
+     <term>
+      teTeX / TeX Live
+     </term>
      <listitem>
       <para>
        Adds the <filename>share/texmf-nix</filename> subdirectory of each build
@@ -2212,7 +2336,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Qt 4</term>
+     <term>
+      Qt 4
+     </term>
      <listitem>
       <para>
        Sets the <envar>QTDIR</envar> environment variable to Qt’s path.
@@ -2220,7 +2346,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>gdk-pixbuf</term>
+     <term>
+      gdk-pixbuf
+     </term>
      <listitem>
       <para>
        Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable the
@@ -2230,7 +2358,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>GHC</term>
+     <term>
+      GHC
+     </term>
      <listitem>
       <para>
        Creates a temporary package database and registers every Haskell build
@@ -2239,7 +2369,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>GStreamer</term>
+     <term>
+      GStreamer
+     </term>
      <listitem>
       <para>
        Adds the GStreamer plugins subdirectory of each build input to the
@@ -2249,7 +2381,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>paxctl</term>
+     <term>
+      paxctl
+     </term>
      <listitem>
       <para>
        Defines the <varname>paxmark</varname> helper for setting per-executable
@@ -2271,7 +2405,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>autoPatchelfHook</term>
+     <term>
+      autoPatchelfHook
+     </term>
      <listitem>
       <para>
        This is a special setup hook which helps in packaging proprietary
@@ -2330,7 +2466,8 @@ addEnvHooks "$hostOffset" myBashFunction
 
   <variablelist>
    <varlistentry>
-    <term><varname>format</varname>
+    <term>
+     <varname>format</varname>
     </term>
     <listitem>
      <para>
@@ -2354,7 +2491,8 @@ cc1plus: some warnings being treated as errors
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>stackprotector</varname>
+    <term>
+     <varname>stackprotector</varname>
     </term>
     <listitem>
      <para>
@@ -2375,7 +2513,8 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>fortify</varname>
+    <term>
+     <varname>fortify</varname>
     </term>
     <listitem>
      <para>
@@ -2415,7 +2554,8 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>pic</varname>
+    <term>
+     <varname>pic</varname>
     </term>
     <listitem>
      <para>
@@ -2439,7 +2579,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>strictoverflow</varname>
+    <term>
+     <varname>strictoverflow</varname>
     </term>
     <listitem>
      <para>
@@ -2457,7 +2598,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>relro</varname>
+    <term>
+     <varname>relro</varname>
     </term>
     <listitem>
      <para>
@@ -2477,7 +2619,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>bindnow</varname>
+    <term>
+     <varname>bindnow</varname>
     </term>
     <listitem>
      <para>
@@ -2509,7 +2652,8 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec
 
   <variablelist>
    <varlistentry>
-    <term><varname>pie</varname>
+    <term>
+     <varname>pie</varname>
     </term>
     <listitem>
      <para>