From a67ec3f4ff30364935c115b0f0fa08537165a77f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 14 Jan 2009 11:47:07 +0000 Subject: [PATCH] 2009-01-14 Joseph Myers Carlos O'Donell Fixes for makeinfo --html. * annotate.texinfo: Use @copying and @insertcopying. Use @ifnottex in place of @ifinfo. * gdb.texinfo: Use @copying and @insertcopying. Use @ifnottex in place of @ifinfo. Use @ifnotinfo for one index entry. * gdbint.texinfo: Use @copying and @insertcopying. Use @ifnottex in place of @ifinfo. * stabs.texinfo: Use @copying and @insertcopying. Use @ifnottex in place of @ifinfo. Include contents at start unconditionally. --- gdb/doc/ChangeLog | 14 ++++++++++++ gdb/doc/annotate.texinfo | 28 +++++++++++------------- gdb/doc/gdb.texinfo | 56 ++++++++++++++++++++---------------------------- gdb/doc/gdbint.texinfo | 27 +++++++++++------------ gdb/doc/stabs.texinfo | 41 +++++++++++------------------------ 5 files changed, 74 insertions(+), 92 deletions(-) diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index c2b7df5..a729066 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,17 @@ +2009-01-14 Joseph Myers + Carlos O'Donell + + Fixes for makeinfo --html. + + * annotate.texinfo: Use @copying and @insertcopying. Use + @ifnottex in place of @ifinfo. + * gdb.texinfo: Use @copying and @insertcopying. Use @ifnottex in + place of @ifinfo. Use @ifnotinfo for one index entry. + * gdbint.texinfo: Use @copying and @insertcopying. Use @ifnottex + in place of @ifinfo. + * stabs.texinfo: Use @copying and @insertcopying. Use @ifnottex + in place of @ifinfo. Include contents at start unconditionally. + 2009-01-13 Pedro Alves * gdb.texinfo (General Query Packets): Remove @var{} around the diff --git a/gdb/doc/annotate.texinfo b/gdb/doc/annotate.texinfo index 2c48fdb..686fda0 100644 --- a/gdb/doc/annotate.texinfo +++ b/gdb/doc/annotate.texinfo @@ -26,10 +26,9 @@ @c more expensive, form factor and would drive up the manuals publication @c cost. Having a smaller cheaper manual helps the GNU Press with its sales. -@ifinfo -This file documents @value{GDBN}'s obsolete annotations. - -Copyright (C) 1994, 1995, 2000, 2001, 2003 Free Software Foundation, Inc. +@copying +Copyright @copyright{} 1994, 1995, 2000, 2001, 2003, 2004, 2005, 2007, +2008, 2009 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -37,8 +36,13 @@ any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. +@end copying + +@ifnottex +This file documents @value{GDBN}'s obsolete annotations. -@end ifinfo +@insertcopying +@end ifnottex @titlepage @title @value{GDBN}'s Obsolete Annotations @@ -47,18 +51,10 @@ Free Documentation License''. @author Free Software Foundation @page @vskip 0pt plus 1filll -Copyright @copyright{} 1994, 1995, 2000, 2001, 2003 Free Software -Foundation, Inc. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage -@ifinfo +@ifnottex @node Top @top GDB Annotations @@ -68,7 +64,7 @@ implemented in older @value{GDBN} versions. @ignore This is Edition @value{EDITION}, @value{DATE}. @end ignore -@end ifinfo +@end ifnottex @menu * Annotations Overview:: What annotations are; the general syntax. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 69e2403..817b96b 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -@c 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +@c 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 @c Free Software Foundation, Inc. @c @c %**start of header @@ -43,20 +43,10 @@ * Gdb: (gdb). The GNU debugger. @end direntry -@ifinfo -This file documents the @sc{gnu} debugger @value{GDBN}. - - -This is the @value{EDITION} Edition, of @cite{Debugging with -@value{GDBN}: the @sc{gnu} Source-Level Debugger} for @value{GDBN} -@ifset VERSION_PACKAGE -@value{VERSION_PACKAGE} -@end ifset -Version @value{GDBVN}. - -Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,@* - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006@* - Free Software Foundation, Inc. +@copying +Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, +1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -68,7 +58,20 @@ and with the Back-Cover Texts as in (a) below. (a) The FSF's Back-Cover Text is: ``You are free to copy and modify this GNU Manual. Buying copies from GNU Press supports the FSF in developing GNU and promoting software freedom.'' -@end ifinfo +@end copying + +@ifnottex +This file documents the @sc{gnu} debugger @value{GDBN}. + +This is the @value{EDITION} Edition, of @cite{Debugging with +@value{GDBN}: the @sc{gnu} Source-Level Debugger} for @value{GDBN} +@ifset VERSION_PACKAGE +@value{VERSION_PACKAGE} +@end ifset +Version @value{GDBVN}. + +@insertcopying +@end ifnottex @titlepage @title Debugging with @value{GDBN} @@ -90,25 +93,12 @@ developing GNU and promoting software freedom.'' @end tex @vskip 0pt plus 1filll -Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, -1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 -Free Software Foundation, Inc. -@sp 2 Published by the Free Software Foundation @* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA@* ISBN 1-882114-77-9 @* -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``Free Software'' and ``Free Software Needs -Free Documentation'', with the Front-Cover Texts being ``A GNU Manual,'' -and with the Back-Cover Texts as in (a) below. - -(a) The FSF's Back-Cover Text is: ``You are free to copy and modify -this GNU Manual. Buying copies from GNU Press supports the FSF in -developing GNU and promoting software freedom.'' +@insertcopying @page This edition of the GDB manual is dedicated to the memory of Fred Fish. Fred was a long-standing contributor to GDB and to Free @@ -129,7 +119,7 @@ This is the @value{EDITION} Edition, for @value{GDBN} @end ifset Version @value{GDBVN}. -Copyright (C) 1988-2006 Free Software Foundation, Inc. +Copyright (C) 1988-2009 Free Software Foundation, Inc. This edition of the GDB manual is dedicated to the memory of Fred Fish. Fred was a long-standing contributor to GDB and to Free @@ -11117,9 +11107,9 @@ index bounds, and all built-in functions and procedures. @vindex colon-colon@r{, in Modula-2} @c Info cannot handle :: but TeX can. @end ifinfo -@iftex +@ifnotinfo @vindex ::@r{, in Modula-2} -@end iftex +@end ifnotinfo There are a few subtle differences between the Modula-2 scope operator (@code{.}) and the @value{GDBN} scope operator (@code{::}). The two have diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 6a9ea6c..849b116 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -6,11 +6,10 @@ * Gdb-Internals: (gdbint). The GNU debugger's internals. @end direntry -@ifinfo -This file documents the internals of the GNU debugger @value{GDBN}. -Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2008 - Free Software Foundation, Inc. +@copying +Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999, +2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 +Free Software Foundation, Inc. Contributed by Cygnus Solutions. Written by John Gilmore. Second Edition by Stan Shebs. @@ -20,7 +19,13 @@ any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. -@end ifinfo +@end copying + +@ifnottex +This file documents the internals of the GNU debugger @value{GDBN}. + +@insertcopying +@end ifnottex @setchapternewpage off @settitle @value{GDBN} Internals @@ -48,15 +53,7 @@ Free Documentation License''. @end tex @vskip 0pt plus 1filll -Copyright @copyright{} 1990,1991,1992,1993,1994,1996,1998,1999,2000,2001, - 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage @contents diff --git a/gdb/doc/stabs.texinfo b/gdb/doc/stabs.texinfo index 0bc0219..fcd30ce 100644 --- a/gdb/doc/stabs.texinfo +++ b/gdb/doc/stabs.texinfo @@ -10,11 +10,9 @@ * Stabs: (stabs). The "stabs" debugging information format. @end direntry -@ifinfo -This document describes the stabs debugging symbol tables. - -Copyright (C) 1992,1993,1994,1995,1997,1998,2000,2001 - Free Software Foundation, Inc. +@copying +Copyright @copyright{} 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. Contributed by Cygnus Support. Written by Julia Menapace, Jim Kingdon, and David MacKenzie. @@ -24,7 +22,13 @@ any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. -@end ifinfo +@end copying + +@ifnottex +This document describes the stabs debugging symbol tables. + +@insertcopying +@end ifnottex @setchapternewpage odd @settitle STABS @@ -44,18 +48,10 @@ Free Documentation License''. @end tex @vskip 0pt plus 1filll -Copyright @copyright{} 1992,1993,1994,1995,1997,1998,2000,2001 Free Software Foundation, Inc. -Contributed by Cygnus Support. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage -@ifinfo +@ifnottex @node Top @top The "stabs" representation of debugging information @@ -80,12 +76,9 @@ This document describes the stabs debugging format. * Symbol Types Index:: Index of symbolic stab symbol type names. * GNU Free Documentation License:: The license for this documentation @end menu -@end ifinfo +@end ifnottex -@c TeX can handle the contents at the start but makeinfo 3.12 can not -@iftex @contents -@end iftex @node Overview @chapter Overview of Stabs @@ -4130,12 +4123,4 @@ However, no one has yet designed or implemented such a scheme. @printindex fn -@c TeX can handle the contents at the start but makeinfo 3.12 can not -@ifinfo -@contents -@end ifinfo -@ifhtml -@contents -@end ifhtml - @bye -- 2.7.4