<envar> -> <literal>

11 files changed, 27 insertions, 27 deletions

diff --git a/doc/manual/release-notes/rl-0.10.xml b/doc/manual/release-notes/rl-0.10.xml
index 9afec4de9..9b4233546 100644
--- a/doc/manual/release-notes/rl-0.10.xml
+++ b/doc/manual/release-notes/rl-0.10.xml
@@ -184,9 +184,9 @@ irreversible.</para></warning>
 
 
   <listitem><para>Nix now works behind an HTTP proxy server; just set
-  the standard environment variables <envar>http_proxy</envar>,
-  <envar>https_proxy</envar>, <envar>ftp_proxy</envar> or
-  <envar>all_proxy</envar> appropriately.  Functions such as
+  the standard environment variables <literal>http_proxy</literal>,
+  <literal>https_proxy</literal>, <literal>ftp_proxy</literal> or
+  <literal>all_proxy</literal> appropriately.  Functions such as
   <function>fetchurl</function> in Nixpkgs also respect these
   variables.</para></listitem>
 
diff --git a/doc/manual/release-notes/rl-0.12.xml b/doc/manual/release-notes/rl-0.12.xml
index fdba8c4d5..18978ac4b 100644
--- a/doc/manual/release-notes/rl-0.12.xml
+++ b/doc/manual/release-notes/rl-0.12.xml
@@ -49,7 +49,7 @@ $ rm __db* log.* derivers references referrers reserved validpaths DB_CONFIG</sc
   filesystem.  For instance, you can speed up an installation by
   mounting some remote Nix store that already has the packages in
   question via NFS or <literal>sshfs</literal>.  The environment
-  variable <envar>NIX_OTHER_STORES</envar> specifies the locations of
+  variable <literal>NIX_OTHER_STORES</literal> specifies the locations of
   the remote Nix directories,
   e.g. <literal>/mnt/remote-fs/nix</literal>.</para></listitem>
 
@@ -156,7 +156,7 @@ the following paths will be downloaded/copied (30.02 MiB):
 
   <listitem><para><command>nix-prefetch-url</command> now supports
   <literal>mirror://</literal> URLs, provided that the environment
-  variable <envar>NIXPKGS_ALL</envar> points at a Nixpkgs
+  variable <literal>NIXPKGS_ALL</literal> points at a Nixpkgs
   tree.</para></listitem>
 
   <listitem><para>Removed the commands
diff --git a/doc/manual/release-notes/rl-0.16.xml b/doc/manual/release-notes/rl-0.16.xml
index af1edc0eb..43b7622c6 100644
--- a/doc/manual/release-notes/rl-0.16.xml
+++ b/doc/manual/release-notes/rl-0.16.xml
@@ -30,7 +30,7 @@
       <replaceable>N</replaceable></option> as well as a configuration
       setting <varname>build-cores =
       <replaceable>N</replaceable></varname> that causes the
-      environment variable <envar>NIX_BUILD_CORES</envar> to be set to
+      environment variable <literal>NIX_BUILD_CORES</literal> to be set to
       <replaceable>N</replaceable> when the builder is invoked.  The
       builder can use this at its discretion to perform a parallel
       build, e.g., by calling <command>make -j
diff --git a/doc/manual/release-notes/rl-1.0.xml b/doc/manual/release-notes/rl-1.0.xml
index ff11168d0..41081a19f 100644
--- a/doc/manual/release-notes/rl-1.0.xml
+++ b/doc/manual/release-notes/rl-1.0.xml
@@ -29,7 +29,7 @@ previous release.  Here are the most significant:</para>
 
   <listitem>
     <para>Nix now has an search path for expressions.  The search path
-    is set using the environment variable <envar>NIX_PATH</envar> and
+    is set using the environment variable <literal>NIX_PATH</literal> and
     the <option>-I</option> command line option.  In Nix expressions,
     paths between angle brackets are used to specify files that must
     be looked up in the search path.  For instance, the expression
diff --git a/doc/manual/release-notes/rl-1.2.xml b/doc/manual/release-notes/rl-1.2.xml
index 748fd9e67..29bd5bf81 100644
--- a/doc/manual/release-notes/rl-1.2.xml
+++ b/doc/manual/release-notes/rl-1.2.xml
@@ -116,7 +116,7 @@ $ mount -o remount,ro,bind /nix/store
 
   <listitem>
     <para>Basic Nix expression evaluation profiling: setting the
-    environment variable <envar>NIX_COUNT_CALLS</envar> to
+    environment variable <literal>NIX_COUNT_CALLS</literal> to
     <literal>1</literal> will cause Nix to print how many times each
     primop or function was executed.</para>
   </listitem>
