Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	GUILE-VERSION
	test-suite/tests/srfi-4.test

doc/ref/Makefile.am

@@ -90,6 +90,7 @@ guile_TEXINFOS = preface.texi			\
 		 mod-getopt-long.texi		\
 		 goops.texi			\
 		 goops-tutorial.texi		\
+		 guile-invoke.texi		\
 		 effective-version.texi
 
 ETAGS_ARGS = $(info_TEXINFOS) $(guile_TEXINFOS)

doc/ref/goops.texi

@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
-@c Copyright (C)  2008, 2009
+@c Copyright (C)  2008, 2009, 2011
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -822,9 +822,10 @@ Here is an example:
   #:export (x y z ...))
 
 (define-module (my-module)
+  #:use-module (oop goops)
   #:use-module (math 2D-vectors)
   #:use-module (math 3D-vectors)
-  #:duplicates merge-generics)
+  #:duplicates (merge-generics))
 @end lisp
 
 The generic function @code{x} in @code{(my-module)} will now incorporate

doc/ref/scheme-using.texi

@@ -704,17 +704,15 @@ information.
 Guile also comes with a growing number of command-line utilities: a
 compiler, a disassembler, some module inspectors, and in the future, a
 system to install Guile packages from the internet.  These tools may be
-invoked using the @code{guild} program@footnote{Until Guile version
-2.0.1, this program was known as @code{guile-tools}.  The
-@code{guile-tools} executable is still installed as of 2.0.x but may be
-removed in a future stable series.}.
+invoked using the @code{guild} program.
 
 @example
 $ guild compile -o foo.go foo.scm
 wrote `foo.go'
 @end example
 
-This program used to be called @code{guile-tools}, and for backward
+This program used to be called @code{guile-tools} up to
+Guile version 2.0.1, and for backward
 compatibility it still may be called as such.  However we changed the
 name to @code{guild}, not only because it is pleasantly shorter and
 easier to read, but also because this tool will serve to bind Guile