Minor changes for syncing with stable branch.

diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index 501f3c4..765348f 100644 (file)
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,13 @@
+2002-03-29  Neil Jerram  <neil@ossau.uklinux.net>
+
+       * posix.texi (Ports and File Descriptors), scheme-evaluation.texi
+       (Fly Evaluation): Remove vgone markers for close-all-ports-except,
+       eval2 and read-and-eval!.
+
+       * data-rep.texi (Describing a New Type), scheme-compound.texi
+       (Append/Reverse), scheme-procedures.texi (Internal Macros):
+       Trivial updates to sync with stable branch.
+
 2002-03-27  Neil Jerram  <neil@ossau.uklinux.net>
 
        * scheme-compound.texi (List Searching): Remove docs for

diff --git a/doc/ref/data-rep.texi b/doc/ref/data-rep.texi
index 6e0dc1a..30fcee6 100644 (file)
--- a/doc/ref/data-rep.texi
+++ b/doc/ref/data-rep.texi
@@ -46,7 +46,7 @@
 @c essay @sp 10
 @c essay @comment The title is printed in a large font.
 @c essay @title Data Representation in Guile
-@c essay @subtitle $Id: data-rep.texi,v 1.6 2002-03-12 21:08:57 ossau Exp $
+@c essay @subtitle $Id: data-rep.texi,v 1.7 2002-03-29 20:25:23 ossau Exp $
 @c essay @subtitle For use with Guile @value{VERSION}
 @c essay @author Jim Blandy
 @c essay @author Free Software Foundation
@@ -1410,8 +1410,8 @@ refers to.  The default smob mark function is to not mark any data.
 @xref{Garbage Collecting Smobs}, for more details.
 
 @item free
-Guile will apply this function to each instance of the new type it
-could not find any live pointers to.  The function should release all
+Guile will apply this function to each instance of the new type it could
+not find any live pointers to.  The function should release all
 resources held by the object and return the number of bytes released.
 This is analogous to the Java finalization method-- it is invoked at
 an unspecified time (when garbage collection occurs) after the object

diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
index 724015f..4b1e6a7 100644 (file)
--- a/doc/ref/posix.texi
+++ b/doc/ref/posix.texi
@@ -396,8 +396,6 @@ the port was opened, since modes such as "append" which are
 used only during port creation are not retained.
 @end deffn
 
-@vgone{close-all-ports-except,1.6}
-
 @deffn {Scheme Procedure} port-for-each proc
 @deffnx {C Function} scm_port_for_each (proc)
 Apply @var{proc} to each port in the Guile port table

diff --git a/doc/ref/scheme-compound.texi b/doc/ref/scheme-compound.texi
index cff67d0..7562356 100644 (file)
--- a/doc/ref/scheme-compound.texi
+++ b/doc/ref/scheme-compound.texi
@@ -344,7 +344,7 @@ if the last argument is not a proper list.
 @deffn {Scheme Procedure} append! . lists
 @deffnx {C Function} scm_append_x (lists)
 A destructive version of @code{append} (@pxref{Pairs and
-Lists,,,r5rs, The Revised^5 Report on Scheme}).  The cdr field
+lists,,,r5rs, The Revised^5 Report on Scheme}).  The cdr field
 of each list's final pair is changed to point to the head of
 the next list, so no consing is performed.  Return a pointer to
 the mutated list.
@@ -360,7 +360,7 @@ in reverse order.
 @c NJFIXME explain new_tail
 @deffn {Scheme Procedure} reverse! lst [new_tail]
 @deffnx {C Function} scm_reverse_x (lst, new_tail)
-A destructive version of @code{reverse} (@pxref{Pairs and Lists,,,r5rs,
+A destructive version of @code{reverse} (@pxref{Pairs and lists,,,r5rs,
 The Revised^5 Report on Scheme}).  The cdr of each cell in @var{lst} is
 modified to point to the previous list element.  Return a pointer to the
 head of the reversed list.

diff --git a/doc/ref/scheme-evaluation.texi b/doc/ref/scheme-evaluation.texi
index 059e664..fbfcd87 100644 (file)
--- a/doc/ref/scheme-evaluation.texi
+++ b/doc/ref/scheme-evaluation.texi
@@ -235,9 +235,6 @@ Evaluate @var{exp} in the top-level environment specified by
 the current module.
 @end deffn
 
-@vgone{eval2,1.6}
-@vgone{read-and-eval!,1.6}
-
 
 @node Loading
 @section Loading Scheme Code from File

diff --git a/doc/ref/scheme-procedures.texi b/doc/ref/scheme-procedures.texi
index 8ef2373..3da356f 100644 (file)
--- a/doc/ref/scheme-procedures.texi
+++ b/doc/ref/scheme-procedures.texi
@@ -727,25 +727,26 @@ all implemented as mmacros.)
 
 @deffn {Scheme Procedure} procedure->syntax code
 @deffnx {C Function} scm_makacro (code)
-Return a @dfn{macro} which, when a symbol defined to this value
-appears as the first symbol in an expression, returns the
-result of applying @var{code} to the expression and the
-environment.
+Return a macro which, when a symbol defined to this value appears as the
+first symbol in an expression, returns the result of applying @var{code}
+to the expression and the environment.
 @end deffn
 
 @deffn {Scheme Procedure} procedure->macro code
 @deffnx {C Function} scm_makmacro (code)
-Return a @dfn{macro} which, when a symbol defined to this value
-appears as the first symbol in an expression, evaluates the
-result of applying @var{code} to the expression and the
-environment.  For example:
+Return a macro which, when a symbol defined to this value appears as the
+first symbol in an expression, evaluates the result of applying
+@var{code} to the expression and the environment.  For example:
 
 @lisp
 (define trace
   (procedure->macro
-   (lambda (x env) `(set! ,(cadr x) (tracef ,(cadr x) ',(cadr x))))))
+    (lambda (x env)
+      `(set! ,(cadr x) (tracef ,(cadr x) ',(cadr x))))))
 
-(trace @i{foo}) @equiv{} (set! @i{foo} (tracef @i{foo} '@i{foo})).
+(trace @i{foo})
+@equiv{}
+(set! @i{foo} (tracef @i{foo} '@i{foo})).
 @end lisp
 @end deffn