diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index 11d4259e6a886f6b911d994bfb41f17718b16997..3e241967820b7a8b9a9387a5f9f2620923332503 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -179,6 +179,21 @@ The entity used to group information consisting of four parameters:
The \fIClusterName\fR parameter in the \fIslurm.conf\fR configuration
file, used to differentiate accounts from on different machines.
+.TP
+\fIcoordinator\fR
+A special priviaged user usually an account manager or such that can
+add users or sub accounts to the account they are coordinator over.
+This should be a trusted person since they can change limits on
+account and user associations inside their realm.
+
+.TP
+\fIqos\fR
+Quality of Service (For use with MOAB only).
+
+.TP
+\fItransaction\fR
+List of transactions that have occured during a given time period.
+
.TP
\fIuser\fR
The login name.
@@ -188,6 +203,7 @@ The login name.
.TP
\fICluster\fP=<cluster>
Specific cluster to add account to. Default is all in system.
+.TP
\fIDescription\fP=<description>
An arbitrary string describing an account.
.TP
@@ -279,6 +295,24 @@ Quality of Service jobs are to run at for this account. Now consisting
of Normal, Standby, Expedite, and Exempt.
This is overridden if set directly on an account or user.
+.TP
+\fBSPECIFICATIONS FOR COORDINATOR\fR
+.TP
+\fIAccountsfP=<comma separated list of account names>
+Account name to add this user as a coordinator to.
+.TP
+\fINames\fP=<comma separated list of user names>
+Names of coordinators.
+
+.TP
+\fBSPECIFICATIONS FOR QOS\fR
+.TP
+\fIDescription\fP=<description>
+An arbitrary string describing an account.
+.TP
+\fINames\fP=<qos>
+Names of qos.
+
.TP
\fBSPECIFICATIONS FOR USERS\fR
.TP
diff --git a/src/sacctmgr/sacctmgr.c b/src/sacctmgr/sacctmgr.c
index 489ff049d5fc70b3426727563f065bfd5e90bc70..600001ef35f8459e39d1d3a28e5b777d0057960f 100644
--- a/src/sacctmgr/sacctmgr.c
+++ b/src/sacctmgr/sacctmgr.c
@@ -628,7 +628,8 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\
version display tool version number. \n\
!! Repeat the last command entered. \n\
\n\
- <ENTITY> may be \"cluster\", \"account\", \"user\", of \"coordinator\". \n\
+ <ENTITY> may be \"account\", \"association\", \"cluster\", \n\
+ \"coordinator\", \"qos\", \"transaction\", or \"user\". \n\
\n\
<SPECS> are different for each command entity pair. \n\
list account - Clusters=, Descriptions=, Format=, Names=, \n\
@@ -655,6 +656,16 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\
(where options) Names= \n\
delete cluster - Names= \n\
\n\
+ add coordinator - Accounts=, and Names= \n\
+ delete coordinator - Accounts=, and Names= \n\
+ \n\
+ list qos - Descriptions=, Ids=, Names=, and WithDeleted \n\
+ add qos - Description=, and Names= \n\
+ delete qos - Descriptions=, Ids=, and Names= \n\
+ \n\
+ list transactions - Actor=, EndTime, \n\
+ Format=, ID=, and Start= \n\
+ \n\
list user - AdminLevel=, DefaultAccounts=, Format=, Names=,\n\
QosLevel=, and WithAssocs \n\
add user - Accounts=, AdminLevel=, Clusters=, \n\
@@ -670,8 +681,24 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\
delete user - Accounts=, AdminLevel=, Clusters=, \n\
DefaultAccounts=, and Names= \n\
\n\
- add coordinator - Accounts=, and Names= \n\
- delete coordinator - Accounts=, and Names= \n\
+ Format options are different for listing each entity pair. \n\
+ \n\
+ Account - Account, Cluster, CoordinatorList, \n\
+ Description, Organization, QOS, QOSRAW \n\
+ \n\
+ Association - Account, Cluster, Fairshare, ID, LFT, \n\
+ MaxCPUSecs, MaxJobs, MaxNodes, MaxWall, \n\
+ ParentID, ParentName, Partition, RGT, User \n\
+ \n\
+ Cluster - Cluster, ControlHost, ControlPort, Fairshare \n\
+ MaxCPUSecs, MaxJobs, MaxNodes, MaxWall \n\
+ \n\
+ QOS - Description, ID, Name \n\
+ \n\
+ Transactions - Action, Actor, ID, Info, TimeStamp, Where \n\
+ \n\
+ User - Account, AdminLevel, Cluster, CoordinatorList, \n\
+ DefaultAccount, QOS, QOSRAW, User \n\
\n\
\n\
All commands entitys, and options are case-insensitive. \n\n");
diff --git a/src/sacctmgr/txn_functions.c b/src/sacctmgr/txn_functions.c
index 028f4127349b923ad3da41c3712b5c94e7d5ba72..8d423b61ee5a2a921dc9c04f1c425904f4548c20 100644
--- a/src/sacctmgr/txn_functions.c
+++ b/src/sacctmgr/txn_functions.c
@@ -78,9 +78,15 @@ static int _set_cond(int *start, int argc, char *argv[],
if(slurm_addto_char_list(txn_cond->actor_list,
argv[i]+end))
set = 1;
+ } else if (!strncasecmp (argv[i], "End", 1)) {
+ txn_cond->time_end = parse_time(argv[i]+end);
+ set = 1;
} else if (!strncasecmp (argv[i], "Format", 1)) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
+ } else if (!strncasecmp (argv[i], "Start", 1)) {
+ txn_cond->time_start = parse_time(argv[i]+end);
+ set = 1;
} else {
exit_code=1;
fprintf(stderr, " Unknown condition: %s\n", argv[i]);