diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-23 14:16:39 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-23 14:16:39 -0400 |
| commit | ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3 (patch) | |
| tree | 1b3e014c4e0398ecb63d1b88ee06b09d0c0c5a56 /doc | |
| parent | f08add0c5a3f1f7200b0a00e17ed880692d2244b (diff) | |
| parent | 903276d066ab9733c253d2a15b7ae135ef2ef836 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs.texi | 8 | ||||
| -rw-r--r-- | doc/guix.texi | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/emacs.texi b/doc/emacs.texi index c7a8881ef5..1ffb9f636e 100644 --- a/doc/emacs.texi +++ b/doc/emacs.texi @@ -417,12 +417,12 @@ this variable, for example: @end example @item guix-use-substitutes -Has the same meaning as @code{--no-substitutes} option (@pxref{Invoking -guix build}). +If nil, has the same meaning as @code{--no-substitutes} option +(@pxref{Invoking guix build}). @item guix-dry-run -Has the same meaning as @code{--dry-run} option (@pxref{Invoking guix -build}). +If non-nil, has the same meaning as @code{--dry-run} option +(@pxref{Invoking guix build}). @end table diff --git a/doc/guix.texi b/doc/guix.texi index eea02172cf..519443feae 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8285,10 +8285,13 @@ configure networking." @end deffn @deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @ - [#:servers @var{%ntp-servers}] + [#:servers @var{%ntp-servers}] @ + [#:allow-large-adjustment? #f] Return a service that runs the daemon from @var{ntp}, the @uref{http://www.ntp.org, Network Time Protocol package}. The daemon will keep the system clock synchronized with that of @var{servers}. +@var{allow-large-adjustment?} determines whether @command{ntpd} is allowed to +make an initial adjustment of more than 1,000 seconds. @end deffn @defvr {Scheme Variable} %ntp-servers |