Merge branch 'upstream/saas-5' into saas-5

[odoo/odoo.git] / README.md

diff --git a/README.md b/README.md
index 6838cb9..c400772 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,31 +1,21 @@
-About Odoo
-==========
+Odoo
+----
 
-Odoo is a suite of open source Business apps.  More info at http://www.odoo.com
+Odoo is a suite of web based open source business apps.  More info at http://www.odoo.com
 
-Evaluating Odoo
----------------
+The easiest way to play with it is the <a href="https://www.odoo.com/page/start">Odoo free trial</a>, email registration is NOT required, use the "skip this step" link on the registration page to skip it.
 
-The easiest way to test Odoo is the free trial, NO email registration is
-required, select "skip this step" to skip it.
 
-    https://www.odoo.com/page/start
+Getting started with Odoo developement
+--------------------------------------
 
-
-Getting starting with Odoo developement
----------------------------------------
-
-If you are a developer type the following command at your terminal:
+If you are a developer type the following command at your terminal [1]:
 
     wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python
 
-Then follow the tutorial here:
-
-    https://doc.openerp.com/trunk/server/howto/howto_website/
+Then follow <a href="https://doc.openerp.com/trunk/server/howto/howto_website/">the developer tutorial</a>
 
-If you are an Odoo employee type the following to add the odoo-dev remote
-
-    $ cd odoo; ./odoo.py setup_git_dev
+[1] You may want to check the content of the <a href="https://raw.githubusercontent.com/odoo/odoo/master/odoo.py">odoo.py file</a> before executing it.
 
 
 Packages, tarballs and installers
@@ -42,7 +32,21 @@ Packages, tarballs and installers
         $ sudo apt-get update
         $ sudo apt-get install odoo
 
-* Source tarballs http://nightly.openerp.com/
-* Windows installer http://nightly.openerp.com/
-* RPM package http://nightly.openerp.com/
+* <a href="http://nightly.openerp.com/">Source tarballs</a>
+
+* <a href="http://nightly.openerp.com/">Windows installer</a>
+
+* <a href="http://nightly.openerp.com/">RPM package</a>
+
+
+For Odoo employees
+------------------
+
+To add the odoo-dev remote use this command:
+
+    $ ./odoo.py setup_git_dev
+
+To fetch odoo merge pull requests refs use this command:
+
+    $ ./odoo.py setup_git_review