From 840aed9b567c017dbc2f0b7648890c9084af7eec Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Tue, 28 Oct 2014 11:33:37 -0400
Subject: [PATCH] explain "none" admin role, bump wfpl

---
 admin_admins.html |    3 ++-
 code/wfpl         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin_admins.html b/admin_admins.html
index bf378e9..e803d83 100644
--- a/admin_admins.html
+++ b/admin_admins.html
@@ -23,11 +23,12 @@
 			<div class="field"><input type="text" name="username" value="~username attr~"></div>
 
 			<div class="caption">Password (case sensitive)</div>
-			<div class="field_notes">To disable this account, make this password blank.</div>
+			<div class="field_notes">If this is blank, the user will be unable to log in.</div>
 			<!--~editing {~--><div class="field_notes">Below you'll see only the encrypted version of the password. This is the only thing that's stored on the server, so if somebody has forgotten their password, the only thing that can be done about it is setting a new password using this field. If you do not edit this field, their password is unchanged.</div><!--~}~-->
 			<div class="field"><input type="text" name="password" value="~password attr~"></div>
 
 			<div class="caption">Role</div>
+			<div class="field_notes">Set to "None" to disable the account. This is useful if you might want to enable it again with the same password, since (unlike deleting the account) the password is preserved in the database.</div>
 			<div class="field"><select name="privs"><!--~privs options~--></select></div>
 
 			<div class="caption">&nbsp;</div>
diff --git a/code/wfpl b/code/wfpl
index c39c09f..5dfdf5f 160000
--- a/code/wfpl
+++ b/code/wfpl
@@ -1 +1 @@
-Subproject commit c39c09f1cbea5b19fea3b49adbe9b6dc311a1057
+Subproject commit 5dfdf5fa2c160a1223f6872b0219fab8c21dabf5
-- 
1.7.10.4