[IMP] merge INSTALL into README, rename to .md because github...

creating CI-conflicted situations is really annoying, not doing that would be great

diff --git a/INSTALL b/INSTALL
deleted file mode 100644 (file)
index bd277de..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,72 +0,0 @@
-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/)
-
-OpenERP Web
------------
-
-The OpenERP Web Client supports the following web browsers:
-
-* Internet Explorer 9+
-* Google Chrome 22+
-* Firefox 13+
-* Any browser using the latest version of Chrome Frame
-
-

diff --git a/README b/README
deleted file mode 100644 (file)
index dd27a22..0000000
--- a/README
+++ /dev/null
@@ -1,12 +0,0 @@
-About Odoo
-----------
-
-Odoo is suite of OpenSource Business apps. More info at:
-
-    http://www.odoo.com
-
-Odoo git workflow
------------------
-
-    https://github.com/odoo/odoo/blob/master/doc/git.rst
-

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..3451bde
--- /dev/null
+++ b/README.md
@@ -0,0 +1,64 @@
+About Odoo
+==========
+
+Odoo is suite of OpenSource Business apps. More info at:
+
+    http://www.odoo.com
+
+Odoo git workflow
+=================
+
+    https://github.com/odoo/odoo/blob/master/doc/git.rst
+
+Installation
+============
+
+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/)
+
+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
+
+RedHat, Fedora, CentOS
+----------------------
+
+Install the required dependencies:
+
+    $ yum install python
+    $ easy_install pip
+    $ pip install .....
+
+Install the openerp rpm
+
+    $ rpm -i openerp-VERSION.rpm
+
+Windows
+-------
+
+    Check the notes in setup.py
+
+Setting up your database
+------------------------
+
+Point your browser to http://localhost:8069/ and click "Manage Databases", the
+default master password is "admin".