Merge branch '2.5-maintenance'
diff --git a/docs/intro.rst b/docs/intro.rst
index 35a01f6..0800615 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -79,8 +79,8 @@
Installing the development version
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1. Install `mercurial`_
-2. ``hg clone http://dev.pocoo.org/hg/jinja2-main jinja2``
+1. Install `git`_
+2. ``git clone git://github.com/mitsuhiko/jinja2.git``
3. ``cd jinja2``
4. ``ln -s jinja2 /usr/lib/python2.X/site-packages``
@@ -88,20 +88,11 @@
which will install the package via distribute in development mode. This also
has the advantage that the C extensions are compiled.
-Alternative you can use `pip`_ to install the current development
-snapshot::
-
- sudo pip install Jinja2==dev
-
-Or the `easy_install`_ command::
-
- sudo easy_install Jinja2==dev
-
.. _download page: http://pypi.python.org/pypi/Jinja2
.. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools
.. _easy_install: http://peak.telecommunity.com/DevCenter/EasyInstall
.. _pip: http://pypi.python.org/pypi/pip
-.. _mercurial: http://www.selenic.com/mercurial/
+.. _git: http://git-scm.org/
More Speed with MarkupSafe
@@ -174,4 +165,4 @@
for yourself.
-.. _Jinja bug tracker: http://dev.pocoo.org/projects/jinja/
+.. _Jinja bug tracker: http://github.com/mitsuhiko/jinja2/issues
diff --git a/setup.py b/setup.py
index fc3ac1f..7de859a 100644
--- a/setup.py
+++ b/setup.py
@@ -30,20 +30,14 @@
For more informations visit the new `Jinja2 webpage`_ and `documentation`_.
-The `Jinja2 tip`_ is installable via `easy_install` with ``easy_install
-Jinja2==dev``.
-
.. _sandboxed: http://en.wikipedia.org/wiki/Sandbox_(computer_security)
.. _Django: http://www.djangoproject.com/
.. _Jinja2 webpage: http://jinja.pocoo.org/
.. _documentation: http://jinja.pocoo.org/2/documentation/
-.. _Jinja2 tip: http://dev.pocoo.org/hg/jinja2-main/archive/tip.tar.gz#egg=Jinja2-dev
"""
-import os
import sys
from setuptools import setup, Extension, Feature
-from distutils.command.build_ext import build_ext
debugsupport = Feature(
'optional C debug support',