* stabs.texinfo (Top): Minor cleanup.

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index e9a16065c1c9958fbb295f39d43d5e3cbebc8768..9494bed1df622c52575a0075d44fd068b7dab436 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,9 +1,11 @@
-<<<<<<< ChangeLog
+Fri Jun 18 13:57:09 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * stabs.texinfo (Top): Minor cleanup.
+
 Mon Jun 14 16:16:51 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
 
        * Makefile.in (install-info): remove parentdir support
 
-=======
 Tue Jun 15 18:11:39 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
 
        * gdb.texinfo (Copying): delete this node and references to it;
@@ -15,7 +17,6 @@ Tue Jun 15 18:11:39 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
        largely due to Ian Taylor review. (Debug Session): minor edits to
        new text.
 
->>>>>>> 2.97
 Sun Jun 13 12:52:39 1993  Jim Kingdon  (kingdon@cygnus.com)
 
        * Makefile.in (realclean): Remove info and dvi files too.

diff --git a/gdb/doc/stabs.texinfo b/gdb/doc/stabs.texinfo
index 5847923197fefdde44f5ef3c09f6fdf9fd0d8f63..46fc747a6089f1b28ae7b1e45ff3bfb6edab79a9 100644 (file)
--- a/gdb/doc/stabs.texinfo
+++ b/gdb/doc/stabs.texinfo
@@ -62,7 +62,7 @@ are preserved on all copies.
 @node Top
 @top The "stabs" representation of debugging information
 
-This document describes the GNU stabs debugging format in a.out files.
+This document describes the stabs debugging format.
 
 @menu
 * Overview::                    Overview of stabs