[MERGE] Merged with main branch

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

addons/base_crypt/__openerp__.py

@@ -26,35 +26,34 @@
     "website" : "http://www.openerp.com",
     "category" : "Tools",
     "description": """
-Replaces cleartext passwords in the database with a secure hash
-===============================================================
-For your existing user base, the removal of the cleartext
-passwords occurs immediately when you instal base_crypt.
+Replaces cleartext passwords in the database with a secure hash.
+================================================================
 
-All passwords will be replaced by a secure, salted, cryptographic
-hash, preventing anyone from reading the original password in
-the database.
+For your existing user base, the removal of the cleartext passwords occurs 
+immediately when you instal base_crypt.
 
-After installing this module it won't be possible to recover a
-forgotten password for your users, the only solution is for an
-admin to set a new password.
+All passwords will be replaced by a secure, salted, cryptographic hash, 
+preventing anyone from reading the original password in the database.
 
-Security Warning
-++++++++++++++++
+After installing this module, it won't be possible to recover a forgotten password 
+for your users, the only solution is for an admin to set a new password.
+
+Security Warning:
+-----------------
 Installing this module does not mean you can ignore other security measures,
 as the password is still transmitted unencrypted on the network, unless you
 are using a secure protocol such as XML-RPCS or HTTPS.
+
 It also does not protect the rest of the content of the database, which may
 contain critical data. Appropriate security measures need to be implemented
 by the system administrator in all areas, such as: protection of database
-backups, system files, remote shell access, physical server access, etc.
+backups, system files, remote shell access, physical server access.
 
-Interation with LDAP authentication
-+++++++++++++++++++++++++++++++++++
+Interation with LDAP authentication:
+------------------------------------
 This module is currently not compatible with the ``user_ldap`` module and
 will disable LDAP authentication completely if installed at the same time.
-
-                    """,
+""",
     "depends" : ["base"],
     "data" : [],
     "auto_install": False,