Merge

doc/build.py

@@ -5,7 +5,7 @@ from os import path
 from sphinx.util.console import nocolor
 from sphinx.application import Sphinx
 
-srcdir = confdir = path.abspath('.')
+srcdir = confdir = path.abspath(path.normpath(path.dirname(__file__)))
 outdir = os.path.join(srcdir, 'html')
 static_dir = os.path.join(srcdir, 'static')
 doctreedir = path.join(outdir, '.doctrees')

doc/index.rst

@@ -12,15 +12,13 @@ Contents:
 
    installation
    models
-   modules
-   net-rpc
-   reports
-   unittest
    views
-   webdav
+   modules
    wizards
+   reports
    workflows
-   xml-rpc
+   unittest
+   protocols
 
 Indices and tables
 ##################

doc/net-rpc.rst

@@ -1,2 +0,0 @@
-Net-rpc
-#######

doc/protocols.rst

@@ -0,0 +1,12 @@
+Protocols
+#########
+
+
+Net-RPC
+*******
+
+XML-RPC
+*******
+
+WebDAV
+******

doc/views.rst

@@ -1,12 +1,15 @@
+Views
+#####
+
 Graph view
-##########
+**********
 
 The dtd that describe the xml for a graph view is stored in
 trytond/ir/ui/graph.dtd.
 
 
 XML description
-***************
++++++++++++++++
 
 * tag "graph":
 

doc/webdav.rst

@@ -1,2 +0,0 @@
-Webdav
-######

doc/xml-rpc.rst

@@ -1,2 +0,0 @@
-Xml-rpc
-#######

etc/trytond.conf

@@ -37,9 +37,8 @@ admin_passwd = admin
 
 # Enable the SSL connection.
 #secure = False
-secure = True
-privatekey = bin/server.pem
-certificate = bin/server.pem
+#privatekey = server.pem
+#certificate = server.pem
 
 # Configure the SMTP connection.
 #smtp_server = localhost
@@ -47,7 +46,7 @@ certificate = bin/server.pem
 #smtp_user = False
 
 # Configure the path to store the attachment.
-data_path = /home/bch/hg/trytond/data/
+#data_path = /var/lib/trytond
 
 # Limit the number of thread.
 max_thread = 40