diff -upk.orig binutils-2.16.91.0.3.orig/bfd/doc/bfd.texinfo binutils-2.16.91.0.3/bfd/doc/bfd.texinfo

--- binutils-2.16.91.0.3.orig/bfd/doc/bfd.texinfo	2005-04-09 19:03:01 +0000

+++ binutils-2.16.91.0.3/bfd/doc/bfd.texinfo	2005-12-04 00:15:57 +0000

@@ -21,11 +21,10 @@

 @synindex fn cp

 @ifinfo

-@format

-START-INFO-DIR-ENTRY

-* Bfd: (bfd).                   The Binary File Descriptor library.

-END-INFO-DIR-ENTRY

-@end format

+@dircategory System/Libraries

+@direntry

+* Bfd: (bfd).                                   The Binary File Descriptor library.

+@end direntry

 @end ifinfo

 @ifinfo

diff -upk.orig binutils-2.16.91.0.3.orig/binutils/doc/binutils.texi binutils-2.16.91.0.3/binutils/doc/binutils.texi

--- binutils-2.16.91.0.3.orig/binutils/doc/binutils.texi	2005-08-22 19:27:41 +0000

+++ binutils-2.16.91.0.3/binutils/doc/binutils.texi	2005-12-04 00:15:57 +0000

@@ -5,26 +5,22 @@

 @include config.texi

 @ifinfo

-@format

-START-INFO-DIR-ENTRY

-* Binutils: (binutils).         The GNU binary utilities.

-* ar: (binutils)ar.               Create, modify, and extract from archives

-* nm: (binutils)nm.               List symbols from object files

-* objcopy: (binutils)objcopy.	  Copy and translate object files

-* objdump: (binutils)objdump.     Display information from object files

-* ranlib: (binutils)ranlib.       Generate index to archive contents

-* readelf: (binutils)readelf.	  Display the contents of ELF format files.

-* size: (binutils)size.           List section sizes and total size

-* strings: (binutils)strings.     List printable strings from files

-* strip: (binutils)strip.         Discard symbols

-* c++filt: (binutils)c++filt.	  Filter to demangle encoded C++ symbols

-* cxxfilt: (binutils)c++filt.     MS-DOS name for c++filt

-* addr2line: (binutils)addr2line. Convert addresses to file and line

-* nlmconv: (binutils)nlmconv.     Converts object code into an NLM

-* windres: (binutils)windres.	  Manipulate Windows resources

-* dlltool: (binutils)dlltool.	  Create files needed to build and use DLLs

-END-INFO-DIR-ENTRY

-@end format

+@dircategory Development/Other

+@direntry

+* Binutils: (binutils).                         The GNU binary utilities.

+* ar: (binutils)ar.                             Create, modify, and extract from archives

+* nm: (binutils)nm.                             List symbols from object files

+* objcopy: (binutils)objcopy.                   Copy and translate object files

+* objdump: (binutils)objdump.                   Display information from object files

+* ranlib: (binutils)ranlib.                     Generate index to archive contents

+* readelf: (binutils)readelf.                   Display the contents of ELF format files.

+* size: (binutils)size.                         List section sizes and total size

+* strings: (binutils)strings.                   List printable strings from files

+* strip: (binutils)strip.                       Discard symbols

+* c++filt: (binutils)c++filt.                   Filter to demangle encoded C++ symbols

+* cxxfilt: (binutils)c++filt.                   MS-DOS name for c++filt

+* addr2line: (binutils)addr2line.               Convert addresses to file and line

+@end direntry

 @end ifinfo

 @ifinfo

diff -upk.orig binutils-2.16.91.0.3.orig/etc/configure.texi binutils-2.16.91.0.3/etc/configure.texi

--- binutils-2.16.91.0.3.orig/etc/configure.texi	2003-05-23 14:18:53 +0000

+++ binutils-2.16.91.0.3/etc/configure.texi	2003-06-02 17:49:09 +0000

@@ -5,9 +5,9 @@

 @setchapternewpage off

 @c %**end of header

-@dircategory GNU admin

+@dircategory Development/Other

 @direntry

-* configure: (configure).	The GNU configure and build system

+* configure: (configure).                       The GNU configure and build system

 @end direntry

 @ifinfo

diff -upk.orig binutils-2.16.91.0.3.orig/etc/standards.texi binutils-2.16.91.0.3/etc/standards.texi

--- binutils-2.16.91.0.3.orig/etc/standards.texi	2005-12-04 00:15:32 +0000

+++ binutils-2.16.91.0.3/etc/standards.texi	2005-12-04 00:16:58 +0000

@@ -6,9 +6,9 @@

 @set lastupdate June 8, 2005

 @c %**end of header

-@dircategory GNU organization

+@dircategory Development/Other

 @direntry

-* Standards: (standards).        GNU coding standards.

+* Standards: (standards).                      GNU coding standards.

 @end direntry

 @c @setchapternewpage odd

