From 8b3dc5cf0e129fc61b6eaa711897f61afc0fe45a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 3 Feb 2020 09:22:26 +0100 Subject: doc: Fix typo in channel example. * doc/guix.texi (Channels): Use 'commit' field instead of 'branch' in example. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 956c25ba9e..57e4846013 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4158,7 +4158,7 @@ say, on another machine, by providing a channel specification in (channel (name 'my-personal-packages) (url "https://example.org/personal-packages.git") - (branch "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb"))) + (commit "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb"))) @end lisp The @command{guix describe --format=channels} command can even generate this -- cgit v1.2.3 From 65e15bd902f4dd6a3a1f6a87882ba73fac44defa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 3 Feb 2020 19:30:34 +0100 Subject: doc: Improve "guix pack -f docker" example. * doc/guix.texi (Invoking guix pack): Provide more concrete instructions for the "guix pack -f docker" example. --- doc/guix.texi | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 57e4846013..f90a8d4514 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5057,12 +5057,21 @@ Alternatively, you can produce a pack in the Docker image format using the following command: @example -guix pack -f docker guile emacs geiser +guix pack -f docker -S /bin=bin guile guile-readline @end example @noindent The result is a tarball that can be passed to the @command{docker load} -command. See the +command, followed by @code{docker run}: + +@example +docker load < @var{file} +docker run -ti guile-guile-readline /bin/guile +@end example + +@noindent +where @var{file} is the image returned by @var{guix pack}, and +@code{guile-guile-readline} is its ``image tag''. See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information. -- cgit v1.2.3 From ea9cc4ef219e62de569945816a5e666775e7fa41 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 4 Feb 2020 15:13:06 +0100 Subject: doc: Clarify documentation of Substitute Server Authorization. * doc/guix.texi (Substitute Server Authorization): Highlight the salient part of the example. Signed-off-by: Leo Famulari --- doc/guix.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index f90a8d4514..710cf97673 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3292,8 +3292,10 @@ $ guix build emacs --dry-run @end example @noindent -This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and -will be downloaded, when possible, for future builds. +The text changed from ``The following derivations would be built'' to +``112.3 MB would be downloaded''. This indicates that substitutes from +@code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when +possible, for future builds. @cindex substitutes, how to disable The substitute mechanism can be disabled globally by running -- cgit v1.2.3