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

[arigo at codespeak.net]

Author: arigo
Date: Thu Apr 30 11:44:36 2009
New Revision: 64844

Modified:
   pypy/dist/pypy/doc/docindex.txt
   pypy/dist/pypy/doc/eventhistory.txt
   pypy/dist/pypy/doc/index.txt
Log:
Merge 64843 from the trunk.


Modified: pypy/dist/pypy/doc/docindex.txt
==============================================================================
--- pypy/dist/pypy/doc/docindex.txt	(original)
+++ pypy/dist/pypy/doc/docindex.txt	Thu Apr 30 11:44:36 2009
@@ -73,10 +73,11 @@
 
 PyPy can be used to run Python programs on Linux, OS/X,
 Windows, on top of .NET, and on top of Java.
-It is recommended to try out the current Subversion HEAD,
-which contains `major improvements`__ since the last release.
+To dig into PyPy it is recommended to try out the current
+Subversion HEAD, which is always working or mostly working,
+instead of the `release 1.1.0`__.
 
-.. __: http://codespeak.net/pipermail/pypy-dev/2007q4/004103.html
+.. __: release-1.1.0.html
 
 PyPy is mainly developed on Linux and Mac OS X.  Windows is supported,
 but platform-specific bugs tend to take longer before we notice and fix

Modified: pypy/dist/pypy/doc/eventhistory.txt
==============================================================================
--- pypy/dist/pypy/doc/eventhistory.txt	(original)
+++ pypy/dist/pypy/doc/eventhistory.txt	Thu Apr 30 11:44:36 2009
@@ -2,7 +2,7 @@
 
     The PyPy project is a worldwide collaborative effort and its
     members are organising sprints and presenting results at conferences
-    all year round.  The list of past events follows - see `our blog`_ 
+    all year round.  **This page is no longer maintained!**  See `our blog`_
     for upcoming events. 
 
 .. _`our blog`: http://morepypy.blogspot.com/

Modified: pypy/dist/pypy/doc/index.txt
==============================================================================
--- pypy/dist/pypy/doc/index.txt	(original)
+++ pypy/dist/pypy/doc/index.txt	Thu Apr 30 11:44:36 2009
@@ -8,12 +8,17 @@
 Getting into PyPy ... 
 =============================================
 
+* `Release 1.1`_: the latest official release
+
 * `PyPy Blog`_: news and status info about PyPy 
 
 * `Documentation`_: extensive documentation and papers_ about PyPy.  
 
 * `Getting Started`_: Getting started and playing with PyPy. 
 
+Mailing lists, bug tracker, IRC channel
+=============================================
+
 * `Development mailing list`_: development and conceptual
   discussions. 
 
@@ -25,8 +30,9 @@
 * `Sprint mailing list`_: mailing list for organising upcoming sprints. 
 
 * **IRC channel #pypy on freenode**: Many of the core developers are hanging out 
-  at #pypy on irc.freenode.net.  You are welcome to join and ask questions.  
-  Please first checkout the FAQ_. You can find logs of the channel here_.  
+  at #pypy on irc.freenode.net.  You are welcome to join and ask questions
+  (if they are not already developed in the FAQ_).
+  You can find logs of the channel here_.
 
 .. XXX play1? 
 
@@ -35,7 +41,8 @@
 
 The PyPy developers are organising sprints and presenting results at
 conferences all year round. They will be happy to meet in person with
-anyone interested in the project.  Watch out for sprint announcements. 
+anyone interested in the project.  Watch out for sprint announcements
+on the `development mailing list`_.
 
 .. _Python: http://docs.python.org/index.html
 .. _`more...`: architecture.html#mission-statement 
@@ -49,3 +56,4 @@
 .. _`Documentation`: docindex.html 
 .. _`Getting Started`: getting-started.html
 .. _papers: extradoc.html
+.. _`Release 1.1`: release-1.1.0.html