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 1fc6098..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
@@ -3867,11 +3867,11 @@ and the two kinds of streams, accessors for both fields of a
 @code{stream-pair}, and a lambda that creates procedures that return
 streams.
 
-@deffn {Scheme Variable} stream-null
+@defvr {Scheme Variable} stream-null
 A promise that, when forced, is a single object, distinguishable from
 all other objects, that represents the null stream.  @code{stream-null}
 is immutable and unique.
-@end deffn
+@end defvr
 
 @deffn {Scheme Syntax} stream-cons object-expr stream-expr
 Creates a newly-allocated stream containing a promise that, when forced,