[svn] added doc notes to the installation instructions

--HG--
branch : trunk

diff --git a/Makefile b/Makefile
index 8fcff87620ca2eadf73d5821d19943fc8491a56c..ca294d90636bae66e27f1ee47b0bf98b1661167b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,5 +17,5 @@ documentation:
 webpage:
        @(cd ../www; ./generate.py)
 
-release:
-       @(python2.3 setup.py release bdist_egg; python2.4 setup.py release bdist_egg; python2.5 setup.py release bdist_egg sdist)
+release: documentation
+       @(python2.3 setup.py release bdist_egg upload; python2.4 setup.py release bdist_egg upload; python2.5 setup.py release bdist_egg sdist upload)

diff --git a/docs/src/installation.txt b/docs/src/installation.txt
index eecb4a4b867db7399ef4cf689268a8c22a6f4296..b5b63947706af0d8514c7eb2856296f9bd8c8cfc 100644 (file)
--- a/docs/src/installation.txt
+++ b/docs/src/installation.txt
@@ -17,7 +17,6 @@ You can install the most recent Jinja version using `easy_install`_::
 This will install a Jinja egg in your Python installation's site-packages
 directory.
 
-
 From the tarball release
 -------------------------
 
@@ -31,7 +30,6 @@ internet connection.
 
 This will install Jinja into your Python installation's site-packages directory.
 
-
 Installing the development version
 ==================================
 
@@ -57,6 +55,17 @@ This will install a Jinja egg containing the latest Subversion trunk code
 in your Python installation's site-packages directory. Every time the command
 is run, the sources are updated from Subversion.
 
+Documentation
+=============
+
+The egg builds include a documentation which is available in the ``docs`` folder
+of the egg. If you're running linux you will find the documentation here::
+
+    file:///usr/lib/python2.X/site-packages/Jinja-Y.Z-py2.X.egg/docs/index.html
+
+where ``X``, ``Y`` and ``Z`` must be replaced by the python / jinja version
+number.
+
 
 .. _download page: http://jinja.pocoo.org/download.html
 .. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools

diff --git a/setup.py b/setup.py
index bea1d2dee9004f776dc554be9e095958550daae2..bbab812e1847ea50b6a46e637639e151340a5c8d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -92,8 +92,8 @@ setup(
     keywords = ['python.templating.engines'],
     packages = ['jinja', 'jinja.translators'],
     data_files = [
-        ('docs', list_files('docs/build')),
-        ('docs/txt', list_files('docs/src'))
+        ('docs', list(list_files('docs/build'))),
+        ('docs/txt', list(list_files('docs/src')))
     ],
     platforms = 'any',
     extras_require = {'plugin': ['setuptools>=0.6a2']}