diff --git a/doc/html/troubleshoot.shtml b/doc/html/troubleshoot.shtml
index ca70de9f0aeb397a50bfc8337cbd57a5f5f0f71c..265b4dae36bb9d200b93c5bf6160b63792c4fb41 100644
--- a/doc/html/troubleshoot.shtml
+++ b/doc/html/troubleshoot.shtml
@@ -47,7 +47,7 @@ cluster.</li>
 to rule out <a href="#network">network and configuration problems</a>.</li>
 
 <li>If still not responding, check if there is an active slurmctld
-dameon by executing "<i>ps -el | grep slurmctld</i>".</li>
+daemon by executing "<i>ps -el | grep slurmctld</i>".</li>
 
 <li>If slurmctld is not running, restart it (typically as user root
 using the command "<i>/etc/init.d/slurm start</i>").
diff --git a/doc/man/man1/sinfo.1 b/doc/man/man1/sinfo.1
index 2ee38b63f2d231fc6b1a858263ae30490883aba3..8ab2fe0d9815d50395f4d80a81f6c572788302a2 100644
--- a/doc/man/man1/sinfo.1
+++ b/doc/man/man1/sinfo.1
@@ -228,7 +228,7 @@ Print the user name of who set the reason a node is unavailable.
 Print the user name and uid of who set the reason a node is unavailable.
 .TP
 \fB%v\fR
-Print the version of the running slurmd dameon.
+Print the version of the running slurmd daemon.
 .TP
 \fB%w\fR
 Scheduling weight of the nodes
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 722fcce26a86ad2ae61b9013dad1901547a703d1..a3ce5b71f2f9b78eb395667e483b81ae39f0f543 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -1573,7 +1573,7 @@ the job.  This limits \fBsrun's\fR behavior to just return
 information; no job is actually submitted.
 EXCEPTION: On Bluegene/Q systems on when running within an existing job
 allocation, this disables the use of "runjob" to launch tasks. The program
-will be executed directly by the slurmd dameon.
+will be executed directly by the slurmd daemon.
 
 .TP
 \fB\-\-threads\-per\-core\fR=<\fIthreads\fR>
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 928018659ae493e6fa4005efaf3c02bbaff92ee3..82a0f4f34f33820986e79a8aba2272910acfae4b 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -715,7 +715,7 @@ See \fBProlog and Epilog Scripts\fR for more information.
 .TP
 \fBEpilogMsgTime\fR
 The number of microseconds that the slurmctld daemon requires to process
-an epilog completion message from the slurmd dameons. This parameter can
+an epilog completion message from the slurmd daemons. This parameter can
 be used to prevent a burst of epilog completion messages from being sent
 at the same time which should help prevent lost messages and improve
 throughput for large jobs.
diff --git a/testsuite/expect/test7.17.prog.c b/testsuite/expect/test7.17.prog.c
index b8ddc48e2f174768eafab2db87e6b6a593c06840..bcc7ea5d517d9087ca180f04876571ca9bc499ab 100644
--- a/testsuite/expect/test7.17.prog.c
+++ b/testsuite/expect/test7.17.prog.c
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 	log_init(argv[0], opts, SYSLOG_FACILITY_USER, NULL);
 
 	/*
-	 * Logic normally executed by slurmd dameon
+	 * Logic normally executed by slurmd daemon
 	 */
 	rc = gres_plugin_init();
 	if (rc != SLURM_SUCCESS) {
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 	}
 
 	/*
-	 * Logic normally executed by slurmctld dameon
+	 * Logic normally executed by slurmctld daemon
 	 */
 	/* FIXME: Read values from slurm.conf */
 	orig_config = "craynetwork:4";