diff --git a/NEWS b/NEWS
index 1aa92353c26dd45fec5f4081455f45ce76457998..bfe49b7d2c582f0d0259189731ac983130ccc1d7 100644
--- a/NEWS
+++ b/NEWS
@@ -182,6 +182,10 @@ documents those changes that are of interest to users and admins.
  -- Change message to note a NO_VAL for return code could of come from node
     failure as well as interactive user.
  -- Modify test4.5 to only look at one partition instead of all of them.
+ -- Fix sh5util -u to accept username different from the user that runs the
+    command.
+ -- Corrections to man pages:salloc.1 sbatch.1 srun.1 nonstop.conf.5
+    slurm.conf.5.
 
 * Changes in Slurm 14.03.4
 ==========================
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 975470f6bf27175ea2ae8bea735e8e73c6ce563c..ca17383bda49e1c144a84ada44eff59c4017c8a1 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -833,7 +833,7 @@ PerfCnts.  These nodes are still available for other jobs not using NPC.
 .br
 .br
 In all cases the job allocation request \fBmust specify the
---exclusive option\fR.  Otherwise the request will be denied.
+\-\-exclusive option\fR.  Otherwise the request will be denied.
 
 .br
 .br
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 0f68d707f56edaacb5ce46e2bf6f90cae836367f..d00b4dd45904a786dba75f1d8f5bf06da6c29522 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -920,7 +920,7 @@ PerfCnts.  These nodes are still available for other jobs not using NPC.
 .br
 .br
 In all cases the job allocation request \fBmust specify the
---exclusive option\fR.  Otherwise the request will be denied.
+\-\-exclusive option\fR.  Otherwise the request will be denied.
 
 .br
 .br
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 819655c0cd83a32b6b53bc549b9a86e62d756742..9aa36fda058ab101db5fc4dfe1ab787bee9c1993 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -1037,7 +1037,7 @@ PerfCnts.  These nodes are still available for other jobs not using NPC.
 .br
 .br
 In all cases the job or step allocation request \fBmust specify the
---exclusive option\fR.  Otherwise the request will be denied.
+\-\-exclusive option\fR.  Otherwise the request will be denied.
 
 .br
 .br
diff --git a/doc/man/man5/nonstop.conf.5 b/doc/man/man5/nonstop.conf.5
index 8d4a0d2434ba53576064104454822ed5a7d47a89..a9b36c467bc7c4c14e8086661c5c0c075695f4ea 100644
--- a/doc/man/man5/nonstop.conf.5
+++ b/doc/man/man5/nonstop.conf.5
@@ -71,7 +71,7 @@ secure replacement resources up to the number of minutes specified by
 \fBTimeLimitDelay\fR.
 This option will only take effect if no hot spare resouces are available at
 the time replacement resources are requested.
-This time limit extention is in addition to the value calculated using the
+This time limit extension is in addition to the value calculated using the
 \fBTimeLimitExtend\fR.
 The default value is zero (no time limit extension).
 The value may not exceed 65533 seconds.
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index b76cbb64d23b3893d11dec29269456faef1fb1ad..0192078dfae9b1035d577c9dfa31c985b318ae2e 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -947,7 +947,7 @@ Arbitrary parameters for the job account gather plugin
 Acceptable values at present include:
 .RS
 .TP 20
-fB\NoShared\fR
+\fBNoShared\fR
 Exclude shared memory from accounting.
 .RE
 
@@ -3549,7 +3549,7 @@ described above.
 
 .TP
 \fBAllowQos\fR
-Comma seperated list of Qos which may execute jobs in the partition.
+Comma separated list of Qos which may execute jobs in the partition.
 Jobs executed as user root can use any partition without regard to
 the value of AllowQos.
 The default value is "ALL".
@@ -3597,14 +3597,14 @@ not be stored, just collected).
 
 .TP
 \fBDenyAccount\fR
-Comma seperated list of accounts which may not execute jobs in the partition.
+Comma separated list of accounts which may not execute jobs in the partition.
 By default, no accounts are denied access
 \fBNOTE:\fR If AllowAccounts is used then DenyAccounts will not be enforced.
 Also refer to AllowAccount.
 
 .TP
 \fBDenyQos\fR
-Comma seperated list of Qos which may not execute jobs in the partition.
+Comma separated list of Qos which may not execute jobs in the partition.
 By default, no QOS are denied access
 \fBNOTE:\fR If AllowQos is used then DenyQos will not be enforced.
 Also refer AllowQos.
diff --git a/src/plugins/acct_gather_profile/hdf5/sh5util/sh5util.c b/src/plugins/acct_gather_profile/hdf5/sh5util/sh5util.c
index 838b752d85f34da0e319772ef6485cb4c34fe385..181dfa21950c9905e38682b3ff64a52138a6e018 100644
--- a/src/plugins/acct_gather_profile/hdf5/sh5util/sh5util.c
+++ b/src/plugins/acct_gather_profile/hdf5/sh5util/sh5util.c
@@ -299,7 +299,7 @@ static int _set_options(const int argc, char **argv)
 
 	_init_opts();
 
-	while ((cc = getopt_long(argc, argv, "d:Ehi:Ij:l:N:o:p:s:S:uUvV",
+	while ((cc = getopt_long(argc, argv, "d:Ehi:Ij:l:N:o:p:s:S:u:UvV",
 	                         long_options, &option_index)) != EOF) {
 		switch (cc) {
 			case 'd':
@@ -351,11 +351,11 @@ static int _set_options(const int argc, char **argv)
 				params.keepfiles = 1;
 				break;
 			case 'u':
-				u = atoi(optarg);
 				if (uid_from_string(optarg, &u) < 0) {
 					error("No such user --uid=\"%s\"", optarg);
 					return -1;
 				}
+				params.user = uid_to_string(u);
 				break;
 			case 'U':
 				_help_msg();