diff --git a/Makefile b/Makefile
index 87ace6c61a9a550f9709919a8c88f8b48246ccf6..1251b119ccfbd9fbf8a8984dc5640a8ff2555410 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.293 2003-06-24 23:34:45 geuzaine Exp $
+# $Id: Makefile,v 1.294 2003-07-23 17:55:49 geuzaine Exp $
#
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
#
@@ -86,7 +86,7 @@ converters:
doc:
cd doc/texinfo && ${MAKE} all
cd doc && tar zcvf ../gmsh-${GMSH_RELEASE}-doc.tgz\
- FAQ CONTRIBUTORS VERSIONS README.win32 gmsh.1\
+ FAQ CREDITS VERSIONS README.win32 gmsh.1\
texinfo/gmsh.ps texinfo/gmsh.pdf texinfo/gmsh.txt\
texinfo/*.html texinfo/gmsh-info.tgz
@@ -166,7 +166,7 @@ package-unix:
mkdir gmsh-${GMSH_RELEASE}
strip bin/gmsh
cp bin/gmsh gmsh-${GMSH_RELEASE}
- cp doc/gmsh.1 doc/COPYING doc/VERSIONS doc/FAQ doc/CONTRIBUTORS gmsh-${GMSH_RELEASE}
+ cp doc/gmsh.1 doc/COPYING doc/VERSIONS doc/FAQ doc/CREDITS gmsh-${GMSH_RELEASE}
cp -R tutorial gmsh-${GMSH_RELEASE}
cp -R demos gmsh-${GMSH_RELEASE}
rm -rf gmsh-${GMSH_RELEASE}/*/CVS
@@ -185,7 +185,7 @@ package-win:
cp doc/README.win32 gmsh-${GMSH_RELEASE}/README.txt
cp doc/VERSIONS gmsh-${GMSH_RELEASE}/VERSIONS.txt
cp doc/FAQ gmsh-${GMSH_RELEASE}/FAQ.txt
- cp doc/CONTRIBUTORS gmsh-${GMSH_RELEASE}/CONTRIBUTORS.txt
+ cp doc/CREDITS gmsh-${GMSH_RELEASE}/CREDITS.txt
cp doc/COPYING gmsh-${GMSH_RELEASE}/COPYING.txt
cd utils/misc && unix2dos.bash ../../gmsh-${GMSH_RELEASE}/*.txt
cp -R tutorial gmsh-${GMSH_RELEASE}
@@ -229,7 +229,7 @@ package-mac:
cp -R doc/gmsh.1 tutorial demos gmsh-${GMSH_RELEASE}
cp doc/VERSIONS gmsh-${GMSH_RELEASE}/VERSIONS.txt
cp doc/FAQ gmsh-${GMSH_RELEASE}/FAQ.txt
- cp doc/CONTRIBUTORS gmsh-${GMSH_RELEASE}/CONTRIBUTORS.txt
+ cp doc/CREDITS gmsh-${GMSH_RELEASE}/CREDITS.txt
cp doc/COPYING gmsh-${GMSH_RELEASE}/COPYING.txt
rm -rf gmsh-${GMSH_RELEASE}/*/CVS\
gmsh-${GMSH_RELEASE}/*/*~\
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
deleted file mode 100644
index 51bc75a724ab6e1bdb7f968e69c5bd159d00d7fc..0000000000000000000000000000000000000000
--- a/doc/CONTRIBUTORS
+++ /dev/null
@@ -1,50 +0,0 @@
-$Id: CONTRIBUTORS,v 1.27 2003-04-15 06:38:55 geuzaine Exp $
-
-Gmsh is copyright (c) 1997-2003 by
-
- Jean-Francois Remacle <remacle@gce.ucl.ac.be> and
- Christophe Geuzaine <geuzaine@acm.caltech.edu>
-
-Portions of Gmsh are copyright (c)
-
- 1988-1993, 1995 The Regents of the University of California.
- 1993, 1994, Silicon Graphics, Inc.
- 1990-1995 Bill Hibbard, Brian Paul, Dave Santek, and Andre Battaiola.
- 1989, 1991 Jef Poskanzer.
-
-This version of Gmsh may also contain code copyright (c) 1993, 1995,
-1997, 1998, 2002 Jonathan Richard Shewchuk: check the configuration
-options.
-
-Special thanks to David Colignon <David.Colignon@univ.u-3mrs.fr> for
-new colormaps; Patrick Dular <patrick.dular@ulg.ac.be> for transfinite
-mesh bug fixes; Laurent Stainier <l.stainier@ulg.ac.be> for the Mac OS
-port and the tensor display code; Nicolas Tardieu
-<nicolas.tardieu@edf.fr> and Pierre Badel <badel@freesurf.fr> for help
-with the GSL integration and Marc Ume <Marc.Ume@digitalgraphics.be>
-for the original list code.
-
-Special thanks also to Bill Spitzak <spitzak@users.sourceforge.net>,
-Michael Sweet <easysw@users.sourceforge.net>, Matthias Melcher
-<mm@matthiasm.com> and others for the Fast Light Tool Kit on which
-Gmsh's GUI is based. See http://www.fltk.org for more info on this
-excellent object-oriented, cross-platform toolkit.
-
-Finally, thanks to the following folks who have contributed by
-providing fresh ideas on theoretical or programming topics, who have
-sent patches, requests for changes or improvements, or who gave us
-access to exotic machines for testing Gmsh:
-
- Juan Abanto <juanabanto@yahoo.com>
- Olivier Adam <o.adam@ulg.ac.be>
- Guillaume Alleon <guillaume.alleon@airbus.aeromatra.com>
- Eric Bechet <eric.bechet@epost.de>
- Laurent Champaney <laurent.champaney@meca.uvsq.fr>
- Pascal Dupuis <Pascal.Dupuis@esat.kuleuven.ac.be>
- Philippe Geuzaine <geuzaine@gnat.colorado.edu>
- Johan Gyselinck <johan.gyselinck@ulg.ac.be>
- Francois Henrotte <fhenrott@esat.kuleuven.ac.be>
- Benoit Meys <bmeys@techspace-aero.be>
- Nicolas Moes <moes@tam9.mech.nwu.edu>
- Osamu Nakamura <naka@hasaki.sumitomometals.co.jp>
- Chad Schmutzer <schmutze@acm.caltech.edu>
\ No newline at end of file
diff --git a/doc/CREDITS b/doc/CREDITS
new file mode 100644
index 0000000000000000000000000000000000000000..8576f6662a56001122d044ef17b762234466ca01
--- /dev/null
+++ b/doc/CREDITS
@@ -0,0 +1,69 @@
+$Id: CREDITS,v 1.1 2003-07-23 17:55:49 geuzaine Exp $
+
+Gmsh is copyright (c) 1997-2003 by Christophe Geuzaine
+<geuzaine@acm.caltech.edu> and Jean-Francois Remacle
+<remacle@gce.ucl.ac.be>.
+
+The AVL tree code and YUV image code (DataStr/avl.* and
+Graphics/gl2yuv.*) are copyright (c) 1988-1993, 1995 The Regents of
+the University of California. Permission to use, copy, modify, and
+distribute this software and its documentation for any purpose and
+without fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright notice and
+this permission notice appear in supporting documentation, and that
+the name of the University of California not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. The University of California makes no
+representations about the suitability of this software for any
+purpose. It is provided "as is" without express or implied warranty.
+
+The trackball code (Common/Trackball.*) is copyright (c) 1993, 1994,
+Silicon Graphics, Inc. ALL RIGHTS RESERVED. Permission to use, copy,
+modify, and distribute this software for any purpose and without fee
+is hereby granted, provided that the above copyright notice appear in
+all copies and that both the copyright notice and this permission
+notice appear in supporting documentation, and that the name of
+Silicon Graphics, Inc. not be used in advertising or publicity
+pertaining to distribution of the software without specific, written
+prior permission.
+
+The colorbar widget (Fltk/Colorbar_Window.cpp) is based on code
+copyright (c) 1990-1995, Bill Hibbard, Brian Paul, Dave Santek, and
+Andre Battaiola.
+
+The GIF routines (Graphics/gl2gif.cpp) are based on code copyright (c)
+1989, 1991, Jef Poskanzer.
+
+This version of Gmsh may also contain code (in the Triangle
+subdirectory) copyright (c) 1993, 1995, 1997, 1998, 2002, Jonathan
+Richard Shewchuk.
+
+Special thanks to David Colignon <David.Colignon@univ.u-3mrs.fr> for
+new colormaps; Patrick Dular <patrick.dular@ulg.ac.be> for transfinite
+mesh bug fixes; Laurent Stainier <l.stainier@ulg.ac.be> for the Mac OS
+port and the tensor display code; Nicolas Tardieu
+<nicolas.tardieu@edf.fr> and Pierre Badel <badel@freesurf.fr> for help
+with the GSL integration and Marc Ume <Marc.Ume@digitalgraphics.be>
+for the original list code.
+
+Special thanks also to Bill Spitzak <spitzak@users.sourceforge.net>,
+Michael Sweet <easysw@users.sourceforge.net>, Matthias Melcher
+<mm@matthiasm.com> and others for the Fast Light Tool Kit on which
+Gmsh's GUI is based. See http://www.fltk.org for more info on this
+excellent object-oriented, cross-platform toolkit.
+
+Finally, thanks to the following folks who have contributed by
+providing fresh ideas on theoretical or programming topics, who have
+sent patches, requests for changes or improvements, or who gave us
+access to exotic machines for testing Gmsh: Juan Abanto
+<juanabanto@yahoo.com>, Olivier Adam <o.adam@ulg.ac.be>, Guillaume
+Alleon <guillaume.alleon@airbus.aeromatra.com>, Eric Bechet
+<eric.bechet@epost.de>, Laurent Champaney
+<laurent.champaney@meca.uvsq.fr>, Pascal Dupuis
+<Pascal.Dupuis@esat.kuleuven.ac.be>, Philippe Geuzaine
+<geuzaine@gnat.colorado.edu>, Johan Gyselinck
+<johan.gyselinck@ulg.ac.be>, Francois Henrotte
+<fhenrott@esat.kuleuven.ac.be>, Benoit Meys <bmeys@techspace-aero.be>,
+Nicolas Moes <moes@tam9.mech.nwu.edu>, Osamu Nakamura
+<naka@hasaki.sumitomometals.co.jp> and Chad Schmutzer
+<schmutze@acm.caltech.edu>.
diff --git a/doc/gmsh.html b/doc/gmsh.html
index dd241304cb36e99368b79e3cd44f9794a54fb0e7..69002a049943174bc1458af2f976cf6dabffecb5 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -71,7 +71,7 @@ capabilities</a>.
<a href="/gmsh/doc/texinfo/gmsh-info.tgz">info</a> formats)
<li><a href="/gmsh/doc/FAQ">Frequently asked questions (FAQ)</a>
<li><a href="/gmsh/doc/VERSIONS">Version history</a>
- <li><a href="/gmsh/doc/CONTRIBUTORS">List of contributors</a>
+ <li><a href="/gmsh/doc/CREDITS">List of contributors</a>
<li><a name="mysolver"></a>Interactive solver examples:
<a href="/gmsh/doc/mysolver.tgz">C solver</a>,
<a href="/gmsh/doc/myperlsolver.tgz">Perl solver</a>
@@ -163,7 +163,7 @@ of Louvain</a>) and <a
HREF="mailto:geuzaine@acm.caltech.edu">Christophe Geuzaine</a>
(currently with the <a href="http://www.caltech.edu">California
Institute of Technology</a>). The <a
-href="doc/CONTRIBUTORS">CONTRIBUTORS file</a> has more information.
+href="doc/CREDITS">CREDITS file</a> has more information.
<p>
Please use <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a> instead of
our personal e-mails to send questions or bug reports.
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index ca312181a6ae9486e9411dde110828fe16324955..4e53278d326c60849eccbc72bd685f4da351f17b 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.74 2003-07-20 01:16:24 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.75 2003-07-23 17:55:49 geuzaine Exp $
@c
@c Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
@c
@@ -144,7 +144,7 @@ the @cite{Gmsh Reference Manual}, for Gmsh @value{GMSH-VERSION}.
* Running Gmsh:: How to run Gmsh on your operating system.
* File formats:: Input and output file formats.
* Programming notes:: Random notes for developers.
-* Bugs and versions:: Contact information, version history and contributors.
+* Bugs and versions::
* Tips and tricks:: Some tips to make your life easier with Gmsh.
* GNU General Public License:: Copy of the GNU GPL.
* Concept index:: Index of concepts.
@@ -244,11 +244,11 @@ File formats
* Gmsh parsed post-processing file format::
* Gmsh node ordering::
-Bugs, versions and contributors
+Bugs, versions and credits
* Bugs::
* Version history::
-* Contributors::
+* Credits::
@end detailmenu
@end menu
@@ -297,6 +297,7 @@ The precise conditions of the license for Gmsh are found in the General
Public License that accompanies the source code (@pxref{GNU General Public
License}). Further information about this license is available from the GNU
Project webpage @uref{http://www.gnu.org/copyleft/gpl-faq.html}.
+Detailed copyright information can be found in @ref{Credits}.
The source code and various pre-compiled versions of Gmsh (for most of the
classical UNIX platforms, for Windows and for Mac OS) can be downloaded from
@@ -3186,18 +3187,18 @@ with @file{utils/misc/untabify.sh}).
@c * memprof
@c =========================================================================
-@c Bugs, versions and contributors
+@c Bugs, versions and credits
@c =========================================================================
@ifclear COMMERCIAL
@node Bugs and versions, Tips and tricks, Programming notes, Top
-@chapter Bugs, versions and contributors
+@chapter Bugs, versions and credits
@menu
* Bugs::
* Version history::
-* Contributors::
+* Credits::
@end menu
@c -------------------------------------------------------------------------
@@ -3228,7 +3229,7 @@ problems we already know about.
@c Versions
@c -------------------------------------------------------------------------
-@node Version history, Contributors, Bugs, Bugs and versions
+@node Version history, Credits, Bugs, Bugs and versions
@section Version history
@cindex Versions
@@ -3238,17 +3239,17 @@ problems we already know about.
@verbatiminclude ../VERSIONS
@c -------------------------------------------------------------------------
-@c Contributors
+@c Credits
@c -------------------------------------------------------------------------
-@node Contributors, , Version history, Bugs and versions
-@section Contributors
+@node Credits, , Version history, Bugs and versions
+@section Credits
@cindex Acknowledgments
@cindex Contributors, list
@cindex Credits
-@verbatiminclude ../CONTRIBUTORS
+@verbatiminclude ../CREDITS
@end ifclear
diff --git a/gmsh.spec b/gmsh.spec
index 3265c297cdff287124a645d8b64553fbb261feee..3509d4ef8c0f090183d9287ff82c8a05b54b4b60 100644
--- a/gmsh.spec
+++ b/gmsh.spec
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc doc/COPYING doc/VERSIONS doc/FAQ doc/CONTRIBUTORS demos tutorial
+%doc doc/COPYING doc/VERSIONS doc/FAQ doc/CREDITS demos tutorial
/usr/bin/gmsh
/usr/bin/dxf2geo
/usr/share/man/man1/gmsh*