Imported Upstream version 2.6.4

docs/man/upsd.users.txt

@@ -22,6 +22,7 @@ Here are some examples to get you started:
 	[admin]
 		password = mypass
 		actions = set
+		actions = fsd
 		instcmds = all
 
 	[pfy]
@@ -46,22 +47,23 @@ Set the password for this user.
 
 *actions*::
 
-Allow the user to do certain things with upsd.
-Valid actions are:
+Allow the user to do certain things with upsd.  To specify multiple
+actions, use multiple instances of the *actions* field.  Valid
+actions are:
 
 	SET;; change the value of certain variables in the UPS
 
 	FSD;; set the forced shutdown flag in the UPS.  This is 
 equivalent to an "on battery + low battery" situation for the purposes
 of monitoring.
-+
+
 The list of actions is expected to grow in the future.
 
 *instcmds*::
 
 Let a user initiate specific instant commands.  Use "ALL" to grant all
 commands automatically.  To specify multiple commands, use multiple
-instances of the instcmds field.  For the full list of what your UPS
+instances of the *instcmds* field.  For the full list of what your UPS
 supports, use "upscmd -l".
 +
 The +cmdvartab+ file supplied with the distribution contains a list