Merged in changes from CVS head

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-5
   Add =cvs-sync-make-log script

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-6
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-7
   Use absolute tla-tools filenames in =cvs-sync-make-log

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-8
   Use proper arch-tag: syntax for lispintro/texinfo.tex

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-9
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-24

3 files changed, 9 insertions, 3 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 978b1e03d41..e57e5fbb4fe 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-29  Kevin Ryde <user42@zip.com.au>
+
+        * viper.texi (Vi Macros): Fix reference to the Emacs manual.
+
+        * programs.texi (C Modes): Fix the xref.
+
 2003-12-23  Nick Roberts  <nick@nick.uklinux.net>
 
         * building.texi (Watch Expressions): Update.
diff --git a/man/programs.texi b/man/programs.texi
index e3775569860..6b3776e0ac3 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -1398,8 +1398,8 @@ Mode}).  The Foldout package provides folding-editor features
 
   This section gives a brief description of the special features
 available in C, C++, Objective-C, Java, CORBA IDL, and Pike modes.
-(These are called ``C mode and related modes.'')  @xref{Top, CC Mode,
-ccmode, , CC Mode}, for a more extensive description of these modes
+(These are called ``C mode and related modes.'')  @xref{Top, , CC Mode,
+ccmode, CC Mode}, for a more extensive description of these modes
 and their special features.
 
 @menu
diff --git a/man/viper.texi b/man/viper.texi
index 2012ee58875..a31ce9a003d 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -2779,7 +2779,7 @@ As if all that is not enough, Viper (through its interface to Emacs
 macros) lets the user define keyboard macros that ask for confirmation or
 even prompt the user for input and then continue.  To do this, one should
 type @kbd{C-x q} (for confirmation) or @kbd{C-u C-x q} (for prompt).
-For details, @pxref{Kbd Macro Query,,Customization,emacs,The GNU Emacs
+For details, @pxref{Keyboard Macro Query,,Customization,emacs,The GNU Emacs
 Manual} @refill
 
 When the user finishes defining a macro (which is done by typing @kbd{C-x)} ---