[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

9 files changed, 30 insertions, 30 deletions

diff --git a/addons/web/doc/addon-structure.txt b/addons/web/doc/addon-structure.txt
index 38151749651..19b38689641 100644
--- a/addons/web/doc/addon-structure.txt
+++ b/addons/web/doc/addon-structure.txt
@@ -1,5 +1,5 @@
 <addon name>
-  +-- __openerp__.py
+  +-- __manifest__.py
   +-- controllers/
   +-- static/
        +-- lib/
diff --git a/addons/web/doc/module.rst b/addons/web/doc/module.rst
index 7971a919780..ffbe90d0933 100644
--- a/addons/web/doc/module.rst
+++ b/addons/web/doc/module.rst
@@ -2,12 +2,12 @@
 
 .. queue:: module/series
 
-Building an OpenERP Web module
-==============================
+Building a Web module
+=====================
 
-There is no significant distinction between an OpenERP Web module and
-an OpenERP module, the web part is mostly additional data and code
-inside a regular OpenERP module. This allows providing more seamless
+There is no significant distinction between a Web module and
+a regular module, the web part is mostly additional data and code
+inside a regular module. This allows providing more seamless
 features by integrating your module deeper into the web client.
 
 A Basic Module
@@ -19,11 +19,11 @@ A very basic OpenERP module structure will be our starting point:
 
     web_example
     ├── __init__.py
-    └── __openerp__.py
+    └── __manifest__.py
 
 .. patch::
 
-This is a sufficient minimal declaration of a valid OpenERP module.
+This is a sufficient minimal declaration of a valid module.
 
 Web Declaration
 ---------------
@@ -36,7 +36,7 @@ module is automatically recognized as "web-enabled" if it contains a
 
     web_example
     ├── __init__.py
-    ├── __openerp__.py
+    ├── __manifest__.py
     └── static
 
 is the extent of it. You should also change the dependency to list
diff --git a/addons/web/doc/module/0 b/addons/web/doc/module/0
index 16762e1afd0..17b70a86197 100644
--- a/addons/web/doc/module/0
+++ b/addons/web/doc/module/0
@@ -3,12 +3,12 @@
 
 diff --git a/__init__.py b/__init__.py
 new file mode 100644
-diff --git a/__openerp__.py b/__openerp__.py
+diff --git a/__manifest__.py b/__manifest__.py
 new file mode 100644
 --- /dev/null
-+++ b/__openerp__.py
++++ b/__manifest__.py
 @@ -0,0 +1,7 @@
-+# __openerp__.py
++# __manifest__.py
 +{
 +    'name': "Web Example",
 +    'description': "Basic example of a (future) web module",
diff --git a/addons/web/doc/module/11 b/addons/web/doc/module/11
index fc4225afaa6..889ee98e801 100644
--- a/addons/web/doc/module/11
+++ b/addons/web/doc/module/11
@@ -1,8 +1,8 @@
 # HG changeset patch
 # Parent 3ed382d9a8fe64fbb8e2bf4045e3fcd5c74c92bc
-diff --git a/__openerp__.py b/__openerp__.py
---- a/__openerp__.py
-+++ b/__openerp__.py
+diff --git a/__manifest__.py b/__manifest__.py
+--- a/__manifest__.py
++++ b/__manifest__.py
 @@ -6,4 +6,5 @@
      'depends': ['web'],
      'data': ['web_example.xml'],
diff --git a/addons/web/doc/module/12 b/addons/web/doc/module/12
index 9a2982e7d20..85c931c33b2 100644
--- a/addons/web/doc/module/12
+++ b/addons/web/doc/module/12
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 43f21611dacb7c2b2f3810baeeef359ad7c329f0
 
-diff --git a/__openerp__.py b/__openerp__.py
---- a/__openerp__.py
-+++ b/__openerp__.py
+diff --git a/__manifest__.py b/__manifest__.py
+--- a/__manifest__.py
++++ b/__manifest__.py
 @@ -7,4 +7,5 @@
      'data': ['web_example.xml'],
      'js': ['static/src/js/first_module.js'],
diff --git a/addons/web/doc/module/2 b/addons/web/doc/module/2
index 08becf41602..7d8e9f05597 100644
--- a/addons/web/doc/module/2
+++ b/addons/web/doc/module/2
@@ -1,8 +1,8 @@
 # HG changeset patch
 # Parent 8a986919a3e22cd7cca51210820c09d4545dc60d
-diff --git a/__openerp__.py b/__openerp__.py
---- a/__openerp__.py
-+++ b/__openerp__.py
+diff --git a/__manifest__.py b/__manifest__.py
+--- a/__manifest__.py
++++ b/__manifest__.py
 @@ -3,5 +3,5 @@
      'name': "Web Example",
      'description': "Basic example of a (future) web module",
diff --git a/addons/web/doc/module/24 b/addons/web/doc/module/24
index 9dcf9e18cf5..0972e856042 100644
--- a/addons/web/doc/module/24
+++ b/addons/web/doc/module/24
@@ -1,7 +1,7 @@
-Index: web_example/__openerp__.py
+Index: web_example/__manifest__.py
 ===================================================================
---- web_example.orig/__openerp__.py
-+++ web_example/__openerp__.py
+--- web_example.orig/__manifest__.py
++++ web_example/__manifest__.py
 @@ -8,4 +8,5 @@
      'js': ['static/src/js/first_module.js'],
      'css': ['static/src/css/web_example.css'],
diff --git a/addons/web/doc/module/4 b/addons/web/doc/module/4
index 55535fe57da..99c073d672a 100644
--- a/addons/web/doc/module/4
+++ b/addons/web/doc/module/4
@@ -1,8 +1,8 @@
 # HG changeset patch
 # Parent 139dae60de67efa0017f5032f71ab774685c5507
-diff --git a/__openerp__.py b/__openerp__.py
---- a/__openerp__.py
-+++ b/__openerp__.py
+diff --git a/__manifest__.py b/__manifest__.py
+--- a/__manifest__.py
++++ b/__manifest__.py
 @@ -4,4 +4,5 @@
      'description': "Basic example of a (future) web module",
      'category': 'Hidden',
diff --git a/addons/web/doc/module/6 b/addons/web/doc/module/6
index f2c6a8762e7..3a1232fa51c 100644
--- a/addons/web/doc/module/6
+++ b/addons/web/doc/module/6
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 0026cb80097a724db8d36371bc00da993a51a06f
 
-diff --git a/__openerp__.py b/__openerp__.py
---- a/__openerp__.py
-+++ b/__openerp__.py
+diff --git a/__manifest__.py b/__manifest__.py
+--- a/__manifest__.py
++++ b/__manifest__.py
 @@ -4,5 +4,6 @@
      'description': "Basic example of a (future) web module",
      'category': 'Hidden',