[pypy-svn] r17145 - pypy/extradoc/pypy.org

[hpk at codespeak.net]

Author: hpk
Date: Thu Sep  1 09:17:42 2005
New Revision: 17145

Modified:
   pypy/extradoc/pypy.org/confrest.py
   pypy/extradoc/pypy.org/consortium.txt
   pypy/extradoc/pypy.org/index.txt
Log:
- obfuscate email addresses 
- small other changes


Modified: pypy/extradoc/pypy.org/confrest.py
==============================================================================
--- pypy/extradoc/pypy.org/confrest.py	(original)
+++ pypy/extradoc/pypy.org/confrest.py	Thu Sep  1 09:17:42 2005
@@ -7,6 +7,8 @@
             html.a("home", href="index.html", class_="menu"), " ",
             html.a("news", href="news.html", class_="menu"), " ",
             html.a("consortium", href="consortium.html", class_="menu"), " ",
+            html.a("EU-Issues", href="https://codespeak.net/issue/pypy-eu/", 
+                   class_="menu"), " ",
             html.a("community/coding",
                    href="http://codespeak.net/pypy/dist/pypy/doc/index.html",
                    class_="menu"), " ",

Modified: pypy/extradoc/pypy.org/consortium.txt
==============================================================================
--- pypy/extradoc/pypy.org/consortium.txt	(original)
+++ pypy/extradoc/pypy.org/consortium.txt	Thu Sep  1 09:17:42 2005
@@ -2,40 +2,40 @@
 ------------------------------
 
 DFKI http://www.dfki.de
-	Stephan Busemann stephan.busemann at dfki.de
+	Stephan Busemann [stephan.busemann at dfki de]
 	(EU coordinator) 
-	Alastair Burt alastair.burt at dfki.de
-	Anders Lehmann anders.lehmann at dfki.de
+	Alastair Burt [alastair.burt at dfki de]
+	Anders Lehmann [anders.lehmann at dfki de]
 
 AB Strakt http://www.strakt.com
-	Jacob Hallén jacob at strakt.com (project manager)
-	Samuele Pedroni pedronis at strakt.com (technical board)
-	Anders Chrigström ac at strakt.com
+	Jacob Hallén [jacob at strakt com] (project manager)
+	Samuele Pedroni [pedronis at strakt com] (technical board)
+	Anders Chrigström [ac at strakt com]
 
 Change Maker http://www.changemaker.nu
-	Beatrice Düring bea at changemaker.nu (assistant project manager)
+	Beatrice Düring [bea at changemaker nu] (assistant project manager)
 
 merlinux GmbH http://merlinux.de
-	Holger Krekel krekel at merlinux.de (technical director/board)
+	Holger Krekel [krekel at merlinux de] (technical director/board)
 
 Heinrich Heine Universität Düsseldorf http://www.uni-duesseldorf.de/
-	Armin Rigo arigo at tunes.org (technical board)
+	Armin Rigo [arigo at tunes org] (technical board)
 
 Tismerysoft http://www.stackless.com
-	Christian Tismer tismer at stackless.com (technical board)
+	Christian Tismer [tismer at stackless com] (technical board)
 
 Logilab http://www.logilab.fr
-	Nicholas Chauvat Nicolas.Chauvat at logilab.fr 
-	Ludovic Aubry ludal at logilab.fr
-	Adrien DiMascio adim at logilab.fr
+	Nicholas Chauvat [Nicolas.Chauvat at logilab fr] 
+	Ludovic Aubry [ludal at logilab fr]
+	Adrien DiMascio [adim at logilab fr]
 
 impara GmbH www.impara.de
-	Bert Freudenberg bert at impara.de
+	Bert Freudenberg [bert at impara de]
 
 Individual Partners
 -------------------------
 
-Laura Creighton lac at strakt.com
-Eric van Riet Paap eric at vanrietpaap.nl
-Richard Emslie rxe at ukshells.co.uk
+Laura Creighton [lac at strakt com]
+Eric van Riet Paap [eric at vanrietpaap nl]
+Richard Emslie [rxe at ukshells co uk]
 

Modified: pypy/extradoc/pypy.org/index.txt
==============================================================================
--- pypy/extradoc/pypy.org/index.txt	(original)
+++ pypy/extradoc/pypy.org/index.txt	Thu Sep  1 09:17:42 2005
@@ -1,12 +1,12 @@
-PyPy EU project title 
---------------------------------
+PyPy EU project title (contract number: 004479)
+------------------------------------------------
 
 Researching a higly flexible and modular language platform and
 implementing it by leveraging the Open Source Python Language and
 Community
 
-PyPy EU project description 
---------------------------------
+PyPy EU project description (004479)
+--------------------------------------
 
 The PyPy project have been an ongoing Open Source Python language
 implementation since 2003.  In December 2004 PyPy recieved EU-funding
@@ -37,7 +37,7 @@
 contribute in ways that wouldn't have been possible without EU-funding.
 
 For questions regarding the PyPy-project, please email our consortium at
-pypy-funding at codespeak.net or Bea During (bea at changemaker nu). 
+[pypy-funding at codespeak net] or Bea During (bea at changemaker nu). 
 
 For more detailed information, documentation and code - please visit the
 `PyPy community housed at codespeak`_.