1 From 935f85422863b42b6fbca30885885e3fa28eea36 Mon Sep 17 00:00:00 2001
2 From: Nick Clifton <nickc@redhat.com>
3 Date: Mon, 7 Jan 2013 12:11:11 +0000
4 Subject: [PATCH] * ld.texinfo: Replace @ with @@ when it is part of
5 the text. Correct ordering of M68HC11 entry.
7 * doc/binutils.texi: Fix ordering of top level nodes.
8 Replace erroneous uses of @itemx with @item.
10 * bfd.texinfo: Replace @ with @@ when it is part of the text.
12 bfd/doc/ChangeLog | 4 ++++
13 bfd/doc/bfd.texinfo | 12 +++++++-----
14 binutils/ChangeLog | 5 +++++
15 binutils/doc/binutils.texi | 8 ++++----
16 ld/ChangeLog | 5 +++++
17 ld/ld.texinfo | 26 ++++++++++++++------------
18 6 files changed, 39 insertions(+), 21 deletions(-)
21 Upstream-Status: Backport
22 Index: binutils-2.23.1/bfd/doc/bfd.texinfo
23 ===================================================================
24 --- binutils-2.23.1.orig/bfd/doc/bfd.texinfo 2010-10-28 04:40:25.000000000 -0700
25 +++ binutils-2.23.1/bfd/doc/bfd.texinfo 2013-02-26 12:42:26.909115020 -0800
29 @c Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1997, 2000,
30 -@c 2001, 2002, 2003, 2006, 2007, 2008, 2009
31 +@c 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2013
32 @c Free Software Foundation, Inc.
37 This file documents the BFD library.
39 -Copyright @copyright{} 1991, 2000, 2001, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
40 +Copyright @copyright{} 1991, 2000, 2001, 2003, 2006, 2007, 2008, 2013
41 +Free Software Foundation, Inc.
43 Permission is granted to copy, distribute and/or modify this document
44 under the terms of the GNU Free Documentation License, Version 1.3 or
48 @vskip 0pt plus 1filll
49 -Copyright @copyright{} 1991, 2001, 2003, 2006, 2008 Free Software Foundation, Inc.
50 +Copyright @copyright{} 1991, 2001, 2003, 2006, 2008, 2013
51 +Free Software Foundation, Inc.
53 Permission is granted to copy, distribute and/or modify this document
54 under the terms of the GNU Free Documentation License, Version 1.3
59 -% I think something like @colophon should be in texinfo. In the
60 +% I think something like @@colophon should be in texinfo. In the
62 \long\def\colophon{\hbox to0pt{}\vfill
63 \centerline{The body of this manual is set in}
65 \centerline{{\sl\fontname\tensl\/}}
66 \centerline{are used for emphasis.}\vfill}
68 -% Blame: doc@cygnus.com, 28mar91.
69 +% Blame: doc@@cygnus.com, 28mar91.
73 Index: binutils-2.23.1/binutils/doc/binutils.texi
74 ===================================================================
75 --- binutils-2.23.1.orig/binutils/doc/binutils.texi 2013-02-26 12:41:51.000000000 -0800
76 +++ binutils-2.23.1/binutils/doc/binutils.texi 2013-02-26 12:42:26.913115010 -0800
78 * objcopy:: Copy and translate object files
79 * objdump:: Display information from object files
80 * ranlib:: Generate index to archive contents
81 -* readelf:: Display the contents of ELF format files
82 * size:: List section sizes and total size
83 * strings:: List printable strings from files
84 * strip:: Discard symbols
85 -* elfedit:: Update the ELF header of ELF files
86 * c++filt:: Filter to demangle encoded C++ symbols
87 * cxxfilt: c++filt. MS-DOS name for c++filt
88 * addr2line:: Convert addresses to file and line
89 * nlmconv:: Converts object code into an NLM
90 -* windres:: Manipulate Windows resources
91 * windmc:: Generator for Windows message resources
92 +* windres:: Manipulate Windows resources
93 * dlltool:: Create files needed to build and use DLLs
94 +* readelf:: Display the contents of ELF format files
95 +* elfedit:: Update the ELF header of ELF files
96 * Common Options:: Command-line options for all utilities
97 * Selecting the Target System:: How these utilities determine the target
98 * Reporting Bugs:: Reporting Bugs
103 -@node c++filt, addr2line, elfedit, Top
104 +@node c++filt, addr2line, strip, Top
108 Index: binutils-2.23.1/ld/ld.texinfo
109 ===================================================================
110 --- binutils-2.23.1.orig/ld/ld.texinfo 2013-02-19 14:26:56.571782665 -0800
111 +++ binutils-2.23.1/ld/ld.texinfo 2013-02-26 12:45:20.677119476 -0800
115 @c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
116 -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
117 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
119 @c Free Software Foundation, Inc.
123 version @value{VERSION}.
125 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
126 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
127 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012, 2013
128 +Free Software Foundation, Inc.
130 Permission is granted to copy, distribute and/or modify this document
131 under the terms of the GNU Free Documentation License, Version 1.3
133 @vskip 0pt plus 1filll
134 @c man begin COPYRIGHT
135 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
136 -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
137 -Software Foundation, Inc.
138 +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
139 +2012, 2013 Free Software Foundation, Inc.
141 Permission is granted to copy, distribute and/or modify this document
142 under the terms of the GNU Free Documentation License, Version 1.3
143 @@ -142,12 +144,12 @@
145 * ARM:: ld and the ARM family
148 -* HPPA ELF32:: ld and HPPA 32-bit ELF
151 * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families
154 +* HPPA ELF32:: ld and HPPA 32-bit ELF
157 * M68K:: ld and Motorola 68K family
159 @@ -6003,6 +6005,9 @@
161 * i960:: @command{ld} and the Intel 960 family
164 +* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
167 * ARM:: @command{ld} and the ARM family
169 @@ -6018,9 +6023,6 @@
171 * MSP430:: @command{ld} and MSP430
174 -* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
177 * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support
179 @@ -7868,7 +7870,7 @@
183 -% I think something like @colophon should be in texinfo. In the
184 +% I think something like @@colophon should be in texinfo. In the
186 \long\def\colophon{\hbox to0pt{}\vfill
187 \centerline{The body of this manual is set in}
188 @@ -7879,7 +7881,7 @@
189 \centerline{{\sl\fontname\tensl\/}}
190 \centerline{are used for emphasis.}\vfill}
192 -% Blame: doc@cygnus.com, 28mar91.
193 +% Blame: doc@@cygnus.com, 28mar91.