summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/coding-conventions.xml168
-rw-r--r--doc/cross-compilation.xml27
-rw-r--r--doc/functions.xml48
-rw-r--r--doc/languages-frameworks/bower.xml4
-rw-r--r--doc/meta.xml52
-rw-r--r--doc/multiple-output.xml32
-rw-r--r--doc/package-notes.xml12
-rw-r--r--doc/stdenv.xml426
8 files changed, 513 insertions, 256 deletions
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index f244c11d4f20..b3f7f093835c 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -312,11 +312,15 @@ args.stdenv.mkDerivation (args // {
 
    <variablelist>
     <varlistentry>
-     <term>If it’s used to support <emphasis>software development</emphasis>:</term>
+     <term>
+      If it’s used to support <emphasis>software development</emphasis>:
+     </term>
      <listitem>
       <variablelist>
        <varlistentry>
-        <term>If it’s a <emphasis>library</emphasis> used by other packages:</term>
+        <term>
+         If it’s a <emphasis>library</emphasis> used by other packages:
+        </term>
         <listitem>
          <para>
           <filename>development/libraries</filename> (e.g.
@@ -325,7 +329,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>compiler</emphasis>:</term>
+        <term>
+         If it’s a <emphasis>compiler</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>development/compilers</filename> (e.g.
@@ -334,7 +340,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s an <emphasis>interpreter</emphasis>:</term>
+        <term>
+         If it’s an <emphasis>interpreter</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>development/interpreters</filename> (e.g.
@@ -343,11 +351,15 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a (set of) development <emphasis>tool(s)</emphasis>:</term>
+        <term>
+         If it’s a (set of) development <emphasis>tool(s)</emphasis>:
+        </term>
         <listitem>
          <variablelist>
           <varlistentry>
-           <term>If it’s a <emphasis>parser generator</emphasis> (including lexers):</term>
+           <term>
+            If it’s a <emphasis>parser generator</emphasis> (including lexers):
+           </term>
            <listitem>
             <para>
              <filename>development/tools/parsing</filename> (e.g.
@@ -356,7 +368,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s a <emphasis>build manager</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>build manager</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>development/tools/build-managers</filename> (e.g.
@@ -365,7 +379,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>Else:</term>
+           <term>
+            Else:
+           </term>
            <listitem>
             <para>
              <filename>development/tools/misc</filename> (e.g.
@@ -377,7 +393,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>development/misc</filename>
@@ -388,7 +406,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
+     <term>
+      If it’s a (set of) <emphasis>tool(s)</emphasis>:
+     </term>
      <listitem>
       <para>
        (A tool is a relatively small program, especially one intended to be
@@ -396,7 +416,9 @@ args.stdenv.mkDerivation (args // {
       </para>
       <variablelist>
        <varlistentry>
-        <term>If it’s for <emphasis>networking</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>networking</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>tools/networking</filename> (e.g.
@@ -405,7 +427,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>text processing</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>text processing</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>tools/text</filename> (e.g. <filename>diffutils</filename>)
@@ -413,9 +437,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>system utility</emphasis>, i.e.,
-          something related or essential to the operation of a
-          system:</term>
+        <term>
+         If it’s a <emphasis>system utility</emphasis>, i.e., something related or essential to the operation of a system:
+        </term>
         <listitem>
          <para>
           <filename>tools/system</filename> (e.g. <filename>cron</filename>)
@@ -423,8 +447,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s an <emphasis>archiver</emphasis> (which may
-          include a compression function):</term>
+        <term>
+         If it’s an <emphasis>archiver</emphasis> (which may include a compression function):
+        </term>
         <listitem>
          <para>
           <filename>tools/archivers</filename> (e.g. <filename>zip</filename>,
@@ -433,7 +458,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>compression</emphasis> program:</term>
+        <term>
+         If it’s a <emphasis>compression</emphasis> program:
+        </term>
         <listitem>
          <para>
           <filename>tools/compression</filename> (e.g.
@@ -442,7 +469,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>security</emphasis>-related program:</term>
+        <term>
+         If it’s a <emphasis>security</emphasis>-related program:
+        </term>
         <listitem>
          <para>
           <filename>tools/security</filename> (e.g. <filename>nmap</filename>,
@@ -451,7 +480,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>tools/misc</filename>
@@ -462,7 +493,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>shell</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>shell</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>shells</filename> (e.g. <filename>bash</filename>)
@@ -470,11 +503,15 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>server</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>server</emphasis>:
+     </term>
      <listitem>
       <variablelist>
        <varlistentry>
-        <term>If it’s a web server:</term>
+        <term>
+         If it’s a web server:
+        </term>
         <listitem>
          <para>
           <filename>servers/http</filename> (e.g.
@@ -483,7 +520,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s an implementation of the X Windowing System:</term>
+        <term>
+         If it’s an implementation of the X Windowing System:
+        </term>
         <listitem>
          <para>
           <filename>servers/x11</filename> (e.g. <filename>xorg</filename> —
@@ -492,7 +531,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>servers/misc</filename>
@@ -503,7 +544,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>desktop environment</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>desktop environment</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>desktops</filename> (e.g. <filename>kde</filename>,
@@ -512,7 +555,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>window manager</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>window manager</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>applications/window-managers</filename> (e.g.
@@ -521,7 +566,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s an <emphasis>application</emphasis>:</term>
+     <term>
+      If it’s an <emphasis>application</emphasis>:
+     </term>
      <listitem>
       <para>
        A (typically large) program with a distinct user interface, primarily
@@ -529,7 +576,9 @@ args.stdenv.mkDerivation (args // {
       </para>
       <variablelist>
        <varlistentry>
-        <term>If it’s a <emphasis>version management system</emphasis>:</term>
+        <term>
+         If it’s a <emphasis>version management system</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>applications/version-management</filename> (e.g.
@@ -538,7 +587,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>video playback / editing</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>video playback / editing</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>applications/video</filename> (e.g.
@@ -547,7 +598,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>graphics viewing / editing</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>graphics viewing / editing</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>applications/graphics</filename> (e.g.
@@ -556,11 +609,15 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>networking</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>networking</emphasis>:
+        </term>
         <listitem>
          <variablelist>
           <varlistentry>
-           <term>If it’s a <emphasis>mailreader</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>mailreader</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/mailreaders</filename> (e.g.
@@ -569,7 +626,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s a <emphasis>newsreader</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>newsreader</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/newsreaders</filename> (e.g.
@@ -578,7 +637,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s a <emphasis>web browser</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>web browser</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/browsers</filename> (e.g.
@@ -587,7 +648,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>Else:</term>
+           <term>
+            Else:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/misc</filename>
@@ -598,7 +661,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>applications/misc</filename>
@@ -609,12 +674,15 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s <emphasis>data</emphasis> (i.e., does not have a
-    straight-forward executable semantics):</term>
+     <term>
+      If it’s <emphasis>data</emphasis> (i.e., does not have a straight-forward executable semantics):
+     </term>
      <listitem>
       <variablelist>
        <varlistentry>
-        <term>If it’s a <emphasis>font</emphasis>:</term>
+        <term>
+         If it’s a <emphasis>font</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>data/fonts</filename>
@@ -622,11 +690,15 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s related to <emphasis>SGML/XML processing</emphasis>:</term>
+        <term>
+         If it’s related to <emphasis>SGML/XML processing</emphasis>:
+        </term>
         <listitem>
          <variablelist>
           <varlistentry>
-           <term>If it’s an <emphasis>XML DTD</emphasis>:</term>
+           <term>
+            If it’s an <emphasis>XML DTD</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g.
@@ -635,7 +707,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s an <emphasis>XSLT stylesheet</emphasis>:</term>
+           <term>
+            If it’s an <emphasis>XSLT stylesheet</emphasis>:
+           </term>
            <listitem>
             <para>
              (Okay, these are executable...)
@@ -653,7 +727,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>game</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>game</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>games</filename>
@@ -661,7 +737,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Else:</term>
+     <term>
+      Else:
+     </term>
      <listitem>
       <para>
        <filename>misc</filename>
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index fe0e0d88d30e..3b433fdcc1d2 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -60,7 +60,8 @@
 
    <variablelist>
     <varlistentry>
-     <term><varname>buildPlatform</varname>
+     <term>
+      <varname>buildPlatform</varname>
      </term>
      <listitem>
       <para>
@@ -71,7 +72,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>hostPlatform</varname>
+     <term>
+      <varname>hostPlatform</varname>
      </term>
      <listitem>
       <para>
@@ -82,7 +84,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>targetPlatform</varname>
+     <term>
+      <varname>targetPlatform</varname>
      </term>
      <listitem>
       <para>
@@ -128,7 +131,8 @@
 
    <variablelist>
     <varlistentry>
-     <term><varname>system</varname>
+     <term>
+      <varname>system</varname>
      </term>
      <listitem>
       <para>
@@ -141,7 +145,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>config</varname>
+     <term>
+      <varname>config</varname>
      </term>
      <listitem>
       <para>
@@ -157,7 +162,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>parsed</varname>
+     <term>
+      <varname>parsed</varname>
      </term>
      <listitem>
       <para>
@@ -171,7 +177,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>libc</varname>
+     <term>
+      <varname>libc</varname>
      </term>
      <listitem>
       <para>
@@ -183,7 +190,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>is*</varname>
+     <term>
+      <varname>is*</varname>
      </term>
      <listitem>
       <para>
@@ -195,7 +203,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>platform</varname>
+     <term>
+      <varname>platform</varname>
      </term>
      <listitem>
       <para>
diff --git a/doc/functions.xml b/doc/functions.xml
index cdae96703f13..746ef7131f86 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -321,7 +321,8 @@ merge:"diff3"
 
   <variablelist>
    <varlistentry>
-    <term><literal>name</literal>
+    <term>
+     <literal>name</literal>
     </term>
     <listitem>
      <para>
@@ -330,7 +331,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>targetPkgs</literal>
+    <term>
+     <literal>targetPkgs</literal>
     </term>
     <listitem>
      <para>
@@ -340,7 +342,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>multiPkgs</literal>
+    <term>
+     <literal>multiPkgs</literal>
     </term>
     <listitem>
      <para>
@@ -351,7 +354,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraBuildCommands</literal>
+    <term>
+     <literal>extraBuildCommands</literal>
     </term>
     <listitem>
      <para>
@@ -361,7 +365,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraBuildCommandsMulti</literal>
+    <term>
+     <literal>extraBuildCommandsMulti</literal>
     </term>
     <listitem>
      <para>
@@ -371,7 +376,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraOutputsToInstall</literal>
+    <term>
+     <literal>extraOutputsToInstall</literal>
     </term>
     <listitem>
      <para>
@@ -381,7 +387,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraInstallCommands</literal>
+    <term>
+     <literal>extraInstallCommands</literal>
     </term>
     <listitem>
      <para>
@@ -391,7 +398,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>runScript</literal>
+    <term>
+     <literal>runScript</literal>
     </term>
     <listitem>
      <para>
@@ -624,9 +632,9 @@ merge:"diff3"
 
    <para>
     This function is analogous to the <command>docker pull</command> command,
-    in that can be used to pull a Docker image from a Docker registry.
-    By default <link xlink:href="https://hub.docker.com/">Docker Hub</link>
-    is used to pull images.
+    in that can be used to pull a Docker image from a Docker registry. By
+    default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is
+    used to pull images.
    </para>
 
    <para>
@@ -648,15 +656,15 @@ merge:"diff3"
    <calloutlist>
     <callout arearefs='ex-dockerTools-pullImage-1'>
      <para>
-      <varname>imageName</varname> specifies the name of the image to be downloaded,
-      which can also include the registry namespace (e.g. <literal>nixos</literal>).
-      This argument is required.
+      <varname>imageName</varname> specifies the name of the image to be
+      downloaded, which can also include the registry namespace (e.g.
+      <literal>nixos</literal>). This argument is required.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-2'>
      <para>
-      <varname>imageDigest</varname> specifies the digest of the image
-      to be downloaded. Skopeo can be used to get the digest of an image
+      <varname>imageDigest</varname> specifies the digest of the image to be
+      downloaded. Skopeo can be used to get the digest of an image
 <programlisting>
   $ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
   sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
@@ -666,10 +674,10 @@ merge:"diff3"
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-3'>
      <para>
-      <varname>finalImageTag</varname>, if specified, this is the tag of
-      the image to be created. Note it is never used to fetch the image
-      since we prefer to rely on the immutable digest ID. By default
-      it's <literal>latest</literal>.
+      <varname>finalImageTag</varname>, if specified, this is the tag of the
+      image to be created. Note it is never used to fetch the image since we
+      prefer to rely on the immutable digest ID. By default it's
+      <literal>latest</literal>.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-4'>
diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml
index db7536cdc14e..118f6e10473a 100644
--- a/doc/languages-frameworks/bower.xml
+++ b/doc/languages-frameworks/bower.xml
@@ -205,8 +205,8 @@ pkgs.stdenv.mkDerivation {
 
   <variablelist>
    <varlistentry>
-    <term><literal>ENOCACHE</literal> errors from
-    <varname>buildBowerComponents</varname>
+    <term>
+     <literal>ENOCACHE</literal> errors from <varname>buildBowerComponents</varname>
     </term>
     <listitem>
      <para>
diff --git a/doc/meta.xml b/doc/meta.xml
index ab6befd4381c..496b32916552 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -83,7 +83,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
 
   <variablelist>
    <varlistentry>
-    <term><varname>description</varname>
+    <term>
+     <varname>description</varname>
     </term>
     <listitem>
      <para>
@@ -106,7 +107,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>longDescription</varname>
+    <term>
+     <varname>longDescription</varname>
     </term>
     <listitem>
      <para>
@@ -115,7 +117,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>branch</varname>
+    <term>
+     <varname>branch</varname>
     </term>
     <listitem>
      <para>
@@ -126,7 +129,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>homepage</varname>
+    <term>
+     <varname>homepage</varname>
     </term>
     <listitem>
      <para>
@@ -136,7 +140,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>downloadPage</varname>
+    <term>
+     <varname>downloadPage</varname>
     </term>
     <listitem>
      <para>
@@ -146,7 +151,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>license</varname>
+    <term>
+     <varname>license</varname>
     </term>
     <listitem>
      <para>
@@ -198,7 +204,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>maintainers</varname>
+    <term>
+     <varname>maintainers</varname>
     </term>
     <listitem>
      <para>
@@ -213,7 +220,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>priority</varname>
+    <term>
+     <varname>priority</varname>
     </term>
     <listitem>
      <para>
@@ -225,7 +233,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>platforms</varname>
+    <term>
+     <varname>platforms</varname>
     </term>
     <listitem>
      <para>
@@ -242,7 +251,8 @@ meta.platforms = stdenv.lib.platforms.linux;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>hydraPlatforms</varname>
+    <term>
+     <varname>hydraPlatforms</varname>
     </term>
     <listitem>
      <para>
@@ -261,7 +271,8 @@ meta.hydraPlatforms = [];
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>broken</varname>
+    <term>
+     <varname>broken</varname>
     </term>
     <listitem>
      <para>
@@ -273,7 +284,8 @@ meta.hydraPlatforms = [];
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>updateWalker</varname>
+    <term>
+     <varname>updateWalker</varname>
     </term>
     <listitem>
      <para>
@@ -305,8 +317,8 @@ meta.hydraPlatforms = [];
    generic options are available:
    <variablelist>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.free</varname>,
-    <varname>"free"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.free</varname>, <varname>"free"</varname>
      </term>
      <listitem>
       <para>
@@ -315,8 +327,8 @@ meta.hydraPlatforms = [];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
-    <varname>"unfree-redistributable"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.unfreeRedistributable</varname>, <varname>"unfree-redistributable"</varname>
      </term>
      <listitem>
       <para>
@@ -336,8 +348,8 @@ meta.hydraPlatforms = [];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.unfree</varname>,
-    <varname>"unfree"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.unfree</varname>, <varname>"unfree"</varname>
      </term>
      <listitem>
       <para>
@@ -348,8 +360,8 @@ meta.hydraPlatforms = [];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
-    <varname>"unfree-redistributable-firmware"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>, <varname>"unfree-redistributable-firmware"</varname>
      </term>
      <listitem>
       <para>
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index 040c12c92913..981b4b966cdf 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -188,8 +188,8 @@
 
    <variablelist>
     <varlistentry>
-     <term><varname>
-         $outputDev</varname>
+     <term>
+      <varname> $outputDev</varname>
      </term>
      <listitem>
       <para>
@@ -200,8 +200,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputBin</varname>
+     <term>
+      <varname> $outputBin</varname>
      </term>
      <listitem>
       <para>
@@ -211,8 +211,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputLib</varname>
+     <term>
+      <varname> $outputLib</varname>
      </term>
      <listitem>
       <para>
@@ -223,8 +223,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputDoc</varname>
+     <term>
+      <varname> $outputDoc</varname>
      </term>
      <listitem>
       <para>
@@ -235,8 +235,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputDevdoc</varname>
+     <term>
+      <varname> $outputDevdoc</varname>
      </term>
      <listitem>
       <para>
@@ -248,8 +248,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputMan</varname>
+     <term>
+      <varname> $outputMan</varname>
      </term>
      <listitem>
       <para>
@@ -259,8 +259,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputDevman</varname>
+     <term>
+      <varname> $outputDevman</varname>
      </term>
      <listitem>
       <para>
@@ -270,8 +270,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputInfo</varname>
+     <term>
+      <varname> $outputInfo</varname>
      </term>
      <listitem>
       <para>
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index f16826ae6806..a6347bfdebaf 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -428,7 +428,9 @@ packageOverrides = pkgs: {
    <para>
     <variablelist>
      <varlistentry>
-      <term>Steam fails to start. What do I do?</term>
+      <term>
+       Steam fails to start. What do I do?
+      </term>
       <listitem>
        <para>
         Try to run
@@ -438,7 +440,9 @@ packageOverrides = pkgs: {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Using the FOSS Radeon or nouveau (nvidia) drivers</term>
+      <term>
+       Using the FOSS Radeon or nouveau (nvidia) drivers
+      </term>
       <listitem>
        <itemizedlist>
         <listitem>
@@ -462,7 +466,9 @@ packageOverrides = pkgs: {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Java</term>
+      <term>
+       Java
+      </term>
       <listitem>
        <orderedlist>
         <listitem>
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 78fa1d209b58..f6180d5ca6a8 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>