Patch from rms.

6 files changed, 8 insertions, 7 deletions

diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index abd62b9fcb0..840f84f7920 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -184,6 +184,7 @@ Reference Manual, corresponding to GNU Emacs version 21.1.
 
 Appendices
 
+* Antinews::                Info for users downgrading to Emacs 20.
 * Tips::                    Advice and coding conventions for Emacs Lisp.
 * GNU Emacs Internals::     Building and dumping Emacs;
                               internal data structures.
@@ -953,9 +954,9 @@ Object Internals
 @include abbrevs.texi
 @include processes.texi
 
-@include os.texi
 @include display.texi
 @include calendar.texi
+@include os.texi
 
 @c MOVE to Emacs Manual:  include misc-modes.texi
 
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 34525fed808..3e8f3f301e3 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -1485,7 +1485,7 @@ or @code{(@var{name} @var{number})}.  Here, @var{name} is the color
 name, @var{number} is the number used to specify it to the terminal.
 If present, @var{rgb} is an rgb value that says what the color
 actually looks like.
-@end defun
+@end defvar
 
 @defun tty-color-approximate rgb
 @tindex tty-color-approximate
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 727851f59c7..d6c14e521ca 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -1352,7 +1352,7 @@ The default value of @code{default-mode-line-format} is this list:
 @group
  "   %[("
  ;; @r{@code{mode-line-mode-name} is a function}
- ;; @r{that copies the mode name and adds text
+ ;; @r{that copies the mode name and adds text}
  ;; @r{properties to make it mouse-sensitive.}
  (:eval (mode-line-mode-name))
  mode-line-process
diff --git a/lispref/os.texi b/lispref/os.texi
index b24c1a41698..68cfacd4693 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -3,7 +3,7 @@
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998 Free Software Foundation, Inc. 
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/os
-@node System Interface, Tips, Calendar, Top
+@node System Interface, Antinews, Calendar, Top
 @chapter Operating System Interface
 
   This chapter is about starting and getting out of Emacs, access to
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 5ce4c437176..03e767f2f28 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -3,7 +3,7 @@
 @c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998 Free Software Foundation, Inc. 
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/tips
-@node Tips, GNU Emacs Internals, System Interface, Top
+@node Tips, GNU Emacs Internals, Antinews, Top
 @appendix Tips and Conventions
 @cindex tips
 @cindex standards of coding style
@@ -295,7 +295,7 @@ Try to avoid compiler warnings about undefined free variables, by adding
 
 Sometimes adding a @code{require} for another package is useful to avoid
 compilation warnings for variables and functions defined in that
-package.  If you do this, often it is better if the @cpde{require} acts
+package.  If you do this, often it is better if the @code{require} acts
 only at compile time.  Here's how to do that:
 
 @example
diff --git a/lispref/windows.texi b/lispref/windows.texi
index c583df2887c..eedc030d26e 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -272,7 +272,7 @@ You could define a simplified version of the function like this:
 (defun split-window-horizontally (&optional arg)
   "Split selected window into two windows, side by side..."
   (interactive "P")
-@endgroup
+@end group
 @group
   (let ((size (and arg (prefix-numeric-value arg))))
     (and size (< size 0)