From 2c052278d231653d2f071c752d9d2fb63c67e771 Mon Sep 17 00:00:00 2001 From: j-keck Date: Mon, 5 Jan 2015 13:27:33 +0100 Subject: [PATCH 1/2] doc: remove double word '... when when ...' -> '... when ...' --- doc/manual/packages/basic-package-mgmt.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/manual/packages/basic-package-mgmt.xml b/doc/manual/packages/basic-package-mgmt.xml index 540d3ec22..e8d1419da 100644 --- a/doc/manual/packages/basic-package-mgmt.xml +++ b/doc/manual/packages/basic-package-mgmt.xml @@ -36,7 +36,7 @@ it’s much more convenient to use the Nixpkgs channel, since it makes it easy to stay up to date with new versions of Nixpkgs. (Channels are described in more detail in .) 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 follows: From 14fb7378dfb2bddb45652cfffe1908d4ff1fc8ea Mon Sep 17 00:00:00 2001 From: j-keck Date: Mon, 5 Jan 2015 13:31:06 +0100 Subject: [PATCH 2/2] doc: remove wrong phrase. '... another level of indirection not shown in the figure above ...' but in the 'user-environments.png' figure there is '~/.nix-profile'. the figure was updated with the commit: f982df3 on Mar 16, 2005. --- doc/manual/packages/profiles.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/manual/packages/profiles.xml b/doc/manual/packages/profiles.xml index 60660056f..4d10319ab 100644 --- a/doc/manual/packages/profiles.xml +++ b/doc/manual/packages/profiles.xml @@ -120,8 +120,7 @@ can also see all available generations: $ nix-env --list-generations -Actually, there is another level of indirection not shown in the -figure above. You generally wouldn’t have +You generally wouldn’t have /nix/var/nix/profiles/some-profile/bin in your PATH. Rather, there is a symlink ~/.nix-profile that points to your current