Merge remote-tracking branch 'origin/7.x-1.x' as this is where the development happened upstream

This branch will be deleted and we move everything to master.

Conflicts:
	HTPasswdSync.module
	README.txt

1 files changed, 31 insertions, 6 deletions

diff --git a/README.txt b/README.txt
index ef03a3f..0baf95b 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,16 @@
+Originally cloned from git://git.drupal.org/project/htpasswdsync.git
+
+Hosted at https://git.faster-it.com/drupal_htpasswdsync
+Mirrored at https://github.com/fasterit/drupal_htpasswdsync
+
+This is the Faster IT version of the htpasswdsync module for Drupal 7.
+We have applied patches and improved over the module hosted on drupal.org.
+Please review the git log for details.
 
 -- SUMMARY --
 
-The HTPasswd Sync module let you synchronize a htpasswd and a
-htgroup file with the user database.
+The HTPasswd Sync module let you synchronize a htpasswd and a htgroup file with
+the user database.
 
 For a full description of the module, visit the project page:
   http://drupal.org/project/htpasswdsync
@@ -10,14 +18,13 @@ For a full description of the module, visit the project page:
 To submit bug reports and feature suggestions, or to track changes:
   http://drupal.org/project/issues/htpasswdsync
 
-The way password are encrypted it only compatible with *nix version of Apache.
-
-
 -- REQUIREMENTS --
 
 The syncrhonization only happen on password change. Hence, this module shall be 
 installed before any user creation.
 
+You need to run the cron.php job on a regular basis to ensure old users are 
+properly cleaned up.
 
 -- INSTALLATION --
 
@@ -38,12 +45,28 @@ installed before any user creation.
   - htgroup file
   
     The file that will synchronize the roles.
+    
+  - password hashing algorithm
+    
+    Let you choose how the password is encrypted/hashed. There are two options
+    crypt and SHA-1.
+    Crypt works only on Un*x platforms. SHA-1 shall work on bother Windows 
+    based systems and Un*xes.
+    
+    WARNING: changing this value only change the way new or updated password
+             are hashed.
+             You will need to request you users to all change their password
+             if you want to migrate from one hash to another.
 
   - roles
   
     The roles you want to export in the htgroup file.
 
-
+  - overwrite
+  
+    Activate if you want to overwrite your htpassword file. I left inactive
+    htpasswdsync will try its best to keep old entries, but will only try.
+    
 -- CUSTOMIZATION --
 
 None.
@@ -59,3 +82,5 @@ None.
 
 Current maintainers:
 * Marc Furrer (m.fu) - http://drupal.org/user/310415
+* Stefan Wilhelm (7.x-xx) - http://drupal.org/user/1344522
+* Faster IT GmbH - https://www.faster-it.com