* Various typo fixes and clarifications merged from the stable CVS branch.

diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index a7300fd..7206f31 100644 (file)
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-30  Neil Jerram  <neil@ossau.uklinux.net>
+
+       * scheme-data.texi (Random, String Syntax, String Modification,
+       Regular Expressions), scheme-ideas.texi (Definition),
+       scheme-modules.texi (Dynamic Linking and Compiled Code Modules),
+       scm.texi (Transforming Scheme name to C name, Port
+       Implementation): Various typo fixes and clarifications merged from
+       the stable CVS branch.
+
 2001-08-27  Neil Jerram  <neil@ossau.uklinux.net>
 
        * intro.texi: Merged wording fixes from stable CVS branch.

diff --git a/doc/ref/scheme-data.texi b/doc/ref/scheme-data.texi
index 3303881..0adf9ab 100755 (executable)
--- a/doc/ref/scheme-data.texi
+++ b/doc/ref/scheme-data.texi
@@ -1125,7 +1125,7 @@ the sum of whose squares is equal to 1.0.
 Thinking of vect as coordinates in space of
 dimension n = (vector-length vect), the coordinates
 are uniformly distributed over the surface of the
-unit n-shere.
+unit n-sphere.
 @end deffn
 
 @deffn primitive random:normal [state]
@@ -1146,7 +1146,7 @@ Fills vect with inexact real random numbers
 the sum of whose squares is less than 1.0.
 Thinking of vect as coordinates in space of
 dimension n = (vector-length vect), the coordinates
-are uniformly distributed within the unit n-shere.
+are uniformly distributed within the unit n-sphere.
 The sum of the squares of the numbers is returned.
 @end deffn
 
@@ -1389,7 +1389,7 @@ characters enclosed in double quotes (@code{"}). @footnote{Actually, the
 current implementation restricts strings to a length of 2^24
 characters.}  If you want to insert a double quote character into a
 string literal, it must be prefixed with a backslash @code{\} character
-(called an @emph{escape character}).
+(called an @dfn{escape character}).
 
 The following are examples of string literals:
 
@@ -1410,8 +1410,7 @@ fulfills some specified property.
 
 @rnindex string?
 @deffn primitive string? obj
-Return @code{#t} iff @var{obj} is a string, else returns
-@code{#f}.
+Return @code{#t} iff @var{obj} is a string, else @code{#f}.
 @end deffn
 
 @deffn primitive string-null? str
@@ -1522,9 +1521,9 @@ exact integers satisfying:
 @node String Modification
 @subsection String Modification
 
-These procedures are for modifying strings in-place.  That means, that
-not a new string is the result of a string operation, but that the
-actual memory representation of a string is modified.
+These procedures are for modifying strings in-place.  This means that the
+result of the operation is not a new string; instead, the original string's
+memory representation is modified.
 
 @rnindex string-set!
 @deffn primitive string-set! str k chr
@@ -1821,7 +1820,7 @@ A @dfn{regular expression} (or @dfn{regexp}) is a pattern that
 describes a whole class of strings.  A full description of regular
 expressions and their syntax is beyond the scope of this manual;
 an introduction can be found in the Emacs manual (@pxref{Regexps,
-, Syntax of Regular Expressions, emacs, The GNU Emacs Manual}, or
+, Syntax of Regular Expressions, emacs, The GNU Emacs Manual}), or
 in many general Unix reference books.
 
 If your system does not include a POSIX regular expression library, and

diff --git a/doc/ref/scheme-ideas.texi b/doc/ref/scheme-ideas.texi
index 80f5fba..7de9d93 100644 (file)
--- a/doc/ref/scheme-ideas.texi
+++ b/doc/ref/scheme-ideas.texi
@@ -188,9 +188,9 @@ of an existing variable.
 @code{define} syntax that can be used when defining new procedures.
 
 @item
-REFFIXME, to read about an alternative form of the @code{set!}  syntax
-that helps with changing a single value in the depths of a compound data
-structure.)
+@ref{Procedures with Setters}, to read about an alternative form of the
+@code{set!} syntax that helps with changing a single value in the depths
+of a compound data structure.)
 @end itemize
 
 

diff --git a/doc/ref/scheme-modules.texi b/doc/ref/scheme-modules.texi
index c0b37bc..70cbd94 100644 (file)
--- a/doc/ref/scheme-modules.texi
+++ b/doc/ref/scheme-modules.texi
@@ -698,7 +698,7 @@ module @samp{(math bessel)}.  First we need to write the appropriate
 glue code to convert the arguments and return values of the functions
 from Scheme to C and back.  Additionally, we need a function that will
 add them to the set of Guile primitives.  Because this is just an
-example, we will only implement this for the @code{j0} function, tho.
+example, we will only implement this for the @code{j0} function.
 
 @c FIXME::martin: Change all gh_ references to their scm_ equivalents.
 

diff --git a/doc/ref/scm.texi b/doc/ref/scm.texi
index c6a00d5..2cda191 100644 (file)
--- a/doc/ref/scm.texi
+++ b/doc/ref/scm.texi
@@ -78,7 +78,7 @@ Prefix arg non-nil means use \"gh_\" prefix, otherwise use \"scm_\" prefix."
                       (">=" . "_geq")
                       ("<"  . "_less")
                       (">"  . "_gr")
-                      ("@"  . "at"))))
+                      ("@@"  . "at"))))
     (while transforms
       (let ((trigger (concat "\\(.*\\)"
                              (regexp-quote (caar transforms))
@@ -233,9 +233,9 @@ All of the elements of the ptob, apart from @code{name}, are procedures
 which collectively implement the port behaviour.  Creating a new port
 type mostly involves writing these procedures.
 
-@code{scm_make_port_type} initialises three elements of the structure
+@code{scm_make_port_type} initializes three elements of the structure
 (@code{name}, @code{fill_input} and @code{write}) from its arguments.
-The remaining elements are initialised with default values and can be
+The remaining elements are initialized with default values and can be
 set later if required.
 
 @table @code