diff --git a/doc/ref/intro.texi b/doc/ref/intro.texi
index 7e248e0..55cb4a3 100644
--- a/doc/ref/intro.texi
+++ b/doc/ref/intro.texi
@@ -72,7 +72,7 @@ Guile can be obtained from the main GNU archive site
 guile-version.tar.gz.  The current version is @value{VERSION}, so the
 file you should grab is:
 
-@url{ftp://ftp.gnu.org/pub/gnu/guile-@value{VERSION}.tar.gz}
+@url{ftp://ftp.gnu.org/pub/gnu/guile/guile-@value{VERSION}.tar.gz}
 
 To unbundle Guile use the instruction
 
diff --git a/doc/ref/scheme-scripts.texi b/doc/ref/scheme-scripts.texi
index 249bc34..f47ecf7 100644
--- a/doc/ref/scheme-scripts.texi
+++ b/doc/ref/scheme-scripts.texi
@@ -458,7 +458,7 @@ Here is a script which prints the factorial of its argument:
 @end example
 In action:
 @example
-$ fact 5
+$ ./fact 5
 120
 $
 @end example
@@ -487,7 +487,7 @@ definitions, without any extraneous computation taking place.  Then we
 used the meta switch @code{\} and the entry point switch @code{-e} to
 tell Guile to call @code{main} after loading the script.
 @example
-$ fact 50
+$ ./fact 50
 30414093201713378043612608166064768844377641568960512000000000000
 @end example
 
@@ -515,17 +515,17 @@ The command-line arguments here tell Guile to first load the file
 point.  In other words, the @code{choose} script can use definitions
 made in the @code{fact} script.  Here are some sample runs:
 @example
-$ choose 0 4
+$ ./choose 0 4
 1
-$ choose 1 4
+$ ./choose 1 4
 4
-$ choose 2 4
+$ ./choose 2 4
 6
-$ choose 3 4
+$ ./choose 3 4
 4
-$ choose 4 4
+$ ./choose 4 4
 1
-$ choose 50 100
+$ ./choose 50 100
 100891344545564193334812497256
 @end example
 
diff --git a/doc/ref/scheme-using.texi b/doc/ref/scheme-using.texi
index a8a2568..1ef02d8 100644
--- a/doc/ref/scheme-using.texi
+++ b/doc/ref/scheme-using.texi
@@ -372,17 +372,7 @@ to each other, with the arrows indicating ``builds on'' or
 which in turn builds on the standard scheme mode.
 
 @example
-            scheme
-               ^
-               |
-         .-----+-----.
-         |           |
-     cmuscheme    xscheme
-         ^
-         |
-   .-----+-----.
-   |           |
- Quack        GDS
+@image{scheme}
 @end example
 
 @dfn{scheme}, written by Bill Rozas and Dave Love, is Emacs's standard
@@ -551,23 +541,7 @@ The following diagram shows how these components are connected to each
 other.
 
 @example
-+----------------+
-| Program #1     |
-|                |
-| +------------+ |
-| | GDS Client |-_
-| +------------+ |-_                       +-------------------+
-+----------------+  -_TCP                  | Emacs             |
-                      -_                   |                   |
-                        -_+------------+   | +---------------+ |
-                         _| GDS Server |-----| GDS Interface | |
-+----------------+     _- +------------+   | +---------------+ |
-| Program #2     |   _-                    +-------------------+
-|                | _- TCP
-| +------------+ _-
-| | GDS Client |-|
-| +------------+ |
-+----------------+
+@image{gds}
 @end example
 
 @cindex TCP, use of