[pypy-commit] extradoc extradoc: add a missing file

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r4746:bf9328596b88
Date: 2012-09-05 22:26 +0200
http://bitbucket.org/pypy/extradoc/changeset/bf9328596b88/

Log:	add a missing file

diff --git a/sprintinfo/cape-town-2012/people.txt b/sprintinfo/cape-town-2012/people.txt
new file mode 100644
--- /dev/null
+++ b/sprintinfo/cape-town-2012/people.txt
@@ -0,0 +1,60 @@
+
+People coming to the Cape Town sprint 2012
+==================================================
+
+People who have a ``?`` in their arrive/depart or accomodation
+column are known to be coming but there are no details 
+available yet from them.
+
+
+==================== ============== =======================
+    Name              Arrive/Depart     Accomodation 
+==================== ============== =======================
+Armin Rigo                          fijal's
+Maciej Fijałkowski   -              lives there
+Simon Cross          -              lives there
+==================== ============== =======================
+
+
+People on the following list were present at previous sprints: 
+
+==================== ============== =====================
+       Name          Arrive/Depart  Accomodation 
+==================== ============== =====================
+Antonio Cuni         ?              ?
+Michael Foord        ?              ?
+Maciej Fijalkowski   ?              ?
+David Schneider      ?              ?
+Jacob Hallen         ?              ?
+Laura Creighton      ?              ?
+Hakan Ardo           ?              ?
+Carl Friedrich Bolz  ?              ?
+Samuele Pedroni      ?              ?
+Anders Hammarquist   ?              ?
+Christian Tismer     ?              ?
+Niko Matsakis        ?              ?
+Romain Guillebert    ?              ?
+Toby Watson          ?              ?
+Paul deGrandis       ?              ?
+Michael Hudson       ?              ?
+Anders Lehmann       ?              ?
+Niklaus Haldimann    ?              ?
+Lene Wagner          ?              ?
+Amaury Forgeot d'Arc ?              ?
+Valentino Volonghi   ?              ?
+Boris Feigin	     ?              ?
+Andrew Thompson      ?              ?
+Bert Freudenberg     ?              ?
+Beatrice Duering     ?              ?
+Richard Emslie       ?              ?
+Johan Hahn           ?              ?
+Stephan Diehl        ?              ?
+Alexander Schremmer  ?              ?
+Anders Chrigstroem   ?              ?
+Eric van Riet Paap   ?              ?
+Holger Krekel        ?              ?
+Guido Wesdorp        ?              ?
+Leonardo Santagada   ?              ?
+Alexandre Fayolle    ?              ?
+Sylvain Thénault     ?              ?
+==================== ============== =====================
diff --git a/talk/stm2012/stmimpl.rst b/talk/stm2012/stmimpl.rst
--- a/talk/stm2012/stmimpl.rst
+++ b/talk/stm2012/stmimpl.rst
@@ -27,8 +27,13 @@
 
 XXX
 
-Object model
-============
+Overview of the object model
+============================
+
+In this model there are two kinds of objects. As an object gets allocated,
+it's created as a local object that's only visible to the current thread.
+Local object operations are completely like STM-less operations, the fields
+are just modified.
 
 Objects are either global (visible to everybody, and read-only), or
 they are local (visible only to the current thread).