* ./plugins/win32/mainframe.dfm: swapped two mixed up tooltips.

[vlc] / README

diff --git a/README b/README
index f4aef212f1fca0a11ce6d5e0c97a38891802213e..56630a77c7a595b472366295e7c14d02c2bb3139 100644 (file)
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ See the INSTALL file for this.
 Troubleshooting
 ===============
 
+Please check the file FAQ before doing any bug report.
+
 A mailing-list has been set up for support and discussion about the
 vlc. Its address is :
 
@@ -52,6 +54,8 @@ information, too.
 The team
 ========
 
+See the AUTHORS file for a list of the vlc authors and contributors.
+
 The following teachers were involved in the VideoLAN project :
 
   Pierre Lecoy, teacher-cum-researcher at ECP,
@@ -59,6 +63,7 @@ The following teachers were involved in the VideoLAN project :
 
 The following students were members of the VideoLAN team :
 
+1996-1997:
   Pierre Almeras <almeras@via.ecp.fr>
   Christophe Arnaud <christophe.arnaud@tps.fr>
   Antoine Brenner <brenner@via.ecp.fr>
@@ -67,11 +72,12 @@ The following students were members of the VideoLAN team :
   Christian Gross <gross@via.ecp.fr>
   Hugo Haas <hugo@via.ecp.fr>
   Mikael Journo <mj32@cornell.edu>
-  Michel Lespinasse <walken@wrs.com>
+  Michel Lespinasse <walken@zoy.org>
   Christophe Ulses <mowgli@laotseu.via.ecp.fr>
   Pierre Vandecasteele <pabv2@hermes.cam.ac.uk>
   Guillaume Vergnaud <vergnaud@via.ecp.fr>
 
+1997-1998:
   Olivier Baxa <oli@via.ecp.fr>
   Patrice Bazerque <patrice.bazerque@via.ecp.fr>
   Arnaud Bienvenu <arnaud.bienvenu@via.ecp.fr>
@@ -81,6 +87,7 @@ The following students were members of the VideoLAN team :
   Sébastien Kurz <seb@tao.via.ecp.fr>
   Olivier Pomel <pomel@via.ecp.fr>
 
+1998-1999:
   Pierre Baillet <octplane@via.ecp.fr>
   Alban Fonrouge <alban@via.ecp.fr>
   Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>
@@ -91,18 +98,22 @@ The following students were members of the VideoLAN team :
   Vincent Seguin <seguin@via.ecp.fr>
   Benoit Steiner <benny@via.ecp.fr>
 
+1999-2000:
   Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
   Jean-Marc Dressler <polux@via.ecp.fr>
   Gaël Hendryckx <jimmy@via.ecp.fr>
-  Samuel Hocevar <sam@via.ecp.fr>
+  Samuel Hocevar <sam@zoy.org>
   Brieuc Jeunhomme <bbp@via.ecp.fr>
   Michel Kaempf <maxx@via.ecp.fr>
   Florent Rougon <flo@via.ecp.fr>
 
+2000-2001:
+  Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
   Stéphane Borel <stef@via.ecp.fr>
   Renaud Dartus <reno@via.ecp.fr>
   Henri Fallon <henri@via.ecp.fr>
   Jean-Michel Grimaldi <jm@via.ecp.fr>
+  Samuel Hocevar <sam@zoy.org>
   Damien Lucas <nitrox@via.ecp.fr>
   Rémi Peyronnet <remi@via.ecp.fr>
   Laurent Rossier <gunther@via.ecp.fr>