Reviszed AUTHORS list for 3.0.4. Comments welcomed.

diff --git a/AUTHORS b/AUTHORS
index b25dc58..58bf1f4 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,24 +1,22 @@
               Authors of Privoxy v2.9.x and 3.x
 ===========================================================================
 
-Current Development Team:
+Current Privoxy Team:
 
- David Schmidt
- Fabian Keil
-
-Current Contributors:
-
- Hal Burgiss
- Johny Agotnes 
+ Fabian Keil, developer
+ David Schmidt, developer
+ 
  Moritz Barsnick
+ Hal Burgiss
  Mattes Dolak 
+ Ulrich Drepper
+ Félix Rauch
  Roland Rosenfeld
- 
+ Oliver Yeoh
 
-Former Project Developers and Contributors:
+Former Privoxy Team Members:
 
- 
- Andreas Oesterhelt
+ Johny Agotnes 
  Rodrigo Barbosa
  Brian Dessent
  Jon Foster
@@ -28,6 +26,8 @@ Former Project Developers and Contributors:
  Gábor Lipták
  Adam Lock
  Guy Laroche
+ Mark Martinec 
+ Andreas Oesterhelt
  Haroon Rafique
  Georg Sauthoff
  Thomas Steudten
@@ -37,13 +37,8 @@ Former Project Developers and Contributors:
  Sarantis Paskalis
  Stefan Waldherr
 
-Based in part on code originally developed by:
-
- Junkbusters Corp.
- Anonymous Coders
-
-Thanks to the many people who have tested Privoxy, reported bugs, or made
-suggestions. These include (in alphabetical order):
+Thanks to the many people who have tested Privoxy, reported bugs, made
+suggestions or contributed in some way. These include (in alphabetical order):
 
  Ken Arromdee
  Devin Bayer
@@ -62,9 +57,16 @@ suggestions. These include (in alphabetical order):
  Roberto Ragusa
  Maynard Riley
  Bart Schelstraete
+ Bobby G. Vinyard
  Darren Wiebe
+ Jörg Weinmann 
  Jamie Zawinski
 
+Privoxy is based in part on code originally developed by:
+
+ Junkbusters Corp.
+ Anonymous Coders
+
 If we've missed you off this list, please let us know!
 
  Privoxy team. http://www.privoxy.org/

diff --git a/doc/source/p-authors.sgml b/doc/source/p-authors.sgml
index 19ac320..ba847ec 100644 (file)
--- a/doc/source/p-authors.sgml
+++ b/doc/source/p-authors.sgml
@@ -3,9 +3,9 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: p-authors.sgml,v 2.11 2006/08/30 00:31:50 hal9 Exp $
+ $Id: p-authors.sgml,v 2.12 2006/09/10 14:53:54 hal9 Exp $
 
- Copyright (C) 2001-2006 Privoxy Developers <developers@privoxy.org>
+ Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  ======================================================================
@@ -24,33 +24,32 @@
 -->
 <![%p-authors-formal;[
 <para>
-Current Development Team:
+Current Privoxy Team:
 </para>
 ]]>
 
 <literallayout>
- Fabian Keil
- David Schmidt
-
+ Fabian Keil, developer
+ David Schmidt, developer
 <![%p-authors-formal;[
-Current Contributors:
 ]]>
-
- Johny Agotnes 
+ 
  Moritz Barsnick
  Hal Burgiss
  Mattes Dolak 
+ Ulrich Drepper
+ Félix Rauch
  Roland Rosenfeld
+ Oliver Yeoh
 <![%p-authors-formal;[
-
 </literallayout>
 
 <para>
- Former Project Developers and Contributors:
+ Former Privoxy Team Members:
 </para>
 
 <literallayout>
- 
+ Johny Agotnes 
  Rodrigo Barbosa
  Brian Dessent
  Jon Foster
@@ -60,6 +59,7 @@ Current Contributors:
  Gábor Lipták
  Adam Lock
  Guy Laroche
+ Mark Martinec 
  Andreas Oesterhelt
  Haroon Rafique
  Georg Sauthoff
@@ -71,22 +71,11 @@ Current Contributors:
  Stefan Waldherr
 ]]>
 </literallayout>
-
 <![%p-authors-formal;[
 <para>
- Based in part on code originally developed by:
+ Thanks to the many people who have tested Privoxy, reported bugs, made
+ suggestions or contributed in some way. These include (in alphabetical order):
 </para>
-
-<literallayout>
- Junkbusters Corp.
- Anonymous Coders
-</literallayout>
-
-<para>
- Thanks to the many people who have tested Privoxy, reported bugs, or made
- suggestions. These include (in alphabetical order):
-</para>
-
 <literallayout>
  Ken Arromdee
  Devin Bayer
@@ -105,7 +94,18 @@ Current Contributors:
  Roberto Ragusa
  Maynard Riley
  Bart Schelstraete
+ Bobby G. Vinyard
  Darren Wiebe
+ Jörg Weinmann 
  Jamie Zawinski
 </literallayout>
+
+<para>
+ Privoxy is based in part on code originally developed by:
+</para>
+
+<literallayout>
+ Junkbusters Corp.
+ Anonymous Coders
+</literallayout>
 ]]>