Merge branch 'master' into core-updates

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
 

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