[pypy-svn] r28164 - pypy/dist/pypy/doc

[hpk at codespeak.net]

Author: hpk
Date: Sat Jun  3 15:43:46 2006
New Revision: 28164

Modified:
   pypy/dist/pypy/doc/extradoc.txt
Log:
add pycon method talk and 22C3 pypy talk


Modified: pypy/dist/pypy/doc/extradoc.txt
==============================================================================
--- pypy/dist/pypy/doc/extradoc.txt	(original)
+++ pypy/dist/pypy/doc/extradoc.txt	Sat Jun  3 15:43:46 2006
@@ -5,8 +5,15 @@
 Talks and Presentations 
 ----------------------------------
 
-* `PyPy intro`_ talk, given at ACCU 2006 (April), also stating the status 
-  of the project. 
+* `PyPy intro`_ talk, given by Michael Hudson at ACCU 2006 (April), 
+  also stating the status of the project. 
+
+* `PyPy development method`_ talk, given by Bea During and
+  Holger Krekel at Pycon2006 
+
+* `PyPy - the new Python implementation on the block`_ talk, 
+  given by Carl Friedrich Bolz and Holger Krekel at the 
+  22nd Chaos Communication Conference in Berlin, Dec. 2005. 
 
 * oscon2003-paper_ an early paper presented at Oscon 2003 describing 
   what the PyPy project is about and why you should care. 
@@ -22,6 +29,8 @@
 * `py lib slides`_ from the py lib talk at PyCon 2005 
   (py is used as a support/testing library for PyPy). 
 
+.. _`PyPy - the new Python implementation on the block`: http://codespeak.net/pypy/extradoc/talk/22c3/hpk-tech.html
+.. _`PyPy development method`: http://codespeak.net/pypy/extradoc/talk/pycon2006/method_talk.html
 .. _`PyPy intro`: http://codespeak.net/pypy/extradoc/talk/accu2006/accu-2006.pdf 
 .. _oscon2003-paper: http://codespeak.net/pypy/extradoc/talk/oscon2003-paper.html
 .. _`Architecture introduction slides`: http://codespeak.net/pypy/extradoc/talk/amsterdam-sprint-intro.pdf