diff --git a/doc/goops/goops.texi b/doc/goops/goops.texi
index d6d8e595d..dcd699ca9 100644
--- a/doc/goops/goops.texi
+++ b/doc/goops/goops.texi
@@ -48,14 +48,9 @@ are preserved on all copies.
 @c and MOP documentation were written by Neil Jerram and reviewed by
 @c Mikael Djurfeldt.
 
-@author Christian Lynbech
-@author @email{chl@@tbit.dk}
-@author
-@author Mikael Djurfeldt
-@author @email{djurfeldt@@nada.kth.se}
-@author
-@author Neil Jerram
-@author @email{neil@@ossau.uklinux.net}
+@author Christian Lynbech @email{chl@@tbit.dk}
+@author Mikael Djurfeldt @email{djurfeldt@@nada.kth.se}
+@author Neil Jerram @email{neil@@ossau.uklinux.net}
 
 @c  The following two commands
 @c  start the copyright page.
@@ -131,7 +126,7 @@ info (goops.info) and texinfo format.
 @end menu
 
 @node Running GOOPS, Methods, Getting Started, Getting Started
-@subsection Running GOOPS
+@section Running GOOPS
 
 @enumerate
 @item
@@ -158,7 +153,7 @@ arbitrary Guile interpreter.)
 We're now ready to try some basic GOOPS functionality.
 
 @node Methods, User-defined types, Running GOOPS, Getting Started
-@subsection Methods
+@section Methods
 
 @smalllisp
 @group
@@ -171,7 +166,7 @@ We're now ready to try some basic GOOPS functionality.
 @end smalllisp
 
 @node User-defined types, Asking for the type of an object, Methods, Getting Started
