diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:59:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:59:39 +0200 |
| commit | dda0d3d62d23cae3013db32bcb6322a2574f0162 (patch) | |
| tree | 0988c2ec35a0ac435f7faf51f69e762ecd93414e /doc/setup | |
| parent | dcc13079b7fd02d156ffc982cddfccfe684113bc (diff) | |
| parent | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (diff) | |
[MERGE] forward port of branch saas-10 up to baf494c
# Conflicts:
# addons/hr_timesheet/project_timesheet.py
# addons/sale_layout/i18n/es_PE.po
# addons/sale_layout/i18n/hu.po
# addons/sale_layout/i18n/lo.po
# addons/sale_layout/i18n/pl.po
# addons/sale_service/i18n/es_MX.po
# addons/sale_service/i18n/es_PE.po
# addons/sale_service/i18n/lo.po
# addons/stock/stock.py
# addons/stock/stock_view.xml
# addons/warning/i18n/es_PE.po
# addons/warning/i18n/lo.po
# addons/warning/i18n/ru.po
# addons/web/i18n/cs.po
# addons/web/i18n/ja.po
# addons/web/i18n/lo.po
# addons/web/i18n/th.po
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 ------------ |