summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2013-08-21 12:31:39 +0200
committerChristophe Simonis <chs@openerp.com>2013-08-21 12:31:39 +0200
commit208b69723986e79db5a8893cf8540f75720b63bc (patch)
tree7476f251a6a049da1fc2641bcd414dc388382044 /doc
parentc02afb45fa74fb1490b4b4965f987906ee718eb6 (diff)
parent8179683143f880b10f40559a3da48afcfcfcd8ee (diff)
[MERGE] forward port of branch saas-1 up to revid 4899 chs@openerp.com-20130821094758-1ae0d1ml5obufzxv
bzr revid: odo@openerp.com-20130820160346-qcdy4kavgm5cb9t6 bzr revid: chs@openerp.com-20130821103139-zqqbrt8dq6iixrny
Diffstat (limited to 'doc')
-rw-r--r--doc/changelog.rst14
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/changelog.rst b/doc/changelog.rst
index ce639d2d3c8..eadfe81b5e8 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -31,5 +31,15 @@ Changelog
``openerp.exceptions.RedirectWarning``.
- Give a pair of new methods to ``res.config.settings`` and a helper to make
them easier to use: ``get_config_warning()``.
-- Path to webkit report files (field ``report_file``) must be writen with the
- Unix way (with ``/`` and not ``\``) \ No newline at end of file
+- Path to webkit report files (field ``report_file``) must be written the
+ Unix way (with ``/`` and not ``\``)
+
+
+`7.0`
+-----
+
+- Modules may now include an ``i18n_extra`` directory that will be treated like the
+ default ``i18n`` directory. This is typically useful for manual translation files
+ that are not managed by Launchpad's translation system. An example is l10n modules
+ that depend on ``l10n_multilang``.
+