doc: fix spurious whitespace

13 files changed, 212 insertions, 212 deletions

diff --git a/doc/contributing.xml b/doc/contributing.xml
index d28442b7a2c..523c1c9c8f0 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -12,9 +12,9 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
   You can quickly check your edits with <command>make</command>:
  </para>
 <screen>
-  $ cd /path/to/nixpkgs/doc
-  $ nix-shell
-  [nix-shell]$ make
+<prompt>$ </prompt>cd /path/to/nixpkgs/doc
+<prompt>$ </prompt>nix-shell
+<prompt>[nix-shell]$ </prompt>make
 </screen>
  <para>
   If you experience problems, run <command>make debug</command> to help
@@ -24,10 +24,10 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
   After making modifications to the manual, it's important to build it before
   committing. You can do that as follows:
 <screen>
-  $ cd /path/to/nixpkgs/doc
-  $ nix-shell
-  [nix-shell]$ make clean
-  [nix-shell]$ nix-build .
+<prompt>$ </prompt>cd /path/to/nixpkgs/doc
+<prompt>$ </prompt>nix-shell
+<prompt>[nix-shell]$ </prompt>make clean
+<prompt>[nix-shell]$ </prompt>nix-build .
 </screen>
   If the build succeeds, the manual will be in
   <filename>./result/share/doc/nixpkgs/manual.html</filename>.
diff --git a/doc/functions/appimagetools.xml b/doc/functions/appimagetools.xml
index 4205c6da385..e6dbc22f48d 100644
--- a/doc/functions/appimagetools.xml
+++ b/doc/functions/appimagetools.xml
@@ -52,7 +52,7 @@ spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: off
 
 <prompt>$ </prompt>file -k type2.AppImage
 type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data
-  </screen>
+</screen>
 
   <para>
    Note how the type 1 AppImage is described as an <literal>ISO 9660 CD-ROM
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
index e95ce1979de..a042013b8e7 100644
--- a/doc/functions/dockertools.xml
+++ b/doc/functions/dockertools.xml
@@ -537,7 +537,7 @@ exportImage {
 
   name = someLayeredImage.name;
 }
-  </programlisting>
+</programlisting>
   </example>
 
   <para>
diff --git a/doc/functions/prefer-remote-fetch.xml b/doc/functions/prefer-remote-fetch.xml
index 2ccad921806..3e43fd28ade 100644
--- a/doc/functions/prefer-remote-fetch.xml
+++ b/doc/functions/prefer-remote-fetch.xml
@@ -10,16 +10,16 @@
   upload while the builder can fetch faster directly from the source. To use
   it, put the following snippet as a new overlay:
 <programlisting>
-    self: super:
-      (super.prefer-remote-fetch self super)
-  </programlisting>
+self: super:
+  (super.prefer-remote-fetch self super)
+</programlisting>
   A full configuration example for that sets the overlay up for your own
   account, could look like this
-<programlisting>
-    $ mkdir ~/.config/nixpkgs/overlays/
-    $ cat &gt; ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix &lt;&lt;EOF
-      self: super: super.prefer-remote-fetch self super
-    EOF
-  </programlisting>
+<screen>
+<prompt>$ </prompt>mkdir ~/.config/nixpkgs/overlays/
+<prompt>$ </prompt>cat &gt; ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix &lt;&lt;EOF
+  self: super: super.prefer-remote-fetch self super
+EOF
+</screen>
  </para>
 </section>
diff --git a/doc/functions/trivial-builders.xml b/doc/functions/trivial-builders.xml
index 1fd92ecfe26..0211a4f3172 100644
--- a/doc/functions/trivial-builders.xml
+++ b/doc/functions/trivial-builders.xml
@@ -35,25 +35,25 @@
      An example of using <literal>runCommand</literal> is provided below.
     </para>
 <programlisting>
-       (import &lt;nixpkgs&gt; {}).runCommand "my-example" {} ''
-         echo My example command is running
+(import &lt;nixpkgs&gt; {}).runCommand "my-example" {} ''
+  echo My example command is running
 
-         mkdir $out
+  mkdir $out
 
-         echo I can write data to the Nix store > $out/message
+  echo I can write data to the Nix store > $out/message
 
-         echo I can also run basic commands like:
+  echo I can also run basic commands like:
 
-         echo ls
-         ls
+  echo ls
+  ls
 
-         echo whoami
-         whoami
+  echo whoami
+  whoami
 
