[MERGE] merge with latest stable

[odoo/odoo.git] / doc / openerp-server.conf

diff --git a/doc/openerp-server.conf b/doc/openerp-server.conf
index ac15f2e..4f13c8a 100644 (file)
--- a/doc/openerp-server.conf
+++ b/doc/openerp-server.conf
@@ -5,9 +5,11 @@ without_demo = True
 upgrade = False
 verbose = False
 netrpc = True
+; netrpc_interface = 
+; netrpc_port = 
 xmlrpc = True
-port = 8069
-interface = 
+; xmlrpc_interface = 
+xmlrpc_port = 8069
 db_host = False
 db_port = False
 ; Please uncomment the following line *after* you have created the
@@ -26,6 +28,7 @@ demo = {}
 addons_path = None
 reportgz = False
 
-[static-http]
-enable = False
-dir_path = /var/www/html
\ No newline at end of file
+; Static http parameters
+static_http_enable = False
+static_http_document_root = /var/www/html
+static_http_url_prefix = /
\ No newline at end of file