--- a/gcc/doc/cpp.texi	2004-09-17 10:22:36.000000000 +0200
+++ b/gcc/doc/cpp.texi	2004-09-26 10:58:58.166721432 +0200
@@ -50,9 +50,9 @@
 @set cppmanual
 
 @ifinfo
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* Cpp: (cpp).                  The GNU C preprocessor.
+* Cpp: (cpp).				The GNU C preprocessor
 @end direntry
 @end ifinfo
 
--- a/gcc/doc/cppinternals.texi	2004-07-03 01:57:11.000000000 +0200
+++ b/gcc/doc/cppinternals.texi	2004-09-26 10:58:58.208715048 +0200
@@ -3,9 +3,9 @@
 @settitle The GNU C Preprocessor Internals
 
 @ifinfo
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* Cpplib: (cppinternals).      Cpplib internals.
+* Cpplib: (cppinternals).		Cpplib internals
 @end direntry
 @end ifinfo
 
--- a/gcc/doc/gcc.texi	2004-07-22 22:12:20.000000000 +0200
+++ b/gcc/doc/gcc.texi	2004-09-26 10:58:58.218713528 +0200
@@ -61,13 +61,13 @@ Texts being (a) (see below), and with th
      funds for GNU development.
 @end copying
 @ifnottex
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* gcc: (gcc).                  The GNU Compiler Collection.
-* g++: (gcc).                  The GNU C++ compiler.
-* gcov: (gcc) Gcov.            @command{gcov}---a test coverage program.
-* gcov-tool: (gcc) Gcov-tool.  @command{gcov-tool}---an offline gcda profile processing program.
-* gcov-dump: (gcc) Gcov-dump.  @command{gcov-dump}---an offline gcda and gcno profile dump tool.
+* gcc: (gcc).				The GNU Compiler Collection
+* g++: (gcc).				The GNU C++ compiler
+* gcov: (gcc) Gcov.			@command{gcov}---a test coverage program
+* gcov-tool: (gcc) Gcov-tool.		@command{gcov-tool}---an offline gcda profile processing program
+* gcov-dump: (gcc) Gcov-dump.		@command{gcov-dump}---an offline gcda and gcno profile dump tool
 @end direntry
 This file documents the use of the GNU compilers.
 @sp 1
--- a/gcc/doc/gccint.texi	2004-05-24 00:54:29.000000000 +0200
+++ b/gcc/doc/gccint.texi	2004-09-26 10:58:58.222712920 +0200
@@ -46,9 +46,9 @@
      funds for GNU development.
 @end copying
 @ifnottex
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* gccint: (gccint).            Internals of the GNU Compiler Collection.
+* gccint: (gccint).			Internals of the GNU Compiler Collection
 @end direntry
 This file documents the internals of the GNU compilers.
 @sp 1
--- a/gcc/ada/gnat-style.texi	2004-09-01 13:51:52.000000000 +0200
+++ b/gcc/ada/gnat-style.texi	2004-09-26 10:58:58.342694680 +0200
@@ -28,9 +28,9 @@
 @setchapternewpage odd
 
 
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* gnat-style: (gnat-style).      GNAT Coding Style
+* gnat-style: (gnat-style).		GNAT Coding Style
 @end direntry
 
 @macro syntax{element}
--- gcc-6.4.0/gcc/ada/gnat_rm.texi.orig	2016-01-04 14:03:35.362396000 +0100
+++ gcc-6.4.0/gcc/ada/gnat_rm.texi	2018-04-04 20:06:55.773027894 +0200
@@ -10,9 +10,9 @@
 @paragraphindent 0
 @exampleindent 4
 @finalout
-@dircategory GNU Ada Tools 
+@dircategory Programming Languages:
 @direntry
-* gnat_rm: (gnat_rm.info). gnat_rm
+* gnat_rm: (gnat_rm.info).		gnat_rm
 @end direntry
 
 @definfoenclose strong,`,'
--- gcc-6.4.0/gcc/ada/gnat_ugn.texi.orig	2018-04-04 16:44:59.699832904 +0200
+++ gcc-6.4.0/gcc/ada/gnat_ugn.texi	2018-04-04 20:07:10.206361061 +0200
@@ -10,9 +10,9 @@
 @paragraphindent 0
 @exampleindent 4
 @finalout
-@dircategory GNU Ada Tools 
+@dircategory Programming Languages:
 @direntry
-* gnat_ugn: (gnat_ugn.info). gnat_ugn
+* gnat_ugn: (gnat_ugn.info).		gnat_ugn
 @end direntry
 
 @definfoenclose strong,`,'
