Merge from stable-2.2

This commit is contained in:
Andy Wingo 2019-08-02 15:30:13 +02:00
commit 8ee6e766b8
5 changed files with 13 additions and 38 deletions

View file

@ -216,7 +216,7 @@ one-element list containing a @var{person} whose first slot is
The @code{(ice-9 match)} module also provides the following convenient
syntactic sugar macros wrapping around @code{match}.
@deffn {Scheme Syntax} match-lambda exp clause1 clause2 @dots{}
@deffn {Scheme Syntax} match-lambda clause1 clause2 @dots{}
Create a procedure of one argument that matches its argument against
each clause, and returns the result of evaluating the corresponding
expressions.
@ -236,7 +236,7 @@ expressions.
@result{} world
@end example
@deffn {Scheme Syntax} match-lambda* exp clause1 clause2 @dots{}
@deffn {Scheme Syntax} match-lambda* clause1 clause2 @dots{}
Create a procedure of any number of arguments that matches its argument
list against each clause, and returns the result of evaluating the
corresponding expressions.

View file

@ -791,7 +791,7 @@ The MIME type of a resource, as a symbol, along with any parameters.
(parse-header 'content-type "text/plain;charset=utf-8")
@result{} (text/plain (charset . "utf-8"))
@end example
Note that the @code{charset} parameter is something is a misnomer, and
Note that the @code{charset} parameter is something of a misnomer, and
the HTTP specification admits this. It specifies the @emph{encoding} of
the characters, not the character set.
@end deftypevr