[MERGE] Merged with main server

bzr revid: tde@openerp.com-20120308083904-l05slz6td2ibggk4

3 files changed, 37 insertions, 0 deletions

diff --git a/doc/api/core.rst b/doc/api/core.rst
new file mode 100644
index 00000000000..05ddf177698
--- /dev/null
+++ b/doc/api/core.rst
@@ -0,0 +1,10 @@
+
+.. _openerp library:
+
+Server-side library
+-------------------
+
+.. automodule:: openerp
+   :members:
+   :undoc-members:
+
diff --git a/doc/api/models.rst b/doc/api/models.rst
new file mode 100644
index 00000000000..143147c0f48
--- /dev/null
+++ b/doc/api/models.rst
@@ -0,0 +1,7 @@
+
+ORM and models
+--------------
+
+.. automodule:: openerp.osv.orm
+   :members:
+   :undoc-members:
diff --git a/doc/api/startup.rst b/doc/api/startup.rst
new file mode 100644
index 00000000000..98e8f6ac3c3
--- /dev/null
+++ b/doc/api/startup.rst
@@ -0,0 +1,20 @@
+
+Start-up script
+---------------
+
+To run the OpenERP server, the conventional approach is to use the
+`openerp-server` script.  It loads the :ref:`openerp library`, sets a few
+configuration variables corresponding to command-line arguments, and starts to
+listen to incoming connections from clients.
+
+Depending on your deployment needs, you can write such a start-up script very
+easily. We also recommend you take a look at an alternative tool called
+`openerp-command` that can, among other things, launch the server.
+
+.. versionadded:: 6.1
+
+Yet another alternative is to use a WSGI-compatible HTTP server and let it call
+into one of the WSGI entry points of the server.
+
+.. versionadded:: 6.1
+