Merge.

doc/ref/api-data.texi

@@ -3183,9 +3183,10 @@ produce the corresponding string element.  The order in which
 @deffnx {C Function} scm_string_join (ls, delimiter, grammar)
 Append the string in the string list @var{ls}, using the string
 @var{delimiter} as a delimiter between the elements of @var{ls}.
-@var{grammar} is a symbol which specifies how the delimiter is
-placed between the strings, and defaults to the symbol
-@code{infix}.
+@var{delimiter} defaults to @w{@samp{ }}, that is, strings in @var{ls}
+are appended with the space character in between them.  @var{grammar} is
+a symbol which specifies how the delimiter is placed between the
+strings, and defaults to the symbol @code{infix}.
 
 @table @code
 @item infix

doc/ref/api-io.texi

@@ -1596,7 +1596,7 @@ of bytes read.
 
 @item write
 A port's @code{write} implementation flushes write buffers to the
-mutable store.  A port's @code{read} implementation fills read buffers.
+mutable store.
 It should write out bytes from the supplied bytevector @code{src},
 starting at offset @code{start} and continuing for @code{count} bytes,
 and return the number of bytes that were written.

doc/ref/posix.texi

@@ -1040,6 +1040,21 @@ If @var{suffix} is provided, and is equal to the end of
 @end lisp
 @end deffn
 
+@deffn {Scheme Procedure} canonicalize-path path
+@deffnx {C Function} scm_canonicalize_path (path)
+Return the canonical (absolute) path of @var{path}.
+A canonical path has no @code{.} or @code{..} components,
+nor any repeated path separators (@code{/}) nor symlinks.
+
+Raises an error if any component of @var{path} does not
+exist.
+
+@lisp
+(canonicalize-path "test.xml")
+@result{} "/tmp/test.xml"
+@end lisp
+@end deffn
+
 @deffn {Scheme Procedure} file-exists? filename
 Return @code{#t} if the file named @var{filename} exists, @code{#f} if
 not.

doc/ref/scheme-using.texi

@@ -311,6 +311,9 @@ will be printed farther to the right, though if the width of the
 indentation passes the @var{max-indent}, the indentation is abbreviated.
 @end deffn
 
+These REPL commands can also be called as regular functions in scheme
+code on including the @code{(ice-9 time)} module.
+
 @node Debug Commands
 @subsubsection Debug Commands
 

doc/ref/srfi-modules.texi

@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
-@c Copyright (C) 1996, 1997, 2000-2004, 2006, 2007-2014, 2017, 2018, 2019
+@c Copyright (C) 1996, 1997, 2000-2004, 2006, 2007-2014, 2017, 2018, 2019, 2020
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -824,7 +824,7 @@ predicate or a comparison object for determining which elements are to
 be searched.
 
 @deffn {Scheme Procedure} find pred lst
-Return the first element of @var{lst} which satisfies the predicate
+Return the first element of @var{lst} that satisfies the predicate
 @var{pred} and @code{#f} if no such element is found.
 @end deffn
 

doc/ref/web.texi

@@ -772,11 +772,11 @@ The MD5 digest of a resource.
 @end deftypevr
 
 @deftypevr {HTTP Header} List content-range
-A range specification, as a list of three elements: the symbol
-@code{bytes}, either the symbol @code{*} or a pair of integers,
-indicating the byte rage, and either @code{*} or an integer, for the
-instance length.  Used to indicate that a response only includes part of
-a resource.
+Range specification as a list of three elements: the symbol
+@code{bytes}, either the symbol @code{*} or a pair of integers
+indicating the byte range, and either @code{*} or an integer indicating
+the instance length.  Used to indicate that a response only includes
+part of a resource.
 @example
 (parse-header 'content-range "bytes 10-20/*")
 @result{} (bytes (10 . 20) *)