Get rid of ACKNOWLEDGEMENTS, because it overlaps hugely with AUTHORS.

Improve AUTHORS a bit at the same time.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10309 a5019735-40e9-0310-863c-91ae7b9d1cf9

5 files changed, 32 insertions, 98 deletions

diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
deleted file mode 100644
index 4a306033..00000000
--- a/ACKNOWLEDGEMENTS
+++ /dev/null
@@ -1,70 +0,0 @@
-
-Cerion Armour-Brown, cerion@open-works.co.uk
-
-Cerion worked on PowerPC instruction set support using the Vex
-dynamic-translation framework.
-
-Jeremy Fitzhardinge, jeremy@valgrind.org
-
-Jeremy wrote Helgrind (in the 2.X line) and totally overhauled
-low-level syscall/signal and address space layout stuff, among many
-other improvements.
-
-Tom Hughes, tom@valgrind.org
-
-Tom did a vast number of bug fixes, and helped out with support for
-more recent Linux/glibc versions, and set up the present build system.
-
-Nicholas Nethercote, njn@valgrind.org
-
-Nick did the core/tool generalisation, wrote Cachegrind and Massif,
-and tons of other stuff.
-
-Paul Mackerras
-
-Paul did a lot of the initial per-architecture factoring that forms
-the basis of the 3.0 line and is also to be seen in 2.4.0. He also did
-UCode-based dynamic translation support for PowerPC, and created a set
-of ppc-linux derivatives of the 2.X release line.
-
-Dirk Mueller, dmuell@gmx.net
-
-Dirk contributed the malloc-free mismatch checking stuff and various
-other bits and pieces, and acted as our KDE liaison.
-
-Donna Robinson, donna@terpsichore.ws
-
-Keeper of the very excellent http://www.valgrind.org.
-
-Julian Seward, julian@valgrind.org
-
-Julian was the original designer and author of Valgrind, created the
-dynamic translation framework, wrote Memcheck and 3.3.X Helgrind, and
-did lots of other things.
-
-Robert Walsh, rjwalsh@valgrind.org
-
-Robert added file descriptor leakage checking, new library
-interception machinery, support for client allocation pools, and minor
-other tweakage.
-
-Josef Weidendorfer, Josef.Weidendorfer@gmx.de.
-
-Josef wrote Callgrind and the associated KCachegrind GUI.
-
-DRD was written by and is maintained by Bart Van Assche.
-
-Frederic Gobry helped with autoconf and automake.  Daniel Berlin
-modified readelf's dwarf2 source line reader, written by Nick Clifton,
-for use in Valgrind.  Michael Matz and Simon Hausmann modified the GNU
-binutils demangler(s) for use in Valgrind.
-
-David Woodhouse and Tom Hughes have helped out with test and build
-machines over the course of many releases.
-
-Many, many people sent bug reports, patches, and helpful feedback.
-
-Development of Valgrind was supported in part by the Tri-Lab Partners
-(Lawrence Livermore National Laboratory, Los Alamos National
-Laboratory, and Sandia National Laboratories) of the U.S. Department
-of Energy's Advanced Simulation & Computing (ASC) Program.
diff --git a/AUTHORS b/AUTHORS
index ebfe15f2..5c7dc991 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,44 +1,57 @@
 
-Cerion Armour-Brown worked on PowerPC instruction set support using
-the Vex dynamic-translation framework.
+Julian Seward was the original founder, designer and author of Valgrind,
+created the dynamic translation frameworks, wrote Memcheck and 3.3.X
+Helgrind, and did lots of other things.
+
+Nicholas Nethercote did the core/tool generalisation, wrote
+Cachegrind and Massif, and tons of other stuff.
+
+Tom Hughes did a vast number of bug fixes, helped out with support for
+more recent Linux/glibc versions, set up the present build system, and has
+helped out with test and build machines.
 
 Jeremy Fitzhardinge wrote Helgrind (in the 2.X line) and totally
 overhauled low-level syscall/signal and address space layout stuff,
 among many other things.
 
