aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel@gmail.com>2012-11-25 23:47:59 +0100
committerCédric Bonhomme <kimble.mandel@gmail.com>2012-11-25 23:47:59 +0100
commitb9cd16257247a6285df3dc8d49132a2b3f239290 (patch)
treec3d3c8413ca7eb301703f5c8fa3bc3c25a7931c3
parentTemplate for the /statistics page. (diff)
downloadnewspipe-b9cd16257247a6285df3dc8d49132a2b3f239290.tar.gz
newspipe-b9cd16257247a6285df3dc8d49132a2b3f239290.tar.bz2
newspipe-b9cd16257247a6285df3dc8d49132a2b3f239290.zip
Updated README and the REST documentation (requirements section).
-rw-r--r--README.md2
-rw-r--r--docs/index.rst5
2 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index 9397d363..45f08b1b 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Software required
* [Python](http://python.org/) >= 3.2.3;
* [MongoDB](http://www.mongodb.org/) and [PyMongo](http://api.mongodb.org/python/current/) >= 1.9;
* [feedparser](http://code.google.com/p/feedparser/) >= 5.1.2 (for **feedgetter.py**, the RSS feed parser);
-* [CherryPy](http://cherrypy.org/) >= 3.2.2 (for **pyAggr3g470r.py**, the Web interface);
+* [CherryPy](http://cherrypy.org/) >= 3.2.2 and [Mako](http://www.makotemplates.org/) (for **pyAggr3g470r.py**, the Web interface);
* [BeautifulSoup](http://www.crummy.com/software/BeautifulSoup/) >= 4.1.3 (automatically find a feed in a HTML page).
diff --git a/docs/index.rst b/docs/index.rst
index 788b6378..f6e2fbbc 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -40,7 +40,7 @@ Software required
* Python_ >= 3.2.3;
* MongoDB_ and PyMongo_ >= 1.9;
* feedparser_ >= 5.1.2 (for **feedgetter.py**, the RSS feed parser);
-* CherryPy_ >= 3.2.2 (for **pyAggr3g470r.py**, the Web interface);
+* CherryPy_ >= 3.2.2 and Mako_ (for **pyAggr3g470r.py**, the Web interface);
* BeautifulSoup_ >= 4.1.3 (automatically find a feed in a HTML page).
@@ -65,7 +65,7 @@ Script of installation
.. code-block:: bash
sudo aptitude install python-feedparser python-beautifulsoup
- sudo aptitude install python-pymongo python-imaging
+ sudo aptitude install python-pymongo python3-mako
wget http://download.cherrypy.org/cherrypy/3.2.2/CherryPy-3.2.2.tar.gz
tar -xzvf CherryPy-3.2.2.tar.gz
rm -f CherryPy-3.2.2.tar.gz
@@ -165,5 +165,6 @@ Contact
.. _MongoDB: http://www.mongodb.org/
.. _PyMongo: https://github.com/mongodb/mongo-python-driver
.. _CherryPy: http://cherrypy.org/
+.. _Mako: http://www.makotemplates.org/
.. _BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/
.. _GPLv3: http://www.gnu.org/licenses/gpl-3.0.txt
bgstack15