diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
| commit | c8cc54559b75a621e4444ecdca6abd901b45e494 (patch) | |
| tree | 92141325d4dbbf70bbfb8e0c040d4435c8d2378f /doc/reference/cmdline.rst | |
| parent | b2804b1d2ae5fd7ec5c0eca79a8db77476badc84 (diff) | |
| parent | 91a14488250bc2bb405cc6d300359aa272642484 (diff) | |
[MERGE] forward port branch 10.0 up to 91a1448
Diffstat (limited to 'doc/reference/cmdline.rst')
| -rw-r--r-- | doc/reference/cmdline.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index 0edcf82c9d3..a14956f2bea 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -96,7 +96,7 @@ Running the server .. option:: -s, --save saves the server configuration to the current configuration file - (:file:`{$HOME}/.openerp_serverrc` by default, and can be overridden using + (:file:`{$HOME}/.odoorc` by default, and can be overridden using :option:`-c`) .. option:: --proxy-mode @@ -343,7 +343,7 @@ Some conversions don't match the pattern: * :option:`--i18n-import` and :option:`--i18n-export` aren't available at all from configuration files -The default configuration file is :file:`{$HOME}/.openerp_serverrc` which +The default configuration file is :file:`{$HOME}/.odoorc` which can be overridden using :option:`--config <odoo.py -c>`. Specifying :option:`--save <odoo.py -s>` will save the current configuration state back to that file. |