-@subsection User-defined types
+@section User-defined types
 
 @smalllisp
 (define-class <2D-vector> ()
@@ -201,7 +196,7 @@ v --> <3, 4>
 @end smalllisp
 
 @node Asking for the type of an object, , User-defined types, Getting Started
-@subsection Types
+@section Types
 
 @example
 (class-of v) --> #<<class> <2D-vector> 40241ac0>
diff --git a/doc/r5rs/r5rs.texi b/doc/r5rs/r5rs.texi
index 605a9762d..5c0e2b786 100644
--- a/doc/r5rs/r5rs.texi
+++ b/doc/r5rs/r5rs.texi
@@ -106,7 +106,6 @@
 @author C. H@sc{ANSON} 
 @author K. M. P@sc{ITMAN} 
 @author M. W@sc{AND} 
-@author 
 
 
 @c  {\it Dedicated to the Memory of ALGOL 60}
@@ -116,7 +115,7 @@
 
 
 
-@unnumbered Summary
+@heading Summary
 
 
 The report gives a defining description of the programming language
@@ -760,7 +759,7 @@ conventions also imply type restrictions:
 @c \newcommand{\foo}[1]{\vr{#1}, \vri{#1}, $\ldots$ \vrj{#1}, $\ldots$}
 
 
-@center @c begin-tabular
+@c @center @c begin-tabular
 @quotation
 @table @asis
 @item @var{obj}
@@ -779,7 +778,6 @@ rational number
 integer
 @item @var{k}, @var{k1}, @dots{} @var{kj}, @dots{}
 exact non-negative integer
-@item 
 @end table
 @end quotation
 
@@ -5566,7 +5564,7 @@ For example:
 
 
 
-@center @c begin-tabular
+@c @center @c begin-tabular
 @quotation
 @table @asis
 @item @t{#\a}
@@ -5581,7 +5579,6 @@ For example:
 ; the preferred way to write a space
 @item @t{#\newline}
 ; the newline character
-@item 
 @end table
 @end quotation
 
@@ -7272,20 +7269,24 @@ The following five characters are reserved for future extensions to the
 language: @t{[ ] @{ @} |}
 
 
-@format
-@t{<token> --> <identifier> | <boolean> | <number>
+@example
+<token> --> <identifier> | <boolean> | <number>
+@end example
 @cindex @w{identifier}
+@example
      | <character> | <string>
      | ( | ) | #( | @t{'} | @t{`} | , | ,@@ | @b{.}
 <delimiter> --> <whitespace> | ( | ) | " | ;
 <whitespace> --> <space or newline>
 <comment> --> ;  <@r{all subsequent characters up to a}
                  @r{line break>}
+@end example
 @cindex @w{comment}
+@example
 <atmosphere> --> <whitespace> | <comment>
-<intertoken space> --> <atmosphere>*}
+<intertoken space> --> <atmosphere>*
 
-@end format
+@end example
 
 
 
@@ -7296,8 +7297,8 @@ language: @t{[ ] @{ @} |}
 
 
 
-@format
-@t{<identifier> --> <initial> <subsequent>*
+@example
+<identifier> --> <initial> <subsequent>*
      | <peculiar identifier>
 <initial> --> <letter> | <special initial>
 <letter> --> a | b | c | ... | z
@@ -7310,8 +7311,10 @@ language: @t{[ ] @{ @} |}
 <special subsequent> --> + | - | .@: | @@
 <peculiar identifier> --> + | - | ...
 <syntactic keyword> --> <expression keyword>
+@end example
 @cindex @w{syntactic keyword}
 @cindex @w{keyword}
+@example
      | else | => | define 
      | unquote | unquote-splicing
 <expression keyword> --> quote | lambda | if
@@ -7320,7 +7323,9 @@ language: @t{[ ] @{ @} |}
      | quasiquote
 
 @w{@samp{<variable> @result{} <}}@r{any <identifier> that isn't}
+@end example
 @cindex @w{variable}
+@example
        @w{         @r{also a <syntactic keyword>>}}
 
 <boolean> --> #t | #f
@@ -7330,9 +7335,9 @@ language: @t{[ ] @{ @} |}
 
 <string> --> " <string element>* "
 <string element> --> <any character other than " or \>
-     | \" | \\ }
+     | \" | \\
 
-@end format
+@end example
 
 
 
@@ -7385,27 +7390,35 @@ Mark Meyer and David Bartley want to fix this.  (What? -- Will)
 
 
 
-@format
-@t{<suffix> --> <empty> 
+@example
+<suffix> --> <empty> 
     | <exponent marker> <sign> <digit 10>+
 <exponent marker> --> e | s | f | d | l
 <sign> --> <empty>  | + |  -
 <exactness> --> <empty> | #i | #e
+@end example
 @vindex #e
 @vindex #i
+@example
 <radix 2> --> #b
+@end example
 @vindex #b
+@example
 <radix 8> --> #o
+@end example
 @vindex #o
+@example
 <radix 10> --> <empty> | #d
 <radix 16> --> #x
+@end example
 @vindex #x
+@example
 <digit 2> --> 0 | 1
 <digit 8> --> 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7
 <digit 10> --> <digit>
-<digit 16> --> <digit 10> | a | b | c | d | e | f }
+<digit 16> --> <digit 10> | a | b | c | d | e | f
 
-@end format
+@end example
 
 
 
@@ -8057,9 +8070,9 @@ Cromarty:
 
 The Internet Scheme Repository at
 
-@center 
+@c @center 
 @center @url{http://www.cs.indiana.edu/scheme-repository/}
-@center 
+@c @center 
 
 contains an extensive Scheme bibliography, as well as papers,
 programs, implementations, and other material related to Scheme.
diff --git a/doc/tutorial/guile-tut.texi b/doc/tutorial/guile-tut.texi
index ed0b20210..91ad89976 100644
--- a/doc/tutorial/guile-tut.texi
+++ b/doc/tutorial/guile-tut.texi
@@ -446,7 +446,7 @@ get started, look at the books @cite{Simply Scheme} and @cite{The Little
 Schemer} from that list.}
 
 
-@subsection Hello World
+@section Hello World
 @cindex hello world
 
 Our first program is the typical Scheme "hello world" program.  Put the
@@ -483,7 +483,7 @@ is then terminated with @code{!#} on the second line so as to not
 interfere with the execution mechanism.
 
 
-@subsection A bunch of operations in Scheme
+@section A bunch of operations in Scheme
 
 Here is some code you can type at the @code{guile>} prompt to see some
 of the Scheme data types at work (mostly lists and vectors).  I have
@@ -535,12 +535,12 @@ guile> @kbd{(memq 4 ls)}
 guile> @kbd{(if (memq 4 ls)
            (display "hey, it's true!\n")
            (display "dude, it's false\n"))}
-       @print{hey, it's true!}
+       @print{} hey, it's true!
        @result{}
 guile> @kbd{(if (memq 12 ls)
            (display "hey, it's true!\n")
            (display "dude, it's false\n"))}
-       @print{dude, it's false}
+       @print{} dude, it's false
        @result{}
 guile> @kbd{(memq 4 (reverse ls))}
        @result{} (4 3 2 1)
@@ -583,7 +583,7 @@ guile> @kbd{v}
 @end smalllisp
 
 
-@subsection Using recursion to process lists
+@section Using recursion to process lists
 @cindex recursion
 @cindex list processing
 
@@ -600,7 +600,7 @@ Here are some typical examples of using recursion to process a list.
 @end smalllisp
 
 
-@subsection Processing matrices
+@section Processing matrices
 
 Suppose you have a matrix represented as a list of lists:
 
@@ -656,9 +656,9 @@ And then invoke it with
 (represent-matrix m
                   (lambda (x) (begin (display x) (display " ")))
                   (lambda (l) (begin (display "\n"))))
-@print{7 2 1 3 2 8 5 3 6}
-@print{4 1 1 1 3 8 9 8 1}
-@print{5 5 4 8 1 8 2 2 4}
+@print{} 7 2 1 3 2 8 5 3 6
+@print{} 4 1 1 1 3 8 9 8 1
+@print{} 5 5 4 8 1 8 2 2 4
 @end smalllisp
 
 @cindex objects