diff --git a/doc/manual/release-notes/rl-1.6.xml b/doc/manual/release-notes/rl-1.6.xml
index 580563420..cdb52ed0b 100644
--- a/doc/manual/release-notes/rl-1.6.xml
+++ b/doc/manual/release-notes/rl-1.6.xml
@@ -33,7 +33,7 @@ features:</para>
 
   <listitem>
     <para><command>nix-shell</command> now sets the shell prompt
-    (<envar>PS1</envar>) to ensure that Nix shells are distinguishable
+    (<literal>PS1</literal>) to ensure that Nix shells are distinguishable
     from your regular shells.</para>
   </listitem>
 
diff --git a/doc/manual/release-notes/rl-1.8.xml b/doc/manual/release-notes/rl-1.8.xml
index c854c5c5f..326990774 100644
--- a/doc/manual/release-notes/rl-1.8.xml
+++ b/doc/manual/release-notes/rl-1.8.xml
@@ -105,7 +105,7 @@ $ nix-store -l $(which xterm)
   some terminals show them anyway.</para></listitem>
 
   <listitem><para>Various commands now automatically pipe their output
-  into the pager as specified by the <envar>PAGER</envar> environment
+  into the pager as specified by the <literal>PAGER</literal> environment
   variable.</para></listitem>
 
   <listitem><para>Several improvements to reduce memory consumption in
diff --git a/doc/manual/release-notes/rl-1.9.xml b/doc/manual/release-notes/rl-1.9.xml
index c8406bd20..cc6558b1a 100644
--- a/doc/manual/release-notes/rl-1.9.xml
+++ b/doc/manual/release-notes/rl-1.9.xml
@@ -62,7 +62,7 @@ $ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
       master branch.</para></listitem>
 
       <listitem><para>In the Nix search path (as specified via
-      <envar>NIX_PATH</envar> or <option>-I</option>). For example, to
+      <literal>NIX_PATH</literal> or <option>-I</option>). For example, to
       start a shell containing the Pan package from a specific version
       of Nixpkgs:
 
@@ -190,8 +190,8 @@ main = do
   “generation” symlink in <filename>/nix/var/nix/profiles</filename>
   if something actually changed.</para></listitem>
 
-  <listitem><para>The environment variable <envar>NIX_PAGER</envar>
-  can now be set to override <envar>PAGER</envar>. You can set it to
+  <listitem><para>The environment variable <literal>NIX_PAGER</literal>
+  can now be set to override <literal>PAGER</literal>. You can set it to
   <literal>cat</literal> to disable paging for Nix commands
   only.</para></listitem>
 
diff --git a/doc/manual/release-notes/rl-2.0.xml b/doc/manual/release-notes/rl-2.0.xml
index 4c683dd3d..57acfd0ba 100644
--- a/doc/manual/release-notes/rl-2.0.xml
+++ b/doc/manual/release-notes/rl-2.0.xml
@@ -30,7 +30,7 @@
   <listitem>
     <para>The “copy from other stores” substituter mechanism
     (<command>copy-from-other-stores</command> and the
-    <envar>NIX_OTHER_STORES</envar> environment variable) has been
+    <literal>NIX_OTHER_STORES</literal> environment variable) has been
     removed. It was primarily used by the NixOS installer to copy
     available paths from the installation medium. The replacement is
     to use a chroot store as a substituter
@@ -371,7 +371,7 @@
         daemon. You can use <literal>auto</literal> or the empty
         string to auto-select a local or daemon store depending on
         whether you have write permission to the Nix store. It is no
-        longer necessary to set the <envar>NIX_REMOTE</envar>
+        longer necessary to set the <literal>NIX_REMOTE</literal>
         environment variable to use the Nix daemon.</para>
 
         <para>As noted above, <classname>LocalStore</classname> now
@@ -492,7 +492,7 @@
         use <filename>/build</filename> instead of
         <filename>/tmp</filename> as the temporary build
         directory. This fixes potential security problems when a build
-        accidentally stores its <envar>TMPDIR</envar> in some
+        accidentally stores its <literal>TMPDIR</literal> in some
         security-sensitive place, such as an RPATH.</para>
       </listitem>
 
@@ -546,8 +546,8 @@
     are not using the Nix daemon, you can now just specify a remote
     build machine on the command line, e.g. <literal>--option builders
     'ssh://my-mac x86_64-darwin'</literal>. The environment variable
