From dc0322b51111d12e1d97e2cc456100c44dd31bb6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Oct 2016 15:14:17 +0200 Subject: services: ntpd: Add 'allow-large-adjustment?' knob. Suggested by Leo Famulari. * gnu/services/networking.scm ()[allow-large-adjustment?]: New field. (ntp-shepherd-service): Honor it. (ntp-service): Add #:allow-large-adjustment? and honor it. * doc/guix.texi (Networking Services): Document it. --- doc/guix.texi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 0c5d641b48..86b82c8c4a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8284,10 +8284,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 -- cgit 1.4.1 From 6f52b82d42a27228032b0d1e8106370818153072 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 23 Oct 2016 12:49:51 +0800 Subject: doc: emacs: Clarify 'guix-use-substituse' and 'guix-dry-run'. Reported by apteryx on #guix. * doc/emacs.texi (Emacs Build Options): Mention the variable value when describe the effects of 'guix-use-substitute' and 'guix-dry-run'. --- doc/emacs.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') 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 -- cgit 1.4.1