Merge pull request #431 from j-keck/master

small documentation fixes
This commit is contained in:
Rob Vermaas 2015-01-05 15:13:51 +01:00
commit 1b167c964f
2 changed files with 2 additions and 3 deletions

View file

@ -36,7 +36,7 @@ its much more convenient to use the Nixpkgs
<emphasis>channel</emphasis>, since it makes it easy to stay up to <emphasis>channel</emphasis>, since it makes it easy to stay up to
date with new versions of Nixpkgs. (Channels are described in more date with new versions of Nixpkgs. (Channels are described in more
detail in <xref linkend="sec-channels"/>.) Nixpkgs is automatically detail in <xref linkend="sec-channels"/>.) Nixpkgs is automatically
added to your list of “subscribed” channels when when you install added to your list of “subscribed” channels when you install
Nix. If this is not the case for some reason, you can add it as Nix. If this is not the case for some reason, you can add it as
follows: follows:

View file

@ -120,8 +120,7 @@ can also see all available generations:
<screen> <screen>
$ nix-env --list-generations</screen></para> $ nix-env --list-generations</screen></para>
<para>Actually, there is another level of indirection not shown in the <para>You generally wouldnt have
figure above. You generally wouldnt have
<filename>/nix/var/nix/profiles/<replaceable>some-profile</replaceable>/bin</filename> <filename>/nix/var/nix/profiles/<replaceable>some-profile</replaceable>/bin</filename>
in your <envar>PATH</envar>. Rather, there is a symlink in your <envar>PATH</envar>. Rather, there is a symlink
<filename>~/.nix-profile</filename> that points to your current <filename>~/.nix-profile</filename> that points to your current