diff -upk.orig binutils-2.16.91.0.3.orig/gas/doc/as.texinfo binutils-2.16.91.0.3/gas/doc/as.texinfo

--- binutils-2.16.91.0.3.orig/gas/doc/as.texinfo	2005-12-04 00:15:33 +0000

+++ binutils-2.16.91.0.3/gas/doc/as.texinfo	2005-12-04 00:15:57 +0000

@@ -85,12 +85,11 @@

 @end ifinfo

 @ifinfo

-@format

-START-INFO-DIR-ENTRY

-* As: (as).                     The GNU assembler.

-* Gas: (as).                    The GNU assembler.

-END-INFO-DIR-ENTRY

-@end format

+@dircategory Development/Other

+@direntry

+* As: (as).                                     The GNU assembler.

+* Gas: (as).                                    The GNU assembler.

+@end direntry

 @end ifinfo

 @finalout

diff -upk.orig binutils-2.16.91.0.3.orig/gprof/gprof.texi binutils-2.16.91.0.3/gprof/gprof.texi

--- binutils-2.16.91.0.3.orig/gprof/gprof.texi	2005-05-10 22:46:47 +0000

+++ binutils-2.16.91.0.3/gprof/gprof.texi	2005-12-04 00:15:57 +0000

@@ -6,13 +6,10 @@

 @setchapternewpage odd

 @ifinfo

-@c This is a dir.info fragment to support semi-automated addition of

-@c manuals to an info tree.  zoo@cygnus.com is developing this facility.

-@format

-START-INFO-DIR-ENTRY

-* gprof: (gprof).                Profiling your program's execution

-END-INFO-DIR-ENTRY

-@end format

+@dircategory Development/Other

+@direntry

+* gprof: (gprof).                               Profiling your program's execution

+@end direntry

 @end ifinfo

 @ifinfo

diff -upk.orig binutils-2.16.91.0.3.orig/ld/Makefile.am binutils-2.16.91.0.3/ld/Makefile.am

--- binutils-2.16.91.0.3.orig/ld/Makefile.am	2005-08-22 19:27:45 +0000

+++ binutils-2.16.91.0.3/ld/Makefile.am	2005-12-04 00:15:57 +0000

@@ -93,8 +93,8 @@ CXX_FOR_TARGET = ` \

   fi`

 noinst_PROGRAMS = ld-new

-info_TEXINFOS = ld.texinfo

-noinst_TEXINFOS = ldint.texinfo

+info_TEXINFOS = ld.texinfo ldint.texinfo

+noinst_TEXINFOS =

 man_MANS = ld.1

 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc

diff -upk.orig binutils-2.16.91.0.3.orig/ld/ld.texinfo binutils-2.16.91.0.3/ld/ld.texinfo

--- binutils-2.16.91.0.3.orig/ld/ld.texinfo	2005-08-22 19:27:45 +0000

+++ binutils-2.16.91.0.3/ld/ld.texinfo	2005-12-04 00:15:57 +0000

@@ -49,11 +49,10 @@

 @c man end

 @ifinfo

-@format

-START-INFO-DIR-ENTRY

-* Ld: (ld).                       The GNU linker.

-END-INFO-DIR-ENTRY

-@end format

+@dircategory Development/Other

+@direntry

+* Ld: (ld).                                     The GNU linker.

+@end direntry

 @end ifinfo

 @ifinfo

diff -upk.orig binutils-2.16.91.0.3.orig/ld/ldint.texinfo binutils-2.16.91.0.3/ld/ldint.texinfo

--- binutils-2.16.91.0.3.orig/ld/ldint.texinfo	2005-06-22 20:53:35 +0000

+++ binutils-2.16.91.0.3/ld/ldint.texinfo	2005-12-04 00:15:57 +0000

@@ -4,11 +4,10 @@

 @c Free Software Foundation, Inc.

 @ifinfo

-@format

-START-INFO-DIR-ENTRY

-* Ld-Internals: (ldint).	The GNU linker internals.

-END-INFO-DIR-ENTRY

-@end format

+@dircategory Development/Other

+@direntry

+* Ld-Internals: (ldint).                        The GNU linker internals.

+@end direntry

 @end ifinfo

 @ifinfo

diff -upk.orig binutils-2.16.91.0.3.orig/libiberty/libiberty.texi binutils-2.16.91.0.3/libiberty/libiberty.texi

--- binutils-2.16.91.0.3.orig/libiberty/libiberty.texi	2004-11-22 20:33:33 +0000

+++ binutils-2.16.91.0.3/libiberty/libiberty.texi	2005-12-04 00:15:57 +0000

@@ -11,10 +11,10 @@

 @finalout

 @c %**end of header

-@dircategory GNU libraries

+@dircategory Development/C

 @direntry

-* Libiberty: (libiberty).          Library of utility functions which

-                                   are missing or broken on some systems.

+* Libiberty: (libiberty).                       Library of utility functions which

+                                                are missing or broken on some systems.

 @end direntry

 @macro libib