From 4339196e5231aa734a0154e2f4e88b2e54f27d48 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 2 Sep 2016 13:24:09 +0200
Subject: [IMP] support v10 manifest file naming convention

- As of v10, manifest files should be named `__manifest__.py`
- For backwards-compatibility, __openerp__.py manifest files
  will still be supported for the time being
- Limited refactoring, to add support for the 2 different
  naming conventions
- All textual references to __openerp_.py updated in
  documentation and examples
---
 doc/reference/guidelines.rst | 2 +-
 doc/reference/module.rst     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/reference')

diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index 5ae52963b42..8a1831c469d 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -95,7 +95,7 @@ The complete tree should look like
 
     addons/<my_module_name>/
     |-- __init__.py
-    |-- __openerp__.py
+    |-- __manifest__.py
     |-- controllers/
     |   |-- __init__.py
     |   |-- <inherited_module_name>.py
diff --git a/doc/reference/module.rst b/doc/reference/module.rst
index d4ce37a1862..010e10e2095 100644
--- a/doc/reference/module.rst
+++ b/doc/reference/module.rst
@@ -14,7 +14,7 @@ Manifest
 The manifest file serves to declare a python package as an Odoo module
 and to specify module metadata.
 
-It is a file called ``__openerp__.py`` and contains a single Python
+It is a file called ``__manifest__.py`` and contains a single Python
 dictionary, where each key specifies module metadatum.
 
 ::
-- 
cgit v1.2.3