X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/a15542d26df42dabdb5e2f76d150ae200230c3b0..4b780d002d8eb79ac0de035c4a3861f1696f6430:/doc/guix.texi

diff --git a/doc/guix.texi b/doc/guix.texi
index 9a6a5c307d..eb3a1a4eb5 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9568,6 +9568,19 @@ with @code{build-expression->derivation} (@pxref{Derivations,
 @code{build-expression->derivation}}).
 @end defvr
 
+@defvr {Scheme Variable} channel-build-system
+This variable is exported by @code{(guix build-system channel)}.
+
+This build system is meant primarily for internal use.  A package using
+this build system must have a channel specification as its @code{source}
+field (@pxref{Channels}); alternatively, its source can be a directory
+name, in which case an additional @code{#:commit} argument must be
+supplied to specify the commit being built (a hexadecimal string).
+
+The resulting package is a Guix instance of the given channel, similar
+to how @command{guix time-machine} would build it.
+@end defvr
+
 @node Build Phases
 @section Build Phases
 
@@ -21020,7 +21033,7 @@ List of GNOME Shell assets needed by GDM: icon theme, fonts, etc.
 @item @code{xorg-configuration} (default: @code{(xorg-configuration)})
 Configuration of the Xorg graphical server.
 
-@item @code{xsession} (default: @code{(xinitrc)})
+@item @code{x-session} (default: @code{(xinitrc)})
 Script to run before starting a X session.
 
 @item @code{dbus-daemon} (default: @code{dbus-daemon-wrapper})
@@ -37487,6 +37500,10 @@ guix system container my-config.scm \
    --expose=$HOME --share=$HOME/tmp=/exchange
 @end example
 
+The @option{--share} and @option{--expose} options can also be passed to
+the generated script to bind-mount additional directories into the
+container.
+
 @quotation Note
 This option requires Linux-libre 3.19 or newer.
 @end quotation