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

[bpt/guile.git] / doc / ref / srfi-modules.texi

diff --git a/doc/ref/srfi-modules.texi b/doc/ref/srfi-modules.texi
index 653cb05..f0158d5 100644 (file)
--- a/doc/ref/srfi-modules.texi
+++ b/doc/ref/srfi-modules.texi
@@ -177,8 +177,8 @@ how to load it with the Guile mechanism.
 @cindex @code{guile-2} SRFI-0 feature
 @cindex portability between 2.0 and older versions
 Likewise, testing the @code{guile-2} feature allows code to be portable
-between Guile 2.0 and previous versions of Guile.  For instance, it
-makes it possible to write code that accounts for Guile 2.0's compiler,
+between Guile 2.@var{x} and previous versions of Guile.  For instance, it
+makes it possible to write code that accounts for Guile 2.@var{x}'s compiler,
 yet be correctly interpreted on 1.8 and earlier versions:
 
 @example
@@ -3844,7 +3844,7 @@ again.  SRFI-41 can be made available with:
 
 SRFI-41 Streams are based on two mutually-recursive abstract data types:
 An object of the @code{stream} abstract data type is a promise that,
-when forced, is either @var{stream-null} or is an object of type
+when forced, is either @code{stream-null} or is an object of type
 @code{stream-pair}.  An object of the @code{stream-pair} abstract data
 type contains a @code{stream-car} and a @code{stream-cdr}, which must be
 a @code{stream}.  The essential feature of streams is the systematic
@@ -3862,14 +3862,14 @@ stream, and is only forced on demand.
 @subsubsection SRFI-41 Stream Primitives
 
 This library provides eight operators: constructors for
-@var{stream-null} and @code{stream-pair}s, type predicates for streams
+@code{stream-null} and @code{stream-pair}s, type predicates for streams
 and the two kinds of streams, accessors for both fields of a
 @code{stream-pair}, and a lambda that creates procedures that return
 streams.
 
 @defvr {Scheme Variable} stream-null
 A promise that, when forced, is a single object, distinguishable from
-all other objects, that represents the null stream.  @var{stream-null}
+all other objects, that represents the null stream.  @code{stream-null}
 is immutable and unique.
 @end defvr
 
@@ -4003,7 +4003,7 @@ Returns a newly-allocated stream containing the elements from
 Returns a newly-allocated stream containing in its elements the
 characters on the port.  If @var{port} is not given it defaults to the
 current input port.  The returned stream has finite length and is
-terminated by @var{stream-null}.
+terminated by @code{stream-null}.
 
 It looks like one use of @code{port->stream} would be this: