diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
commit | b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60 (patch) | |
tree | 707c6a5e18474b410e39fa6892521c9f47518ccc /doc | |
parent | 97127431ee9133626fea62449706d729d80b73f6 (diff) | |
parent | 5b63a8568b39c019970569773bace18fab17a157 (diff) | |
download | guix-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'doc')
-rw-r--r-- | doc/guix.texi | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 29df0ddcc1..e25cf58a31 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -497,7 +497,7 @@ To use substitutes from @code{hydra.gnu.org} or one of its mirrors @end enumerate This completes root-level install of Guix. Each user will need to -perform additional steps to make their Guix envionment ready for use, +perform additional steps to make their Guix environment ready for use, @pxref{Application Setup}. You can confirm that Guix is working by installing a sample package into @@ -2125,7 +2125,7 @@ database of the daemon actually exist in @file{/gnu/store}. When provided, @var{options} must be a comma-separated list containing one or more of @code{contents} and @code{repair}. -When passing @option{--verify=contents}, the daemon computse the +When passing @option{--verify=contents}, the daemon computes the content hash of each store item and compares it against its hash in the database. Hash mismatches are reported as data corruptions. Because it traverses @emph{all the files in the store}, this command can take a @@ -7223,6 +7223,10 @@ A comment about the account, such as the account owner's full name. @item @code{home-directory} This is the name of the home directory for the account. +@item @code{create-home-directory?} (default: @code{#t}) +Indicates whether the home directory of this account should be created +if it does not exist yet. + @item @code{shell} (default: Bash) This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions}). @@ -7680,9 +7684,16 @@ Name of the group for build user accounts. Number of build user accounts to create. @item @code{authorize-key?} (default: @code{#t}) -Whether to authorize the substitute key for @code{hydra.gnu.org} +Whether to authorize the substitute keys listed in +@code{authorized-keys}---by default that of @code{hydra.gnu.org} (@pxref{Substitutes}). +@vindex %default-authorized-guix-keys +@item @code{authorized-keys} (default: @var{%default-authorized-guix-keys}) +The list of authorized key files for archive imports, as a list of +string-valued gexps (@pxref{Invoking guix archive}). By default, it +contains that of @code{hydra.gnu.org} (@pxref{Substitutes}). + @item @code{use-substitutes?} (default: @code{#t}) Whether to use substitutes. @@ -8505,7 +8516,7 @@ Data type representing the configuration of @var{mysql-service}. Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}. -For MySQL, a temorary root password will be displayed at activation time. +For MySQL, a temporary root password will be displayed at activation time. For MariaDB, the root password is empty. @end table @end deftp @@ -9856,7 +9867,7 @@ inspect and transform configurations from within Scheme. However, it could be that you just want to get a @code{dovecot.conf} up and running. In that case, you can pass an -@code{opaque-dovecot-configuration} as the @code{#:config} paramter to +@code{opaque-dovecot-configuration} as the @code{#:config} parameter to @code{dovecot-service}. As its name indicates, an opaque configuration does not have easy reflective capabilities. @@ -10709,7 +10720,7 @@ faster. @item -m 256 RAM available to the guest OS, in mebibytes. Defaults to 128@tie{}MiB, -which may be insufficent for some operations. +which may be insufficient for some operations. @item /tmp/qemu-image The file name of the qcow2 image. @@ -10954,7 +10965,7 @@ Here is an example of how a service is created and manipulated: The @code{modify-services} form provides a handy way to change the parameters of some of the services of a list such as @var{%base-services} (@pxref{Base Services, @code{%base-services}}). It -evalutes to a list of services. Of course, you could always use +evaluates to a list of services. Of course, you could always use standard list combinators such as @code{map} and @code{fold} to do that (@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual}); @code{modify-services} simply provides a more concise form for this @@ -10979,7 +10990,7 @@ bound within the @var{body} to the service parameters---e.g., a The @var{body} should evaluate to the new service parameters, which will be used to configure the new service. This new service will replace the original in the resulting list. Because a service's service parameters -are created using @code{define-record-type*}, you can write a succint +are created using @code{define-record-type*}, you can write a succinct @var{body} that evaluates to the new service parameters by using the @code{inherit} feature that @code{define-record-type*} provides. |