-Tom Hughes did a vast number of bug fixes, and helped out with support
-for more recent Linux/glibc versions.
-
-Nicholas Nethercote did the core/tool generalisation, wrote
-Cachegrind and Massif, and tons of other stuff.
+Josef Weidendorfer wrote Callgrind and the associated KCachegrind GUI.
 
 Paul Mackerras did a lot of the initial per-architecture factoring
 that forms the basis of the 3.0 line and is also to be seen in 2.4.0.
 He also did UCode-based dynamic translation support for PowerPC, and
 created a set of ppc-linux derivatives of the 2.X release line.
 
+Greg Parker wrote the Mac OS X port.
+
 Dirk Mueller contributed the malloc-free mismatch checking stuff
 and other bits and pieces, and acted as our KDE liaison.
 
-Julian Seward was the original founder, designer and author, created
-the dynamic translation frameworks, wrote Memcheck and 3.3.X Helgrind,
-and did lots of other things.
-
 Robert Walsh added file descriptor leakage checking, new library
 interception machinery, support for client allocation pools, and minor
 other tweakage.
 
-Josef Weidendorfer wrote Callgrind and the associated KCachegrind GUI.
+Bart Van Assche wrote and maintains DRD.
+
+Cerion Armour-Brown worked on PowerPC instruction set support in
+the Vex dynamic-translation framework.
+
+Donna Robinson created and maintains the very excellent
+http://www.valgrind.org.
 
 Frederic Gobry helped with autoconf and automake.
 
 Daniel Berlin modified readelf's dwarf2 source line reader, written by Nick
-Clifton, for use in Valgrind.
+Clifton, for use in Valgrind.o
+
+Michael Matz and Simon Hausmann modified the GNU binutils demangler(s) for
+use in Valgrind.
 
-Michael Matz and Simon Hausmann modified the GNU binutils
-demangler(s) for use in Valgrind.
+David Woodhouse has helped out with test and build machines over the course
+of many releases.
 
-DRD was written by and is maintained by Bart Van Assche.
+Many, many people sent bug reports, patches, and helpful feedback.
 
-And lots and lots of other people sent bug reports, patches, and very 
-helpful feedback.  Thank you all.
+Development of Valgrind was supported in part by the Tri-Lab Partners
+(Lawrence Livermore National Laboratory, Los Alamos National
+Laboratory, and Sandia National Laboratories) of the U.S. Department
+of Energy's Advanced Simulation & Computing (ASC) Program.
diff --git a/Makefile.am b/Makefile.am
index 9ce68b69..8478d246 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,7 +118,6 @@ perf: check
 # Nb: no need to include any Makefile.am files here, or files included from
 # them, as automake includes them automatically.
 EXTRA_DIST = \
-	ACKNOWLEDGEMENTS \
 	README_DEVELOPERS \
 	README_PACKAGERS \
 	README_MISSING_SYSCALL_OR_IOCTL \
diff --git a/docs/xml/dist-docs.xml b/docs/xml/dist-docs.xml
index db3f4e18..599ffb08 100644
--- a/docs/xml/dist-docs.xml
+++ b/docs/xml/dist-docs.xml
@@ -21,14 +21,6 @@
   <!-- Nb: because these are all text files, we have to wrap -->
   <!-- them in suitable XML.  Hence the chapter/title stuff  -->
 
-  <chapter id="dist.acknowledge" xreflabel="Acknowledgements">
-    <title>ACKNOWLEDGEMENTS</title>
-    <literallayout>
-      <xi:include href="../../ACKNOWLEDGEMENTS" parse="text"  
-          xmlns:xi="http://www.w3.org/2001/XInclude" />
-    </literallayout>
-    </chapter>
-
   <chapter id="dist.authors" xreflabel="Valgrind Developers">
     <title id="dist.authors.title">AUTHORS</title>
     <literallayout>
diff --git a/valgrind.spec.in b/valgrind.spec.in
index 1a2ca9cb..54d3f4c3 100644
--- a/valgrind.spec.in
+++ b/valgrind.spec.in
@@ -39,7 +39,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs.installed/
 
 %files
 %defattr(-,root,root)
-%doc ACKNOWLEDGEMENTS AUTHORS COPYING FAQ.txt INSTALL NEWS README*
+%doc AUTHORS COPYING FAQ.txt INSTALL NEWS README*
 %doc docs.installed/html/*.html docs.installed/html/images/*.png
 %{_bindir}/*
 %{_includedir}/valgrind