X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;ds=sidebyside;f=README.md;h=aa774a03057dcdc4bc908453b511ff79074f78ec;hb=HEAD;hp=45ac7ee4cedef5414be43dac2c6f7ab87cbc8866;hpb=d63bfa8699ececf2ac4c2d9531c1c27b6c33df56;p=odoo%2Fodoo.git

diff --git a/README.md b/README.md
index 45ac7ee..aa774a0 100644
--- a/README.md
+++ b/README.md
@@ -1,73 +1,57 @@
-About Odoo
-==========
+[![Build Status](http://runbot.odoo.com/runbot/badge/default/1/master.svg)](http://runbot.odoo.com/runbot)
 
-Odoo is suite of open source Business apps. More info at http://www.odoo.com
+Odoo
+----
 
-Installation
-============
+Odoo is a suite of web based open source business apps.
 
-[Setup/migration guide for employees](https://github.com/odoo/odoo/blob/master/doc/git.rst)
+The main Odoo Apps include an <a href="https://www.odoo.com/page/crm">Open Source CRM</a>, <a href="https://www.odoo.com/page/website-builder">Website Builder</a>, <a href="https://www.odoo.com/page/e-commerce">eCommerce</a>, <a href="https://www.odoo.com/page/project-management">Project Management</a>, <a href="https://www.odoo.com/page/accounting">Billing & Accounting</a>, <a href="https://www.odoo.com/page/point-of-sale">Point of Sale</a>, <a href="https://www.odoo.com/page/employees">Human Resources</a>, Marketing, Manufacturing, Purchase Management, ...  
+Odoo Apps can be used as stand-alone applications, but they also integrate seamlessly so you get
+a full-featured <a href="https://www.odoo.com">Open Source ERP</a> when you install several Apps.
 
 
-Migration from bazaar
-=====================
+Getting started with Odoo development
+--------------------------------------
 
-If you have existing bazaar branches and want to move them to a git repository,
-there are several options:
+If you are a developer type the following command at your terminal:
 
-* download http://nightly.openerp.com/move-branch.zip and run it with
-  `python move-branch.zip -h` (for the help). It should be able to convert
-  simple-enough branches for you (even if they have merge commits &al)
-* Extract the branch contents as patches and use `git apply` or `git am` to
-  rebuild a branch from them
-* Replay the branch by hand
+    wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python
 
+Then follow <a href="https://doc.odoo.com/trunk/server/howto/howto_website/">the developer tutorial</a>
 
-System Requirements
--------------------
 
-The dependencies are listed in setup.py
 
+Packages, tarballs and installers
+---------------------------------
 
-Debian/Ubuntu
--------------
+* Debian packages
 
-Add the apt repository
+    Add this apt repository to your /etc/apt/sources.list file
 
-    deb http://nightly.openerp.com/7.0/deb/ ./
+        deb http://nightly.odoo.com/master/nightly/deb/ ./
 
-in your source.list and type:
+    Then type:
 
-    $ sudo apt-get update
-    $ sudo apt-get install openerp
+        $ sudo apt-get update
+        $ sudo apt-get install odoo
 
-Or download the deb file and type:
+    If you plan to use Odoo with a local database, please make sure to install PostgreSQL *before* installing the Odoo Debian package.
 
-    $ sudo dpkg -i <openerp-deb-filename>
-    $ sudo apt-get install -f
+* <a href="http://nightly.odoo.com/master/nightly/src/">Source tarballs</a>
 
-RedHat, Fedora, CentOS
-----------------------
+* <a href="http://nightly.odoo.com/master/nightly/exe/">Windows installer</a>
 
-Install the required dependencies:
+* <a href="http://nightly.odoo.com/master/nightly/rpm/">RPM package</a>
 
-    $ yum install python
-    $ easy_install pip
-    $ pip install .....
 
-Install the openerp rpm
+For Odoo employees
+------------------
 
-    $ rpm -i openerp-VERSION.rpm
+To add the odoo-dev remote use this command:
 
-Windows
--------
+    $ ./odoo.py setup_git_dev
 
-Check the notes in setup.py
+To fetch odoo merge pull requests refs use this command:
 
-
-Setting up your database
-------------------------
-
-Point your browser to http://localhost:8069/ and click "Manage Databases", the
-default master password is "admin".
+    $ ./odoo.py setup_git_review