From 1e33a7a6536a0a39d9e6ef070234637a434fb136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 19 Jun 2008 08:33:21 +0200 Subject: [PATCH 1/4] Revert trytond.conf to default values --- etc/trytond.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/etc/trytond.conf b/etc/trytond.conf index f7407926f5..1410dff743 100644 --- a/etc/trytond.conf +++ b/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 From 72900a555823eaa140618060d7bc0ebe9d0b5762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 19 Jun 2008 08:42:04 +0200 Subject: [PATCH 2/4] Re-order menu and add protocols --- doc/index.rst | 10 ++++------ doc/net-rpc.rst | 2 -- doc/protocols.rst | 12 ++++++++++++ doc/webdav.rst | 2 -- doc/xml-rpc.rst | 2 -- 5 files changed, 16 insertions(+), 12 deletions(-) delete mode 100644 doc/net-rpc.rst create mode 100644 doc/protocols.rst delete mode 100644 doc/webdav.rst delete mode 100644 doc/xml-rpc.rst diff --git a/doc/index.rst b/doc/index.rst index 695cacc53a..801a6a99bf 100644 --- a/doc/index.rst +++ b/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 ################## diff --git a/doc/net-rpc.rst b/doc/net-rpc.rst deleted file mode 100644 index 57a69adc70..0000000000 --- a/doc/net-rpc.rst +++ /dev/null @@ -1,2 +0,0 @@ -Net-rpc -####### diff --git a/doc/protocols.rst b/doc/protocols.rst new file mode 100644 index 0000000000..88fcfc8f19 --- /dev/null +++ b/doc/protocols.rst @@ -0,0 +1,12 @@ +Protocols +######### + + +Net-RPC +******* + +XML-RPC +******* + +WebDAV +****** diff --git a/doc/webdav.rst b/doc/webdav.rst deleted file mode 100644 index 579674bd23..0000000000 --- a/doc/webdav.rst +++ /dev/null @@ -1,2 +0,0 @@ -Webdav -###### \ No newline at end of file diff --git a/doc/xml-rpc.rst b/doc/xml-rpc.rst deleted file mode 100644 index 5ce461b0d3..0000000000 --- a/doc/xml-rpc.rst +++ /dev/null @@ -1,2 +0,0 @@ -Xml-rpc -####### \ No newline at end of file From 29ff2a47d417422d3afbfd9c6b5e422aaff1a619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 19 Jun 2008 08:46:06 +0200 Subject: [PATCH 3/4] Add main title to views.rst --- doc/views.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/views.rst b/doc/views.rst index 530d28ce17..fe7ed05ab2 100644 --- a/doc/views.rst +++ b/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": From 7405dcf2f3031ed5f4b7ece8bf2ec7369d64bb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 19 Jun 2008 08:49:20 +0200 Subject: [PATCH 4/4] Make build.py callable from anywhere --- doc/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build.py b/doc/build.py index 5f8ba523cc..cb083aa58f 100644 --- a/doc/build.py +++ b/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')