-    <envar>NIX_BUILD_HOOK</envar> has been removed and is no longer
-    needed. The environment variable <envar>NIX_REMOTE_SYSTEMS</envar>
+    <literal>NIX_BUILD_HOOK</literal> has been removed and is no longer
+    needed. The environment variable <literal>NIX_REMOTE_SYSTEMS</literal>
     is still supported for compatibility, but it is also possible to
     specify builders in <command>nix.conf</command> by setting the
     option <literal>builders =
@@ -574,7 +574,7 @@
   </listitem>
 
   <listitem>
-    <para><envar>NIX_PATH</envar> is now lazy, so URIs in the path are
+    <para><literal>NIX_PATH</literal> is now lazy, so URIs in the path are
     only downloaded if they are needed for evaluation.</para>
   </listitem>
 
@@ -672,7 +672,7 @@
     <para><command>nix-shell</command> now uses
     <varname>bashInteractive</varname> from Nixpkgs, rather than the
     <command>bash</command> command that happens to be in the caller’s
-    <envar>PATH</envar>. This is especially important on macOS where
+    <literal>PATH</literal>. This is especially important on macOS where
     the <command>bash</command> provided by the system is seriously
     outdated and cannot execute <literal>stdenv</literal>’s setup
     script.</para>
@@ -720,7 +720,7 @@
 configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"}";
 </programlisting>
 
-    will cause the <envar>configureFlags</envar> environment variable
+    will cause the <literal>configureFlags</literal> environment variable
     to contain the actual store paths corresponding to the
     <literal>out</literal> and <literal>dev</literal> outputs.</para>
   </listitem>
@@ -815,7 +815,7 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
     <varname>__structuredAttrs</varname> is set to
     <literal>true</literal>, the other derivation attributes are
     serialised in JSON format and made available to the builder via
-    the file <envar>.attrs.json</envar> in the builder’s temporary
+    the file <literal>.attrs.json</literal> in the builder’s temporary
     directory. This obviates the need for
     <varname>passAsFile</varname> since JSON files have no size
     restrictions, unlike process environments.</para>
@@ -823,7 +823,7 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
     <para><link
     xlink:href="https://github.com/NixOS/nix/commit/2d5b1b24bf70a498e4c0b378704cfdb6471cc699">As
     a convenience to Bash builders</link>, Nix writes a script named
-    <envar>.attrs.sh</envar> to the builder’s directory that
+    <literal>.attrs.sh</literal> to the builder’s directory that
     initialises shell variables corresponding to all attributes that
     are representable in Bash. This includes non-nested (associative)
     arrays. For example, the attribute <literal>hardening.format =
@@ -835,7 +835,7 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
     <para>Builders can <link
     xlink:href="https://github.com/NixOS/nix/commit/88e6bb76de5564b3217be9688677d1c89101b2a3">now</link>
     communicate what build phase they are in by writing messages to
-    the file descriptor specified in <envar>NIX_LOG_FD</envar>. The
+    the file descriptor specified in <literal>NIX_LOG_FD</literal>. The
     current phase is shown by the <command>nix</command> progress
     indicator.
     </para>
diff --git a/doc/manual/release-notes/rl-2.2.xml b/doc/manual/release-notes/rl-2.2.xml
index d29eb87e8..cc992fabb 100644
--- a/doc/manual/release-notes/rl-2.2.xml
+++ b/doc/manual/release-notes/rl-2.2.xml
@@ -114,8 +114,8 @@ import &lt;nix/fetchurl.nix> {
 
   <listitem>
     <para>The evaluator now prints profiling statistics (enabled via
-    the <envar>NIX_SHOW_STATS</envar> and
-    <envar>NIX_COUNT_CALLS</envar> environment variables) in JSON
+    the <literal>NIX_SHOW_STATS</literal> and
+    <literal>NIX_COUNT_CALLS</literal> environment variables) in JSON
     format.</para>
   </listitem>
 
diff --git a/doc/manual/release-notes/rl-2.3.xml b/doc/manual/release-notes/rl-2.3.xml
index 0ad7d641f..83accf33e 100644
--- a/doc/manual/release-notes/rl-2.3.xml
+++ b/doc/manual/release-notes/rl-2.3.xml
@@ -60,7 +60,7 @@ incompatible changes:</para>
 
   <listitem>
     <para>Builds are now executed in a pseudo-terminal, and the
-    <envar>TERM</envar> environment variable is set to
+    <literal>TERM</literal> environment variable is set to
     <literal>xterm-256color</literal>. This allows many programs
     (e.g. <command>gcc</command>, <command>clang</command>,
     <command>cmake</command>) to print colorized log output.</para>