diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
| commit | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (patch) | |
| tree | 3b2c9ec3cacabcf0a5b0fb78a667d5e1b27505dc /doc/setup | |
| parent | 133490b4d0e347d75bab20da8e5e0ad1f95d3a2d (diff) | |
| parent | 1d81bb06a47b1aee1b7a0dcdaa03084ddedf8b7b (diff) | |
[MERGE] forward port of branch saas-9 up to 1d81bb0
# Conflicts:
# addons/account_extra_reports/i18n/ca.po
# addons/account_extra_reports/i18n/fi.po
# addons/account_extra_reports/i18n/pl.po
# addons/account_extra_reports/i18n/te.po
# addons/account_extra_reports/i18n/zh_CN.po
# addons/account_full_reconcile/i18n/hu.po
# addons/account_full_reconcile/i18n/pl.po
# addons/crm/crm_lead_menu.xml
# addons/crm_claim/i18n/es_PE.po
# addons/crm_claim/i18n/hu.po
# addons/crm_claim/i18n/ja.po
# addons/crm_claim/i18n/pl.po
# addons/delivery/views/delivery_view.xml
# addons/product/product_view.xml
# addons/project_timesheet/i18n/es_PE.po
# addons/stock/stock_view.xml
Diffstat (limited to 'doc/setup')
| -rw-r--r-- | doc/setup/install.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/setup/install.rst b/doc/setup/install.rst index e74ce8345cc..139cc244701 100644 --- a/doc/setup/install.rst +++ b/doc/setup/install.rst @@ -174,7 +174,7 @@ Or ``dpkg`` (handles less dependencies automatically): # apt-get install postgresql -y # dpkg -i <path_to_installation_package> # this probably fails with missing dependencies # apt-get install -f # should install the missing dependencies - # pdkg -i <path_to_installation_package> + # dpkg -i <path_to_installation_package> This will install Odoo as a service, create the necessary PostgreSQL_ user @@ -462,25 +462,25 @@ Source installation requires manually installing dependencies: $ apt-get install -y npm $ sudo ln -s /usr/bin/nodejs /usr/bin/node - Once npm is installed, use it to install less and less-plugin-clean-css: + Once npm is installed, use it to install less: .. code-block:: console - $ sudo npm install -g less less-plugin-clean-css + $ sudo npm install -g less - on OS X, install nodejs via your preferred package manager (homebrew_, - macports_) then install less and less-plugin-clean-css: + macports_) then install less: .. code-block:: console - $ sudo npm install -g less less-plugin-clean-css + $ sudo npm install -g less - on Windows, `install nodejs <http://nodejs.org/download/>`_, reboot (to - update the :envvar:`PATH`) and install less and less-plugin-clean-css: + update the :envvar:`PATH`) and install less: .. code-block:: ps1 - C:\> npm install -g less less-plugin-clean-css + C:\> npm install -g less Running Odoo ------------ |