Merge branch 'master' of git.mcs.anl.gov:bcfg2

2 files changed, 72 insertions, 32 deletions

diff --git a/AUTHORS b/AUTHORS
index d90874ad4..dea48089c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,44 +1,61 @@
 In chronological order:
 
-- Narayan Desai <desai@mcs.anl.gov> has written most of bcfg2,
-  including all parts not explicitly mentioned in this file
+- Narayan Desai <desai@mcs.anl.gov> has written most of Bcfg2,
+  including all parts not explicitly mentioned in this file.
 
 - Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the
   project roadmap, and implements various interesting features.
 
+- Tim Laszlo <tim.laszlo@gmail.com> worked on the reporting system and
+  made plugins.
+
+- Fabian Affolter <fabian@bernewireless.net> made some patches, added  
+  some new features and plugins, and restructured the manual for Bcfg2.
+
+- Andrew Brestick <brestick@mcs.anl.gov> fixed bugs and completed 
+  plugins.
+
+- James Yang <jjyang@mcs.anl.gov> worked on bcfg2-admin and 
+  bcfg2-reports.
+
+- Robert Gogolok <gogo@cs.uni-sb.de> fixed bugs and made the code more
+  robust.
+
+- Jack Neely <jjneely@ncsu.edu> worked on YUMng.
+
 - Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting
   subsystem, including StatReports, GenerateHostinfo, and the xslt,
   css and javascript associated with it.
 
 - Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of
-  the bcfg client and server and implemented a common logging
+  the Bcfg2 client and server and implemented a common logging
   infrastructure.
 
 - Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the
-  tools included in the tools/ subdirectory
+  tools included in the tools/ subdirectory.
 
 - Ken Raffenetti <raffenet@mcs.anl.gov> and Rick Bradshaw have written
-  the Hostbase plugin
+  the Hostbase plugin.
 
 - Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written
-  the VHost plugin
+  the VHost plugin.
 
 - Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function
-  in bcfg2-info
+  in bcfg2-info.
 
 - Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the
-  verification debugging code
+  verification debugging code.
 
-- Daniel Clark <dclark@pobox.com> created encap packages for bcfg2 and
+- Daniel Clark <dclark@pobox.com> created encap packages for Bcfg2 and
   deps, wrote fossil-scm dvcs support, and helps with debian packaging
 
 - Jason Pepas <cell@ices.utexas.edu> has written a rpm package list
-  creator has contributed patches to the redhat toolset
+  creator has contributed patches to the Red Hat toolset.
 
 - Sami Haahtinen <ressu@ressukka.net> has writen debian packaging
   logic.
 
 - Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of
-  which was used in the bcfg2 client.
+  which was used in the Bcfg2 client.
 
 - Michael Jinks <mjinks@uchicago.edu> wrote the gentoo tool drivers.
diff --git a/doc/appendix/contributors.txt b/doc/appendix/contributors.txt
index eaf4aa29a..ebc49d364 100644
--- a/doc/appendix/contributors.txt
+++ b/doc/appendix/contributors.txt
@@ -16,31 +16,54 @@ Contributors
 
 In alphabetical order of the given name:
 
-- Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of which was used in the bcfg2 client.
-- Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the verification debugging code
-- Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function in ``bcfg2-info``
-- Daniel Clark <dclark@pobox.com> created encap packages for bcfg2 and deps, wrote fossil-scm dvcs support, and helps with Debian packaging
-- Danny Clark enabled the Encap packaging
-- David Dahl worked on Hostbase
-- David Strauss worked on CentOS, RHEL, Yum, and Bazaar VCS support
-- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of the bcfg client and server and implemented a common logging infrastructure.
-- Fabian Affolter <fabian@bernewireless.net> made some patches and worked on the manual
-- Jason Pepas <cell@ices.utexas.edu> has written a RPM package list creator has contributed patches to the Red Hat toolset
-- Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting subsystem, including StatReports, GenerateHostinfo, and the xslt, css and javascript associated with it.
-- Jos Catnook fixed bugs
-- Ken Raffenetti <raffenet@mcs.anl.gov> and Rick Bradshaw have written the Hostbase plugin
-- Michael Jinks <mjinks@uchicago.edu> wrote the Gentoo tool drivers
-- Narayan Desai <desai@mcs.anl.gov> has written most of bcfg2, including all parts not explicitly mentioned in this file
-- Patrick Ruckstuhl fixed bugs in the templating
-- Pedro Flores made the Reporting system design help
-- Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the tools included in the ``tools/`` subdirectory
+- Andrew Brestick <brestick@mcs.anl.gov> fixed bugs and completed 
+  plugins.
+- Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of 
+  which was used in the Bcfg2 client.
+- Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the
+  verification debugging code.
+- Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function
+  in ``bcfg2-info``.
+- Daniel Clark <dclark@pobox.com> created encap packages for bcfg2 and 
+  deps, wrote fossil-scm dvcs support, and helps with Debian packaging.
+- Danny Clark enabled the Encap packaging.
+- David Dahl worked on Hostbase.
+- David Strauss worked on CentOS, RHEL, Yum, and Bazaar VCS support.
+- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of the
+  Bcfg client and server and implemented a common logging infrastructure.
+- Fabian Affolter <fabian@bernewireless.net> made some patches, added  
+  some new features and plugins, and restructured the manual for Bcfg2.
+- Jack Neely <jjneely@ncsu.edu> worked on YUMng.
+- James Yang <jjyang@mcs.anl.gov> worked on ``bcfg2-admin`` and 
+  ``bcfg2-reports``.
+- Jason Pepas <cell@ices.utexas.edu> has written a RPM package list creator
+  has contributed patches to the Red Hat toolset.
+- Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting subsystem,
+  including StatReports, GenerateHostinfo, and the xslt, css and javascript
+  associated with it.
+- Jos Catnook fixed bugs.
+- Ken Raffenetti <raffenet@mcs.anl.gov> and Rick Bradshaw have written the
+  Hostbase plugin.
+- Michael Jinks <mjinks@uchicago.edu> wrote the Gentoo tool drivers.
+- Narayan Desai <desai@mcs.anl.gov> has written most of bcfg2, including all
+  parts not explicitly mentioned in this file.
+- Patrick Ruckstuhl fixed bugs in the templating.
+- Pedro Flores made the Reporting system design help.
+- Raul Cuza <raulcuza@gmail.com> updated the documentation.
+- Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the tools
+  included in the ``tools/`` subdirectory.
+- Robert Gogolok <gogo@cs.uni-sb.de> fixed bugs and made the code more
+  robust.
 - Sami Haahtinen <ressu@ressukka.net> has written Debian packaging logic.
-- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written the VHost plugin
+- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written the
+  VHost plugin.
 - Scott Matott
 - Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the
   project roadmap, and implements various interesting features.
-- Ti Leggett worked on ebuild packaging and bugfixes, RPM packaging
-- Zach Lowry Solaris support and general hardening
+- Ti Leggett worked on ebuild packaging and bugfixes, RPM packaging.
+- Tim Laszlo <tim.laszlo@gmail.com> worked on the reporting system and made
+  plugins.
+- Zach Lowry Solaris support and general hardening.
 
 
 The entire MCS_ systems team has provided invaluable help in the