--- a/gcc/fortran/gfortran.texi	2004-09-16 15:13:39.000000000 +0200
+++ b/gcc/fortran/gfortran.texi	2004-09-26 11:05:50.258074024 +0200
@@ -62,9 +62,9 @@
 @end copying
 
 @ifinfo
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* gfortran: (gfortran).                  The GNU Fortran Compiler.
+* gfortran: (gfortran).			The GNU Fortran Compiler
 @end direntry
 This file documents the use and the internals of
 the GNU Fortran compiler, (@command{gfortran}).
--- a/gcc/doc/install.texi	2005-11-30 12:02:42.000000000 +0100
+++ b/gcc/doc/install.texi	2005-12-11 02:44:22.598279768 +0100
@@ -87,9 +87,9 @@
 @ifinfo
 @insertcopying
 @end ifinfo
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* gccinstall: (gccinstall).    Installing the GNU Compiler Collection.
+* gccinstall: (gccinstall).		Installing the GNU Compiler Collection
 @end direntry
 
 @c Part 3 Titlepage and Copyright
--- gcc-4.6.2/gcc/go/gccgo.texi.orig	2011-02-14 05:42:53.000000000 +0100
+++ gcc-4.6.2/gcc/go/gccgo.texi	2011-10-31 18:27:12.670749858 +0100
@@ -48,9 +48,9 @@
 
 @ifinfo
 @format
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* Gccgo: (gccgo).           A GCC-based compiler for the Go language
+* Gccgo: (gccgo).			A GCC-based compiler for the Go language
 @end direntry
 @end format
 
--- gcc-4.8.2/libgomp/libgomp.texi.orig	2013-01-14 19:18:49.000000000 +0100
+++ gcc-4.8.2/libgomp/libgomp.texi	2014-04-21 08:06:10.259411139 +0200
@@ -29,9 +29,9 @@
 @end copying
 
 @ifinfo
-@dircategory GNU Libraries
+@dircategory Libraries:
 @direntry
-* libgomp: (libgomp).          GNU Offloading and Multi Processing Runtime Library.
+* libgomp: (libgomp).			GNU Offloading and Multi Processing Runtime Library
 @end direntry
 
 This manual documents the GNU implementation of the OpenMP API for 
--- gcc-4.8.2/libitm/libitm.texi.orig	2013-02-03 18:46:11.000000000 +0100
+++ gcc-4.8.2/libitm/libitm.texi	2014-04-21 08:06:38.919410542 +0200
@@ -18,9 +18,9 @@
 @end copying
 
 @ifinfo
-@dircategory GNU Libraries
+@dircategory Libraries:
 @direntry
-* libitm: (libitm).                    GNU Transactional Memory Library
+* libitm: (libitm).			GNU Transactional Memory Library
 @end direntry
 
 This manual documents the GNU Transactional Memory Library.
--- gcc-4.8.2/libquadmath/libquadmath.texi.orig	2013-01-22 09:23:32.000000000 +0100
+++ gcc-4.8.2/libquadmath/libquadmath.texi	2014-04-21 08:07:12.262743180 +0200
@@ -23,9 +23,9 @@
 @end copying
 
 @ifinfo
-@dircategory GNU Libraries
+@dircategory Libraries:
 @direntry
-* libquadmath: (libquadmath).                  GCC Quad-Precision Math Library
+* libquadmath: (libquadmath).		GCC Quad-Precision Math Library
 @end direntry
 
 This manual documents the GCC Quad-Precision Math Library API.
--- gcc-4.9.2/libffi/doc/libffi.texi.orig	2014-02-13 17:18:13.000000000 +0100
+++ gcc-4.9.2/libffi/doc/libffi.texi	2015-01-13 20:19:48.088168568 +0100
@@ -31,9 +31,9 @@
 @end quotation
 @end copying
 
-@dircategory Development
+@dircategory Libraries:
 @direntry
-* libffi: (libffi).             Portable foreign-function interface library.
+* libffi: (libffi).			Portable foreign-function interface library
 @end direntry
 
 @titlepage
--- gcc-4.9.2/libiberty/libiberty.texi.orig	2015-01-13 20:22:23.151495398 +0100
+++ gcc-4.9.2/libiberty/libiberty.texi	2015-01-13 20:22:25.921495282 +0100
@@ -11,10 +11,9 @@
 @finalout
 @c %**end of header
 
-@dircategory GNU libraries
+@dircategory Libraries:
 @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
--- gcc-4.9.2/gcc/fortran/gfc-internals.texi.orig	2014-01-02 22:25:41.000000000 +0100
+++ gcc-4.9.2/gcc/fortran/gfc-internals.texi	2015-01-13 20:23:53.034825013 +0100
@@ -53,9 +53,9 @@
 @end copying
 
 @ifinfo
-@dircategory Software development
+@dircategory Programming Languages:
 @direntry
-* gfortran: (gfortran).                  The GNU Fortran Compiler.
+* gfortran: (gfortran).			The GNU Fortran Compiler
 @end direntry
 This file documents the internals of the GNU Fortran
 compiler, (@command{gfortran}).