-         echo date
-         date
-       ''
-     </programlisting>
+  echo date
+  date
+''
+</programlisting>
    </listitem>
   </varlistentry>
   <varlistentry>
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index ac7a83ed426..b896b564fb7 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -140,7 +140,7 @@ beamPackages.jiffy      jiffy-0.14.5
 beamPackages.lager      lager-3.0.2
 beamPackages.meck       meck-0.8.3
 beamPackages.rebar3-pc  pc-1.1.0
-  </programlisting>
+</programlisting>
 
   <para>
    To install any of those packages into your profile, refer to them by their
@@ -149,7 +149,7 @@ beamPackages.rebar3-pc  pc-1.1.0
 
 <programlisting>
 $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
-  </programlisting>
+</programlisting>
 
   <para>
    The attribute path of any BEAM package corresponds to the name of that
@@ -178,22 +178,22 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
     </para>
 
 <programlisting>
-        { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
+{ stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
 
-        buildRebar3 rec {
-          name = "hex2nix";
-          version = "0.0.1";
+buildRebar3 rec {
+  name = "hex2nix";
+  version = "0.0.1";
 
-          src = fetchFromGitHub {
-            owner = "ericbmerritt";
-            repo = "hex2nix";
-            rev = "${version}";
-            sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
-          };
+  src = fetchFromGitHub {
+    owner = "ericbmerritt";
+    repo = "hex2nix";
+    rev = "${version}";
+    sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
+  };
 
-          beamDeps = [ ibrowse jsx erlware_commons ];
-        }
-      </programlisting>
+  beamDeps = [ ibrowse jsx erlware_commons ];
+}
+</programlisting>
 
     <para>
      Such derivations are callable with
@@ -228,29 +228,29 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
     </para>
 
 <programlisting>
-        { buildErlangMk, fetchHex, cowlib, ranch }:
-
-        buildErlangMk {
-          name = "cowboy";
-          version = "1.0.4";
-
-          src = fetchHex {
-            pkg = "cowboy";
-            version = "1.0.4";
-            sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
-          };
-
-          beamDeps = [ cowlib ranch ];
-
-          meta = {
-            description = ''
-              Small, fast, modular HTTP server written in Erlang
-            '';
-            license = stdenv.lib.licenses.isc;
-            homepage = https://github.com/ninenines/cowboy;
-          };
-        }
-      </programlisting>
+{ buildErlangMk, fetchHex, cowlib, ranch }:
+
+buildErlangMk {
+  name = "cowboy";
+  version = "1.0.4";
+
+  src = fetchHex {
+    pkg = "cowboy";
+    version = "1.0.4";
+    sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
+  };
+
+  beamDeps = [ cowlib ranch ];
+
+  meta = {
+    description = ''
+      Small, fast, modular HTTP server written in Erlang
+    '';
+    license = stdenv.lib.licenses.isc;
+    homepage = https://github.com/ninenines/cowboy;
+  };
+}
+</programlisting>
    </section>
 
    <section xml:id="mix-packages">
@@ -262,56 +262,56 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
     </para>
 
 <programlisting>
-        { buildMix, fetchHex, plug, absinthe }:
-
-        buildMix {
-          name = "absinthe_plug";
-          version = "1.0.0";
-
-          src = fetchHex {
-            pkg = "absinthe_plug";
-            version = "1.0.0";
-            sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
-          };
-
-          beamDeps = [ plug absinthe ];
-
-          meta = {
-            description = ''
-              A plug for Absinthe, an experimental GraphQL toolkit
-            '';
-            license = stdenv.lib.licenses.bsd3;
-            homepage = https://github.com/CargoSense/absinthe_plug;
-          };
-        }
-      </programlisting>
+{ buildMix, fetchHex, plug, absinthe }:
+
+buildMix {
+  name = "absinthe_plug";
+  version = "1.0.0";
+
+  src = fetchHex {
+    pkg = "absinthe_plug";
+    version = "1.0.0";
+    sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
+  };
+
+  beamDeps = [ plug absinthe ];
+
+  meta = {
+    description = ''
+      A plug for Absinthe, an experimental GraphQL toolkit
+    '';
+    license = stdenv.lib.licenses.bsd3;
+    homepage = https://github.com/CargoSense/absinthe_plug;
+  };
+}
+</programlisting>
 
     <para>
      Alternatively, we can use <literal>buildHex</literal> as a shortcut:
     </para>
 
 <programlisting>
-        { buildHex, buildMix, plug, absinthe }:
+{ buildHex, buildMix, plug, absinthe }:
 
-        buildHex {
-          name = "absinthe_plug";
-          version = "1.0.0";
+buildHex {
+  name = "absinthe_plug";
+  version = "1.0.0";
 
-          sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
+  sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
 
-          builder = buildMix;
+  builder = buildMix;
 
-          beamDeps = [ plug absinthe ];
+  beamDeps = [ plug absinthe ];
 
-          meta = {
-            description = ''
-              A plug for Absinthe, an experimental GraphQL toolkit
-            '';
-            license = stdenv.lib.licenses.bsd3;
-            homepage = https://github.com/CargoSense/absinthe_plug;
-         };
-       }
-      </programlisting>
+  meta = {
+    description = ''
+      A plug for Absinthe, an experimental GraphQL toolkit
+    '';
+    license = stdenv.lib.licenses.bsd3;
+    homepage = https://github.com/CargoSense/absinthe_plug;
+ };
+}
+</programlisting>
    </section>
   </section>
  </section>
@@ -330,47 +330,47 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
     could do the following:
    </para>
 
-<programlisting>
-      $ nix-shell -A beamPackages.ibrowse.env --run "erl"
-      Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
-
-      Eshell V7.0  (abort with ^G)
-      1> m(ibrowse).
-      Module: ibrowse
-      MD5: 3b3e0137d0cbb28070146978a3392945
-      Compiled: January 10 2016, 23:34
-      Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam
-      Compiler options:  [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"},
-      debug_info,debug_info,nowarn_shadow_vars,
-      warn_unused_import,warn_unused_vars,warnings_as_errors,
-      {i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}]
-      Exports:
-      add_config/1                  send_req_direct/7
-      all_trace_off/0               set_dest/3
-      code_change/3                 set_max_attempts/3
-      get_config_value/1            set_max_pipeline_size/3
-      get_config_value/2            set_max_sessions/3
-      get_metrics/0                 show_dest_status/0
-      get_metrics/2                 show_dest_status/1
-      handle_call/3                 show_dest_status/2
-      handle_cast/2                 spawn_link_worker_process/1
-      handle_info/2                 spawn_link_worker_process/2
-      init/1                        spawn_worker_process/1
-      module_info/0                 spawn_worker_process/2
-      module_info/1                 start/0
-      rescan_config/0               start_link/0
-      rescan_config/1               stop/0
-      send_req/3                    stop_worker_process/1
-      send_req/4                    stream_close/1
-      send_req/5                    stream_next/1
-      send_req/6                    terminate/2
-      send_req_direct/4             trace_off/0
-      send_req_direct/5             trace_off/2
-      send_req_direct/6             trace_on/0
-      trace_on/2
-      ok
-      2>
-    </programlisting>
+<screen>
+<prompt>$ </prompt><userinput>nix-shell -A beamPackages.ibrowse.env --run "erl"</userinput>
+<computeroutput>Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
+
+Eshell V7.0  (abort with ^G)</computeroutput>
+<prompt>1> </prompt><userinput>m(ibrowse).</userinput>
+<computeroutput>Module: ibrowse
+MD5: 3b3e0137d0cbb28070146978a3392945
+Compiled: January 10 2016, 23:34
+Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam
+Compiler options:  [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"},
+debug_info,debug_info,nowarn_shadow_vars,
+warn_unused_import,warn_unused_vars,warnings_as_errors,
+{i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}]
+Exports:
+add_config/1                  send_req_direct/7
+all_trace_off/0               set_dest/3
+code_change/3                 set_max_attempts/3
+get_config_value/1            set_max_pipeline_size/3
+get_config_value/2            set_max_sessions/3
+get_metrics/0                 show_dest_status/0
+get_metrics/2                 show_dest_status/1
+handle_call/3                 show_dest_status/2
+handle_cast/2                 spawn_link_worker_process/1
+handle_info/2                 spawn_link_worker_process/2
+init/1                        spawn_worker_process/1
+module_info/0                 spawn_worker_process/2
+module_info/1                 start/0
+rescan_config/0               start_link/0
+rescan_config/1               stop/0
+send_req/3                    stop_worker_process/1
+send_req/4                    stream_close/1
+send_req/5                    stream_next/1
+send_req/6                    terminate/2
+send_req_direct/4             trace_off/0
+send_req_direct/5             trace_off/2
+send_req_direct/6             trace_on/0
+trace_on/2
+ok</computeroutput>
+<prompt>2></prompt>
+</screen>
 
    <para>
     Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
@@ -408,7 +408,7 @@ let
 in
 
   drv
-    </programlisting>
+</programlisting>
 
    <section xml:id="building-in-a-shell">
     <title>Building in a Shell (for Mix Projects)</title>
@@ -474,7 +474,7 @@ plt:
 analyze: build plt
         $(NIX_SHELL) --run "mix dialyzer --no-compile"
 
-    </programlisting>
+</programlisting>
 
     <para>
      Using a <literal>shell.nix</literal> as described (see
@@ -513,9 +513,9 @@ analyze: build plt
    <literal>nixpkgs</literal> repository:
   </para>
 
-<programlisting>
-$ nix-build -A beamPackages
-    </programlisting>
+<screen>
+<prompt>$ </prompt>nix-build -A beamPackages
+</screen>
 
   <para>
    That will attempt to build every package in <literal>beamPackages</literal>.
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 6f6e7925a1b..b2b4962cb5f 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -218,12 +218,12 @@ deis = buildGoPackage rec {
    <varname>bin</varname> includes program binaries. You can test build a Go
    binary as follows:
 <screen>
-    $ nix-build -A deis.bin
-  </screen>
+<prompt>$ </prompt>nix-build -A deis.bin
+</screen>
    or build all outputs with:
 <screen>
-    $ nix-build -A deis.all
-  </screen>
+<prompt>$ </prompt>nix-build -A deis.all
+</screen>
    <varname>bin</varname> output will be installed by default with
    <varname>nix-env -i</varname> or <varname>systemPackages</varname>.
   </para>
diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml
index 21014029996..5144bb24ff6 100644
--- a/doc/languages-frameworks/lua.xml
+++ b/doc/languages-frameworks/lua.xml
@@ -29,7 +29,7 @@ fileSystem = buildLuaPackage {
     maintainers = with maintainers; [ flosse ];
   };
 };
-  </programlisting>
+</programlisting>
  </para>
 
  <para>
diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml
index 0deadf2edd0..b7006ecba99 100644
--- a/doc/languages-frameworks/ocaml.xml
+++ b/doc/languages-frameworks/ocaml.xml
@@ -62,7 +62,7 @@ buildDunePackage rec {
     maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
   };
 }
- </programlisting>
+</programlisting>
 
  <para>
   Here is a second example, this time using a source archive generated with
@@ -93,5 +93,5 @@ buildDunePackage rec {
     maintainers = [ maintainers.eqyiel ];
   };
 }
- </programlisting>
+</programlisting>
 </section>
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index 5792a16963a..97f274933be 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -26,7 +26,7 @@
 texlive.combine {
   inherit (texlive) scheme-small collection-langkorean algorithms cm-super;
 }
-      </programlisting>
+</programlisting>
      There are all the schemes, collections and a few thousand packages, as
      defined upstream (perhaps with tiny differences).
     </para>
@@ -44,7 +44,7 @@ texlive.combine {
   # elem tlType [ "run" "bin" "doc" "source" ]
   # there are also other attributes: version, name
 }
-      </programlisting>
+</programlisting>
     </para>
    </listitem>
    <listitem>
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml
index b75b50dbb96..157d3fe2fcd 100644
--- a/doc/platform-notes.xml
+++ b/doc/platform-notes.xml
@@ -20,14 +20,14 @@
      scripts.
     </para>
 <programlisting>
-      stdenv.mkDerivation {
-        name = "libfoo-1.2.3";
-        # ...
-        buildPhase = ''
-          $CC -o hello hello.c
-        '';
-      }
-    </programlisting>
+stdenv.mkDerivation {
+  name = "libfoo-1.2.3";
+  # ...
+  buildPhase = ''
+    $CC -o hello hello.c
+  '';
+}
+</programlisting>
    </listitem>
    <listitem>
     <para>
@@ -39,12 +39,12 @@
      <function>fixupPhase</function>.
     </para>
 <programlisting>
-      stdenv.mkDerivation {
-        name = "libfoo-1.2.3";
-        # ...
-        makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
-      }
-    </programlisting>
+stdenv.mkDerivation {
+  name = "libfoo-1.2.3";
+  # ...
+  makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
+}
+</programlisting>
    </listitem>
    <listitem>
     <para>
@@ -62,19 +62,19 @@
      <manvolnum>1</manvolnum></citerefentry> manpage.
     </para>
 <programlisting>
-      dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib
-      Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq
-      Reason: image not found
-      ./tests/jqtest: line 5: 75779 Abort trap: 6
-    </programlisting>
+dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib
+Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq
+Reason: image not found
+./tests/jqtest: line 5: 75779 Abort trap: 6
+</programlisting>
 <programlisting>
-      stdenv.mkDerivation {
-        name = "libfoo-1.2.3";
-        # ...
-        doInstallCheck = true;
-        installCheckTarget = "check";
-      }
-    </programlisting>
+stdenv.mkDerivation {
+  name = "libfoo-1.2.3";
+  # ...
+  doInstallCheck = true;
+  installCheckTarget = "check";
+}
+</programlisting>
    </listitem>
    <listitem>
     <para>
@@ -85,15 +85,15 @@
      on xcode.
     </para>
 <programlisting>
-      stdenv.mkDerivation {
-        name = "libfoo-1.2.3";
-        # ...
-        prePatch = ''
-          substituteInPlace Makefile \
-              --replace '/usr/bin/xcrun clang' clang
-        '';
-      }
-    </programlisting>
+stdenv.mkDerivation {
+  name = "libfoo-1.2.3";
+  # ...
+  prePatch = ''
+    substituteInPlace Makefile \
+        --replace '/usr/bin/xcrun clang' clang
+  '';
+}
+</programlisting>
     <para>
      The package <literal>xcbuild</literal> can be used to build projects that
      really depend on Xcode. However, this replacement is not 100% compatible
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 2447dc45130..dbffdad9fde 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -343,7 +343,7 @@ let f(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
 let f(h, h + 1, i) = i + (if i &lt;= 0 then h else (h + 1) - 1)
 let f(h, h + 1, i) = i + (if i &lt;= 0 then h else h)
 let f(h, h + 1, i) = i + h
-  </programlisting>
+</programlisting>
    This is where "sum-like" comes in from above: We can just sum all of the
    host offsets to get the host offset of the transitive dependency. The target
    offset is the transitive dependency is simply the host offset + 1, just as
@@ -2229,7 +2229,7 @@ someVar=$(stripHash $name)
    array by doing something like
 <programlisting language="bash">
 addEnvHooks "$hostOffset" myBashFunction
-  </programlisting>
+</programlisting>
   </para>
 
   <para>
@@ -2667,8 +2667,8 @@ addEnvHooks "$hostOffset" myBashFunction
        that is supposed to be inspected, add <literal>breakpointHook</literal>
        to <literal>nativeBuildInputs</literal>.
 <programlisting>
-         nativeBuildInputs = [ breakpointHook ];
-       </programlisting>
+nativeBuildInputs = [ breakpointHook ];
+</programlisting>
        When a build failure happens there will be an instruction printed that
        shows how to attach with <literal>cntr</literal> to the build sandbox.
       </para>
@@ -2863,7 +2863,7 @@ addEnvHooks "$hostOffset" myBashFunction
          printf(help_message);
                             ^
 cc1plus: some warnings being treated as errors
-    </programlisting>
+</programlisting>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -2885,7 +2885,7 @@ cc1plus: some warnings being treated as errors
 <programlisting>
 bin/blib.a(bios_console.o): In function `bios_handle_cup':
 /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail'
-    </programlisting>
+</programlisting>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -2914,19 +2914,19 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':
 <programlisting>
 malloc.c:404:15: error: return type is an incomplete type
 malloc.c:410:19: error: storage size of 'ms' isn't known
-    </programlisting>
+</programlisting>
 <programlisting>
 strdup.h:22:1: error: expected identifier or '(' before '__extension__'
-    </programlisting>
+</programlisting>
 <programlisting>
 strsep.c:65:23: error: register name not specified for 'delim'
-    </programlisting>
+</programlisting>
 <programlisting>
 installwatch.c:3751:5: error: conflicting types for '__open_2'
-    </programlisting>
+</programlisting>
 <programlisting>
 fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
-    </programlisting>
+</programlisting>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -2951,7 +2951,7 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro
 <programlisting>
 ccbLfRgg.s: Assembler messages:
 ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF'
-    </programlisting>
+</programlisting>
     </listitem>
    </varlistentry>
    <varlistentry>
@@ -3015,7 +3015,7 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
      </para>
 <programlisting>
 intel_drv.so: undefined symbol: vgaHWFreeHWRec
-    </programlisting>
+</programlisting>
     </listitem>
    </varlistentry>
   </variablelist>
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index bc090fd757c..bf9e290fa2f 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -514,7 +514,7 @@ The original commit message describing the reason why the world was torn apart.
 (cherry picked from commit abcdef)
 Reason: I just had a gut feeling that this would also be wanted by people from
 the stone age.
-      </screen>
+</screen>
     </listitem>
    </itemizedlist>
   </section>