summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-02-14 17:32:46 +0100
committerLudovic Courtès <ludo@gnu.org>2009-02-14 17:32:46 +0100
commitf7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a (patch)
treebe17320f40e9cfd935238883dee59667cf4bf5bc /doc
parent63385df2fdc2f9bc70804383f071f2fb74743a86 (diff)
parentfe11efeebaa2ebb7bf0fe8bc46a29c152ead2509 (diff)
downloadguile-f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a.tar.gz
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts: libguile/gc-mark.c libguile/procs.c libguile/procs.h libguile/threads.c libguile/threads.h
Diffstat (limited to 'doc')
-rw-r--r--doc/ref/Makefile.am13
-rw-r--r--doc/ref/srfi-modules.texi8
2 files changed, 12 insertions, 9 deletions
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 19458cfee..2ca550ab3 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -98,9 +98,12 @@ lib-version.texi: $(top_srcdir)/GUILE-VERSION
MAINTAINERCLEANFILES = autoconf-macros.texi
# To allow "make distcheck" to succeed, lib-version.texi must either
-# be cleaned or be included in the distribution. There's no point
-# forcing a distribution build to regenerate lib-version.texi, because
-# it can't possibly be different on the build machine than where the
-# distribution was generated, so we might as well include it in the
-# distribution.
+# be cleaned or be included in the distribution. Or both - and in
+# fact both are good. There's no point forcing a distribution build
+# to regenerate lib-version.texi, because it can't possibly be
+# different on the build machine than where the distribution was
+# generated, so we might as well include it in the distribution.
EXTRA_DIST += lib-version.texi
+# But when we want to get back to a clean tree, lib-version.texi
+# should be cleaned.
+CLEANFILES = lib-version.texi
diff --git a/doc/ref/srfi-modules.texi b/doc/ref/srfi-modules.texi
index b1fdde1c3..1fa50b209 100644
--- a/doc/ref/srfi-modules.texi
+++ b/doc/ref/srfi-modules.texi
@@ -29,7 +29,7 @@ get the relevant SRFI documents from the SRFI home page
* SRFI-8:: receive.
* SRFI-9:: define-record-type.
* SRFI-10:: Hash-Comma Reader Extension.
-* SRFI-11:: let-values and let-values*.
+* SRFI-11:: let-values and let*-values.
* SRFI-13:: String library.
* SRFI-14:: Character-set library.
* SRFI-16:: case-lambda
@@ -1514,9 +1514,9 @@ the anonymous and compact syntax of @nicode{#,()} is much better.
@cindex SRFI-11
@findex let-values
-@findex let-values*
+@findex let*-values
This module implements the binding forms for multiple values
-@code{let-values} and @code{let-values*}. These forms are similar to
+@code{let-values} and @code{let*-values}. These forms are similar to
@code{let} and @code{let*} (@pxref{Local Bindings}), but they support
binding of the values returned by multiple-valued expressions.
@@ -1533,7 +1533,7 @@ available.
@code{let-values} performs all bindings simultaneously, which means that
no expression in the binding clauses may refer to variables bound in the
-same clause list. @code{let-values*}, on the other hand, performs the
+same clause list. @code{let*-values}, on the other hand, performs the
bindings sequentially, just like @code{let*} does for single-valued
expressions.