From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 19 May 2013 11:29:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'Talksum/distribute_required'
X-Git-Tag: 2.7~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe63b44889d2b50729d7e3bddb7dfc3c287a10cf;p=thirdparty%2Fjinja.git

Merge remote-tracking branch 'Talksum/distribute_required'
---

fe63b44889d2b50729d7e3bddb7dfc3c287a10cf
diff --cc docs/intro.rst
index 60528e3f,d79c0b2c..5d7e9f8f
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@@ -12,7 -13,18 +12,12 @@@ useful for templating environments
  Prerequisites
  -------------
  
- Jinja2 works with Python 2.6.x, 2.7.x and >= 3.3.
 -Jinja2 needs at least **Python 2.4** to run.  Additionally a working C-compiler
 -that can create python extensions should be installed for the debugger if you
 -are using Python 2.4.
 -
 -If you don't have a working C-compiler and you are trying to install the source
 -release with the debugsupport you will get a compiler error.
 -
 -.. _ctypes: http://python.net/crew/theller/ctypes/
 -
 -If you wish to use the ``PackageLoader`` class, you will also need `distribute`_
 -(formerly known as setuptools) installed at runtime.
++Jinja2 works with Python 2.6.x, 2.7.x and >= 3.3.  If you are using Python
++3.2 you can use an older release of Jinja2 (2.6) as support for 3.2 was
++dropped in 2.7.
+ 
++If you wish to use the :class:`~jinja2.PackageLoader` class, you will also
++need setuptools or distribute installed at runtime.
  
  Installation
  ------------
@@@ -84,6 -96,19 +89,22 @@@ using Jinja2 with autoescaping
  .. _MarkupSafe: http://pypi.python.org/pypi/MarkupSafe
  
  
++<<<<<<< HEAD
++=======
+ Enable the debug support Module
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ By default Jinja2 will not compile the debug support module.  Enabling this
+ will fail if you don't have the Python headers or a working compiler.  This
+ is often the case if you are installing Jinja2 from a Windows machine.
+ 
+ Because the debug support is only necessary for Python 2.4 you will not
+ have to do this unless you run 2.4::
+ 
+     sudo python setup.py --with-debugsupport install
+ 
+ 
++>>>>>>> Talksum/distribute_required
  Basic API Usage
  ---------------