[pypy-commit] extradoc extradoc: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r4188:34f623b889f3
Date: 2012-04-12 12:17 +0200
http://bitbucket.org/pypy/extradoc/changeset/34f623b889f3/

Log:	merge

diff --git a/blog/draft/py3k-status-update-3.rst b/blog/draft/py3k-status-update-3.rst
--- a/blog/draft/py3k-status-update-3.rst
+++ b/blog/draft/py3k-status-update-3.rst
@@ -1,22 +1,22 @@
 Py3k status update #3
 ---------------------
 
-This is the third status update about my work on the `py3k branch`_, which I
+This is the third status update about our work on the `py3k branch`_, which we
 can work on thanks to all of the people who donated_ to the `py3k proposal`_.
 
 A lot of work has been done during the last month: as usual, the list of
-changes is too big to be reported in a detalied way, so this is just a summary
+changes is too big to be reported in a detailed way, so this is just a summary
 of what happened.
 
 One of the most active areas was killing old and deprecated features. In
 particular, we killed support for the ``__cmp__`` special method and its
-counsins, the ``cmp`` builtin function and keyword argument for
-``list.sort()`` and ``sorted()``.  Killing is easy, but then you have to fix
-all the places which breaks because of this, including all the types which
-relied on ``__cmp__`` to be comparable,, fixing all the tests which tried to
-order objects which are no longer ordeable now, or implementing new behavior
-like forbidding calling ``hash()`` on objects which implement ``__eq__`` but
-not ``__hash__``.
+counsins, the ``cmp`` builtin function and keyword argument for ``list.sort()``
+and ``sorted()``.  Killing is easy, but then you have to fix all the places
+which breaks because of this, including all the types which relied on
+``__cmp__`` to be comparable and all the tests which tried to order objects
+which are no longer ordeable. New behavior, like forbidding calling ``hash()``
+on objects which implement ``__eq__`` but not ``__hash__``, also has to be
+implemented.
 
 Among the other features, we killed lots of now-gone functions in the
 ``operator`` module, the builtins ``apply()``, ``reduce()`` and ``buffer``,
diff --git a/blog/draft/pycon-wrapup.rst b/blog/draft/pycon-wrapup.rst
--- a/blog/draft/pycon-wrapup.rst
+++ b/blog/draft/pycon-wrapup.rst
@@ -6,12 +6,13 @@
 
 From the PyPy perspective, a lot at PyCon was about PyPy. Listing things:
 
-* David Beazley did an excellent keynote on trying to dive head-first into
-  PyPy and at least partly failing. He however did not fail to explain
-  bits and pieces about PyPy's architecture. `Video`_ is available.
+* David Beazley presented an excellent keynote describing his experience
+  diving head-first into PyPy and at least partly failing. He, however, did
+  not fail to explain bits and pieces about PyPy's architecture.
+  `Video`_ is available.
 
 * We gave tons of talks, including the `tutorial`_, `why pypy by example`_
-  and `pypy's JIT architecturew`_
+  and `pypy's JIT architecture`_
 
 * We had a giant influx of new commiters, easily doubling the amount of pull
   requests ever created for PyPy. The main topics for newcomers were numpy and
@@ -23,7 +24,7 @@
 We would like to thank everyone who talked to us, shared ideas and especially
 those who participated in sprints - we're always happy to welcome newcomers!
 
-I'm sure there is tons of things I forgot, but thank you all!
+I'm sure there are tons of things I forgot, but thank you all!
 
 Cheers,
 fijal
@@ -31,5 +32,5 @@
 .. _`Video`: http://pyvideo.org/video/659/keynote-david-beazley
 .. _`tutorial`: http://pyvideo.org/video/612/how-to-get-the-most-out-of-your-pypy
 .. _`why pypy by example`: http://pyvideo.org/video/661/why-pypy-by-example
-.. _`pypy's JIT architecturew`: http://pyvideo.org/video/662/how-the-pypy-jit-works
+.. _`pypy's JIT architecture`: http://pyvideo.org/video/662/how-the-pypy-jit-works
 .. _`prove him correct`: http://mrjoes.github.com/2011/12/15/sockjs-bench.html