[MERGE] Merged with main branch

bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2

addons/document/__openerp__.py

@@ -29,7 +29,7 @@ This is a complete document management system.
 ==============================================
 
     * User Authentication
-    * Document Indexation :- .pptx and .docx files are not supported in Windows platform.
+    * Document Indexation:- .pptx and .docx files are not supported in Windows platform.
     * Dashboard for Document that includes:
         * New Files (list)
         * Files by Resource Type (graph)
@@ -37,8 +37,8 @@ This is a complete document management system.
         * Files Size by Month (graph)
 
 ATTENTION:
-    - When you install this module in a running company that have already PDF files stored into the database,
-      you will lose them all.
+    - When you install this module in a running company that have already PDF 
+      files stored into the database, you will lose them all.
     - After installing this module PDF's are no longer stored into the database,
       but in the servers rootpad like /server/bin/filestore.
 """,

addons/document/nodes.py

@@ -375,7 +375,7 @@ class node_class(object):
         could do various things.
         Should also consider node<->content, dir<->dir moves etc.
 
-        Move operations, as instructed from APIs (eg. request from DAV) could
+        Move operations, as instructed from APIs (e.g. request from DAV) could
         use this function.
         """
         raise NotImplementedError(repr(self))