NixOS · Jun 16, 2019 · Jun 17, 2019 · Jun 17, 2019 · Jun 17, 2019 · Jun 17, 2019
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
@@ -921,7 +921,7 @@ src = fetchFromGitHub {
     <para>
      You can convert between formats with nix-hash, for example:
 <screen>
-$ nix-hash --type sha256 --to-base32 <replaceable>HASH</replaceable>
+<prompt>$ </prompt>nix-hash --type sha256 --to-base32 <replaceable>HASH</replaceable>
 </screen>
     </para>
    </listitem>
@@ -1038,16 +1038,16 @@ patches = [ ./0001-changes.patch ];
      <para>
       Move to the root directory of the source code you're patching.
 <screen>
-$ cd the/program/source</screen>
+<prompt>$ </prompt>cd the/program/source</screen>
      </para>
     </listitem>
     <listitem>
      <para>
       If a git repository is not already present, create one and stage all of
       the source files.
 <screen>
-$ git init
-$ git add .</screen>
+<prompt>$ </prompt>git init
+<prompt>$ </prompt>git add .</screen>
      </para>
     </listitem>
     <listitem>
@@ -1060,7 +1060,7 @@ $ git add .</screen>
      <para>
       Use git to create a diff, and pipe the output to a patch file:
 <screen>
-$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch</screen>
+<prompt>$ </prompt>git diff > nixpkgs/pkgs/the/package/0001-changes.patch</screen>
      </para>
     </listitem>
    </orderedlist>

diff --git 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
@@ -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
@@ -480,9 +480,9 @@ pullImage {
     <literal>nix-prefetch-docker</literal> command can be used to get required
     image parameters:
 
-<programlisting>
-$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5
-</programlisting>
+<screen>
+<prompt>$ </prompt>nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5
+</screen>
 
     Since a given <varname>imageName</varname> may transparently refer to a
     manifest list of images which support multiple architectures and/or
@@ -491,17 +491,17 @@ $ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql
     By default it will match the OS and architecture of the host the command is
     run on.
 
-<programlisting>
-$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux
-</programlisting>
+<screen>
+<prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux
+</screen>
 
     Desired image name and tag can be set using
     <option>--final-image-name</option> and <option>--final-image-tag</option>
     arguments:
 
-<programlisting>
-$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod
-</programlisting>
+<screen>
+<prompt>$ </prompt>nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod
+</screen>
   </para>
  </section>
 
@@ -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
@@ -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
@@ -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>