From 93a13e9ea0d58a9182aa8f076c7e6bebb07e7724 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Mon, 2 Feb 2015 18:33:11 +0100
Subject: Small fix on the install documentation (more work have to be done...)

---
 docs/source/installation.rst | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'docs')

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index 023628193..4cfc7a061 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -29,7 +29,7 @@ Requirements
  - `jquery <http://jquery.com/>`_
  - `jquery-ui <http://jqueryui.com/>`_
  - `xhtml2odt <http://xhtml2odt.org/>`_
- - `python-utidylib <http://developer.berlios.de/projects/utidylib>`_
+ - `python-tidylib <http://countergram.com/open-source/pytidylib/docs/>`_
  - `python-lxml <http://lxml.de/>`_
  - `python-imaging <http://www.pythonware.com/products/pil/>`_
 
@@ -41,34 +41,28 @@ Optionaly:
 The easier way to obtain most these packages is to get them from your favorite Linux distribution repositories.
 For instance the packages for Debian wheezy are get with::
 
-    $ apt-get install apache2 python python-django python-psycopg2 gettext \
+    apt-get install apache2 python python-django python-psycopg2 gettext \
           postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \
-          python-pisa python-django-registration python-utidylib python-lxml \
+          python-pisa python-django-registration python-tidylib python-lxml \
           python-imaging git python-django-south python-psycopg2
 
 If these packages do not exist in your distribution's repository, please refer to applications websites.
 
-django-simple-history and xhtml2odt are usually not packaged.::
+django-simple-history is not usually not packaged.::
 
     LOCAL_SRC_PATH=/usr/local/src
 
 To install django-simple-history (git package is needed)::
 
     cd $LOCAL_SRC_PATH
-    git clone https://github.com/treyhunner/django-simple-history.git
+    git clone https://github.com/treyhunner/django-simple-history.git@0fd9b8e9c6f36b0141367b502420efe92d4e21ce
     cd django-simple-history
     python setup.py install
 
-To install xhtml2odt (git package is needed)::
-
-    cd /tmp
-    wget http://download.opensuse.org/repositories/home:/abompard:/xhtml2odt/Debian_6.0/all/xhtml2odt_1.3-1_all.deb
-    dpkg -i xhtml2odt_1.3-1_all.deb
-
-(don't forget the path you have installed this library: you'll have to set it in your settings)
 
 If you want to take the bleeding edge version git is necessary. Install the appropriate package.
 
+
 Database configuration
 ----------------------
 
-- 
cgit v1.2.3