Merge 'upstream/saas-4' into saas-4

[odoo/odoo.git] / README

diff --git a/README b/README
index 5683fa0..9449819 100644 (file)
--- a/README
+++ b/README
@@ -1,17 +1,27 @@
 About OpenERP
 -------------
 
-OpenERP is an OpenSrouce/Free software Enterprise Resource Planning and
+OpenERP is an OpenSource/Free software Enterprise Resource Planning and
 Customer Relationship Management software. More info at:
 
     http://www.openerp.com
 
-Installation on Debian Ubuntu
+Installation on Debian/Ubuntu
 -----------------------------
 
-Add the the apt repository in your source.list and type:
+Add the the apt repository
 
-    $ apt-get install openerp
+    deb http://nightly.openerp.com/6.1/deb/ ./
+
+in your source.list and type:
+
+    $ sudo apt-get update
+    $ sudo apt-get install openerp
+
+Or download the deb file and type:
+
+    $ sudo dpkg -i <openerp-deb-filename>
+    $ sudo apt-get install install -f
 
 Installation on RedHat, Fedora, CentOS
 --------------------------------------
@@ -29,27 +39,23 @@ Install the openerp rpm
 Installation on Windows
 -----------------------
 
+    Check the notes in setup.py
+
 Installation on MacOSX
 -----------------------
 
 Setuping you first database
 ---------------------------
 
-Point your browser to http://localhost:8069/ and click "Database", the default
-master password is "admin".
+Point your browser to http://localhost:8069/ and click "Manage Databases", the
+default master password is "admin".
 
 Detailed System Requirements
 ----------------------------
 
-You need the following software installed:
-
-python, postgresql-client, python-dateutil, python-gdata, python-ldap,
-python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2,
-python-pybabel, python-pychart, python-pydot, python-pyparsing,
-python-reportlab, python-simplejson, python-tz, python-vobject, python-webdav,
-python-werkzeug, python-yaml, python-zsi, graphviz, ghostscript, postgresql,
-python-imaging, python-matplotlib
+The dependencies are listed in setup.py
 
 For Luxembourg localization, you also need:
-* pdftk (http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)
+
+ pdftk (http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)