summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-16 19:29:39 -0500
committerChris McDonough <chrism@plope.com>2010-12-16 19:29:39 -0500
commitb3edcf4c9704cb245f69bfeab6e940a2b8192641 (patch)
tree5f3e4a3f17f096ec34b2fdc7275de722ce205c76
parentdc06b0b30c0508835022567cee40196d6d9cb984 (diff)
downloadpyramid-b3edcf4c9704cb245f69bfeab6e940a2b8192641.tar.gz
pyramid-b3edcf4c9704cb245f69bfeab6e940a2b8192641.tar.bz2
pyramid-b3edcf4c9704cb245f69bfeab6e940a2b8192641.zip
- Direct Jython users to Mako rather than Jinja2 in "Install" narrative
chapter.
-rw-r--r--CHANGES.txt3
-rw-r--r--docs/narr/install.rst32
2 files changed, 10 insertions, 25 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 33546e947..2f8a784c0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,9 @@ Documentation
- Changed "Project" chapter slightly to expand on use of ``paster pshell``.
+- Direct Jython users to Mako rather than Jinja2 in "Install" narrative
+ chapter.
+
Paster Templates
----------------
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index abc4f539c..e32d0c6c3 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -21,9 +21,9 @@ run :app:`Pyramid`.
:app:`Pyramid` does not run under any version of Python before
2.4, and does not yet run under Python 3.X.
-:app:`Pyramid` is known to run on all popular Unix-like systems
-such as Linux, MacOS X, and FreeBSD as well as on Windows platforms.
-It is also known to run on Google's App Engine and :term:`Jython`.
+:app:`Pyramid` is known to run on all popular Unix-like systems such as
+Linux, MacOS X, and FreeBSD as well as on Windows platforms. It is also
+known to run on Google's App Engine and :term:`Jython`.
:app:`Pyramid` installation does not require the compilation of any
C code, so you need only a Python interpreter that meets the
@@ -325,28 +325,10 @@ replacing the ``python`` command with ``jython`` as necessary. The
steps are exactly the same except you should use the ``jython``
command name instead of the ``python`` command name.
-One caveat exists to using :app:`Pyramid` under Jython: the
-:term:`Chameleon` templating engine, which is the default templating
-engine for :app:`Pyramid` does not work on Jython.
-
-The ``pyramid_jinja2`` distribution provides templating for
-:app:`Pyramid` using the :term:`Jinja2` templating system. You may
-install it like so using the ``easy_install`` command for Jython:
-
-.. code-block:: text
-
- $ easy_install pyramid_jinja2
-
-Once this is done, you can use this command to get started with a
-:app:`Pyramid` sample application that uses the Jinja2 templating
-engine:
-
-.. code-block:: text
-
- $ paster create -t pyramid_jinja2_starter
-
-See the chapter entitled :ref:`project_narr` for more information
-about the ``paster create`` command.
+One caveat exists to using :app:`Pyramid` under Jython: the :term:`Chameleon`
+templating engine does not work on Jython. However, the :term:`Mako`
+templating system, which is also included with Pyramid, does work under
+Jython; use it instead.
What Gets Installed
-------------------