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

[odoo/odoo.git] / README

diff --git a/README b/README
index 5725ce9..9449819 100644 (file)
--- a/README
+++ b/README
@@ -1,17 +1,61 @@
-About OpenERP\r
----------------\r
-\r
-OpenERP is a free Enterprise Resource Planning and Customer Relationship \r
-Management software. It is mainly developed to meet changing needs.\r
-\r
-The main functional features are: CRM & SRM, analytic and financial accounting,\r
-double-entry stock management, sales and purchases management, tasks automation,\r
-help desk, marketing campaign, ... and vertical modules for very specific \r
-businesses.\r
-\r
-Technical features include a distributed server, flexible workflows, an object \r
-database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...\r
-\r
-For more information, please visit: \r
-http://www.openerp.com\r
-\r
+About OpenERP
+-------------
+
+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
+-----------------------------
+
+Add the the apt repository
+
+    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
+--------------------------------------
+
+Install the required dependencies:
+
+    $ yum install python
+    $ easy_install pip
+    $ pip install .....
+
+Install the openerp rpm
+
+    $ rpm -i openerp-VERSION.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 "Manage Databases", the
+default master password is "admin".
+
+Detailed System Requirements
+----------------------------
+
+The dependencies are listed in setup.py
+
+For Luxembourg localization, you also need:
+
+ pdftk (http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)
+