Merge branch 'master' of github.com:benjaoming/django-wiki

README.md

@@ -106,19 +106,37 @@ Installation
 
 ### Pre-requisites
 
-Django-wiki uses the [PIL library](http://www.pythonware.com/products/pil/) for image processing. The preferred method should be to get a system-wide version of PIL, for instance by getting the binaries from your Linux distribution repos.
+For image processing, django-wiki uses the [Pillow library](https://github.com/python-imaging/Pillow) (af fork of PIL). The preferred method should be to get a system-wide, pre-compiled version of Pillow, for instance by getting the binaries from your Linux distribution repos.
 
-**PIL Directly from repository: Debian-based Linux Distros**
+**Debian-based Linux Distros**
+
+You may find this a bit annoying: On Ubuntu 12.04 and Debian, PIL is satisfied by installing `python-imaging`, however Pillow is not! On later versions of Ubuntu (tested on 13.10), Pillow is satisfied, but PIL is not. But since PIL no longer compiles on later releases of Ubuntu, we have opted to use Pillow. The alternative would be that django-wiki's requirements would be installed and silently fail (i.e. PIL from pip compiles on Ubuntu 13+ but finds no system libraries for image processing).
+
+If you are on Ubuntu 13+, you may install a system-wide Pillow-adequate library like so:
 
     sudo apt-get install python-imaging
 
-**PIL/Pillow for Pypi**
+After, you can verify that Pillow is satisfied by running `pip show Pillow`.
+
+    $ pip show Pillow
+    ---
+    Name: Pillow
+    Version: 2.0.0
+    Location: /usr/lib/python2.7/dist-packages
+
+On Ubuntu 12.04, Debian Wheezy, Jessie etc., you should acquire a system-wide installation of Pillow, read next section...
+
+**Pip installation**
 
-Firstly, you need to get development libraries that PIP needs before compiling. For instance on Debian/Ubuntu:
+Firstly, you need to get development libraries that PIP needs before compiling. For instance on Debian/Ubuntu 12.04:
 
     sudo apt-get install libjpeg8 libjpeg-dev libpng libpng-dev
 
-After that, choose either `pip install PIL` or `pip install Pillow`. Pillow is the pip-friendly version of PIL. You might as well install PIL system-wide, because there are little version-specific dependencies in Django applications when it comes to PIL.
+Later versions of Ubuntu:
+
+    sudo apt-get install libjpeg8 libjpeg-dev libpng12-0 libpng12-dev
+
+After that, install with `sudo pip install Pillow`. You might as well install Pillow system-wide, because there are little version-specific dependencies in Django applications when it comes to Pillow, and having multiple installations of the very same package is a bad practice in this case.
 
 **Mac OS X 10.5+**
 
@@ -247,7 +265,7 @@ So far the dependencies are:
  * [django-mptt>=0.5.3](https://github.com/django-mptt/django-mptt)
  * [django-sekizai](https://github.com/ojii/django-sekizai/)
  * [sorl-thumbnail](https://github.com/sorl/sorl-thumbnail)
- * PIL (Python Imaging Library)
+ * Pillow (Python Imaging Library)
  * Python>=2.5<3 (Python 3 not yet supported)
 
 Development
@@ -259,6 +277,11 @@ The folder **testproject/** contains a pre-configured django project and an sqli
 
 [![Build Status](https://travis-ci.org/benjaoming/django-wiki.png?branch=master)](https://travis-ci.org/benjaoming/django-wiki)
 
+[![Downloads](https://pypip.in/d/wiki/badge.png)](https://crate.io/package/wiki)
+
+[![Downloads](https://pypip.in/v/wiki/badge.png)](https://crate.io/package/wiki)
+
+
 Python 2.5
 ----------
 

requirements.txt

@@ -4,4 +4,4 @@ Markdown>2.2.0
 django-sekizai>=0.7
 django-mptt>=0.5.3
 sorl-thumbnail
-PIL
+Pillow