diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index f8f9e6aab6104c25b96926071cf80e836b6eb2b1..420867c693e3cae6e9b5e166af4734fe4aae345e 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -2155,7 +2155,7 @@ The problem with DVS caching is related to the fact that the dereferenced value
 of /opt/slurm/default symlink is cached in the DVS attribute cache, and that
 cache is not dropped when the rest of the VM caches are.</p>
 
-<p>The Cray Native SLURM installation manual indicates that slurm should
+<p>The Cray Native Slurm installation manual indicates that slurm should
 have a "default" symlink run through /etc/alternatives.
 As an alternative to that:
 <ol>
diff --git a/doc/html/header.txt b/doc/html/header.txt
index f43f71f67246ad11d13854af6a643609585765f8..62b99c16dee1868b8f87450c1bc38aa170180fd0 100644
--- a/doc/html/header.txt
+++ b/doc/html/header.txt
@@ -6,10 +6,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management,
-Linux clusters, high-performance computing">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<title>Simple Linux Utility for Resource Management</title>
+<meta http-equiv="keywords" content="Slurm, Slurm Workload Manager,
+Simple Linux Utility for Resource Management, workload manager,
+resource management, Linux clusters, high-performance computing">
+<meta name="description" content="Slurm Workload Manager">
+<title>Slurm Workload Manager</title>
 <link href="linuxstyles.css" rel="stylesheet" type="text/css">
 <link href="slurmstyles.css" rel="stylesheet" type="text/css">
 <script src="http://www.google.com/jsapi" type="text/javascript"></script>
diff --git a/doc/html/mcs_plugins.shtml b/doc/html/mcs_plugins.shtml
index 125694905f902adb7be5ca5218700595a8d11332..ad4245bab7451577976c4d6f17f73275b22df443 100644
--- a/doc/html/mcs_plugins.shtml
+++ b/doc/html/mcs_plugins.shtml
@@ -9,7 +9,7 @@ defines them. It is intended as a resource to programmers wishing to write
 their own Slurm MCS plugins.
 
 <p>Slurm MCS plugins must conform to the
-SLURM Plugin API with the following specifications:
+Slurm Plugin API with the following specifications:
 
 <p><span class="commandline">const char
 plugin_name[]="<i>full&nbsp;text&nbsp;name</i>"</span>