[REF] Moved nex features merges from api to revisions.

bzr revid: tde@openerp.com-20120417084315-omitzsd21sq3mby0

doc/index.rst

@@ -1,29 +1,6 @@
-.. OpenERP Web documentation master file, created by
+:orphan:
-   sphinx-quickstart on Fri Mar 18 16:31:55 2011.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
 
-Welcome to OpenERP Web's documentation!
+OpenERP Server Developers Documentation
-=======================================
+========================================
 
-Contents:
+.. include:: index.rst.inc
-
-.. toctree::
-   :maxdepth: 2
-
-   search-view
-
-   getting-started
-   production
-   widgets
-   addons
-   development
-   project
-   old-version
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`

doc/index.rst.inc

@@ -1,17 +1,17 @@
 
-OpenERP Server
+OpenERP Server Documentation
-''''''''''''''
+'''''''''''''''''''''''''''''
 
 .. toctree::
    :maxdepth: 1
 
    test-framework
 
-New feature merges
+Main revisions and new features
-++++++++++++++++++
+++++++++++++++++++++++++++++++++
 
 .. toctree::
    :maxdepth: 1
 
-   api/user_img_specs
+   revisions/user_img_specs
-   api/need_action_specs
+   revisions/need_action_specs