[pypy-svn] pypy documentation-cleanup: RPython toolchain again

[lac]

Author: Laura Creighton <lac at openend.se>
Branch: documentation-cleanup
Changeset: r43752:9e4aa458f145
Date: 2011-04-29 12:05 +0200
http://bitbucket.org/pypy/pypy/changeset/9e4aa458f145/

Log:	RPython toolchain again

diff --git a/pypy/doc/glossary.rst b/pypy/doc/glossary.rst
--- a/pypy/doc/glossary.rst
+++ b/pypy/doc/glossary.rst
@@ -15,7 +15,7 @@
 .. glossary::
 
     annotator
-        The component of the :term:`translator`\ 's :term:`toolchain` that performs a form
+        The component of the :term:`RPython toolchain` that performs a form
         of :term:`type inference` on the flow graph. See the `annotator pass`_
         in the documentation.
 
@@ -26,7 +26,7 @@
     backend
         Code generator that converts an `RPython
         <coding-guide.html#restricted-python>`__ program to a `target
-        language`_ using the PyPy :term:`toolchain`. A backend uses either the
+        language`_ using the :term:`RPython toolchain`. A backend uses either the
         :term:`lltypesystem` or the :term:`ootypesystem`.
 
     compile-time
@@ -100,12 +100,16 @@
        value at :term:`compile-time`, essentially by deferring compilation
        until the run-time value is known. See if `the jit docs`_ help.
 
-    rpython
+    RPython
        `Restricted Python`_, a limited subset of the Python_ language.
        The limitations make :term:`type inference` possible.
        It is also the language that the PyPy interpreter itself is written
        in.
 
+    RPython toolchain
+       The `annotator pass`_, `The RPython Typer`_, and various
+       :term:`backend`\ s.
+
     rtyper
        Based on the type annotations, the `RPython Typer`_ turns the flow
        graph into one that fits the model of the target platform/:term:`backend`
@@ -130,10 +134,6 @@
        It is the `subsystem implementing the Python language`_, composed
        of the bytecode interpreter and of the standard objectspace.
 
-    toolchain
-       The `annotator pass`_, `The RPython Typer`_, and various
-       :term:`backend`\ s.
-
     transformation
        Code that modifies flowgraphs to weave in translation aspects
 
@@ -151,7 +151,7 @@
     type inference
        Deduces either partially or fully the type of expressions as
        described in this `type inference article on Wikipedia`_.
-       PyPy's tool-chain own flavour of type inference is described
+       The :term:`RPython toolchain`'s flavour of type inference is described
        in the `annotator pass`_ section.
 
 .. _applevel: coding-guide.html#application-level