8 files changed, 41 insertions, 30 deletions
diff --git a/index.html b/index.html
index 40778d4..6aa6eba 100644
--- a/index.html
+++ b/index.html
@@ -20,7 +20,7 @@
 <p>The <a href='http://www.pool.ntp.org'>NTP Pool</a> project is a big virtual cluster of time servers providing reliable, easy to use NTP service for millions of clients.</p>
 <p>The pool is being used by millions or tens of millions of systems around the world. It's the default "time server" for most of the major Linux distributions and many networked appliances.</p>
 <h2>Server Status</h2>
- <p>These servers should be reliable sources of time for your systems; you may view the system's current status by choosing a graph below, or going to the <a href='http://time.mattrude.com/status/'>cluster status page</a>.
+ <p>These servers should be reliable sources of time for your systems; you may view the system's current status by choosing a graph below, or going to the <a href='http://time.mattrude.com/status/'>cluster status page</a>.</p>
 <p>These servers are running as <a href='http://en.wikipedia.org/wiki/Network_Time_Protocol#Clock_strata'>stratum 2</a> time servers, with a maximum offset of 10ms.</p>
 <div class="graphs center" id='graphs'>
 <a href="/status/kirby.mattrude.com/"><img src='/bin/graphs-kirby.mattrude.com.cgi?0-clients-small' alt='kirby status' height='184px' width='393px' /></a>
diff --git a/scripts/build-site.sh b/scripts/build-site.sh
index 00feddb..2c4f02d 100755
--- a/scripts/build-site.sh
+++ b/scripts/build-site.sh
@@ -12,10 +12,10 @@ cd $ROOT
 rm -f $ROOT/readme.tmp $TEMPLATESDIR/readme.html
 markdown $ROOT/README.md > $ROOT/readme.tmp
 cat $TEMPLATESDIR/head > $DOCUMENTSDIR/readme.html
-echo " <div id="title">
+echo " <div id='title'>
 <h1>time.mattrude.com <i>&mdash; Readme File</i></h1>
 </div>
- <p> <a href="/">time.mattrude.com</a> / <a href="/documentation/">documentation</a> / <strong>readme</strong> / </p>" >> $DOCUMENTSDIR/readme.html
+ <p> <a href='/'>time.mattrude.com</a> / <a href='/documentation/'>documentation</a> / <strong>readme</strong> / </p>" >> $DOCUMENTSDIR/readme.html
 cat $ROOT/readme.tmp $TEMPLATESDIR/tail >> $DOCUMENTSDIR/readme.html
 rm -f $ROOT/readme.tmp
 
@@ -38,7 +38,7 @@ echo "<h2>Time Server Hosts</h2>
 <ul>" >> out.template
 for X in `cat $ROOT/rrd/list-of-systems`
 do
- echo "<li><a href=/status/$X/>$X</a>" >> out.template
+ echo "<li><a href='/status/$X/'>$X</a></li>" >> out.template
 done
 echo "</ul>" >> out.template
 
@@ -63,7 +63,7 @@ do
 do
 mkdir -p $POOLPAGE/$X/$a
 cat /dev/null > out.template
- sed -e s/POOL/$X/g $TEMPLATESDIR/template-by-type |sed -e s/TYPE/$a/g >> out.template
+ sed -e s/POOL/$X/g $TEMPLATESDIR/template-by-type |sed -e s/###TYPE###/$a/g >> out.template
 sync
 cat out.template $TEMPLATESDIR/tail > $X/$a/index.html
 rm -f out.template
diff --git a/scripts/templates/head b/scripts/templates/head
index aea73ea..cc9a067 100644
--- a/scripts/templates/head
+++ b/scripts/templates/head
@@ -1,9 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>time.mattrude.com :: Time Server Status Page</title>
 <link rel="stylesheet" type="text/css" href="/style.css"/>
 <link rel="icon" href="/favicon.ico" type="image/x-icon" />
 </head>
-<html>
 <body>
 <div id="content">
 <div id="primary" class="main">
diff --git a/scripts/templates/index-head b/scripts/templates/index-head
index 8b78813..5749f54 100644
--- a/scripts/templates/index-head
+++ b/scripts/templates/index-head
@@ -1,9 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>time.mattrude.com :: Time Server Status Page</title>
 <link rel="stylesheet" type="text/css" href="/style.css"/>
 <link rel="icon" href="/favicon.ico" type="image/x-icon" />
 </head>
-<html>
 <body>
 <div id="content">
 <div id="primary" class="main">
diff --git a/scripts/templates/tail b/scripts/templates/tail
index 7df31a4..70dc804 100644
--- a/scripts/templates/tail
+++ b/scripts/templates/tail
@@ -1,4 +1,3 @@
-<p>
 </div>
 <div id="footer">
 <div class="footer-left">
diff --git a/scripts/templates/template b/scripts/templates/template
index 1f9c5ca..16a8159 100644
--- a/scripts/templates/template
+++ b/scripts/templates/template
@@ -1,4 +1,4 @@
 <h2>Time Server: POOL</h2>
-<div id="graphs" class="center">
- <p><center><a href="/status/POOL/"><img src="/bin/graphs-POOL.cgi?0-offset"></a></center></p>
+<div class="center">
+ <p><a href="/status/POOL/"><img src="/bin/graphs-POOL.cgi?0-offset" alt="POOL offsite" /></a></p>
 </div>
diff --git a/scripts/templates/template-by-type b/scripts/templates/template-by-type
index a247234..0a8a28b 100644
--- a/scripts/templates/template-by-type
+++ b/scripts/templates/template-by-type
@@ -1,34 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
- <title>time.mattrude.com :: POOL:TYPE Time Server Status Page</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>time.mattrude.com :: POOL:###TYPE### Time Server Status Page</title>
 <link rel="stylesheet" type="text/css" href="/style.css"/>
 <link rel="icon" href="/favicon.ico" type="image/x-icon" />
 </head>
-<html>
 <body>
 <div id="content">
 <div id="primary" class="main">
 <div id="title">
- <h1>time.mattrude.com <i>&mdash; POOL, TYPE Server Status</i></h1>
+ <h1>time.mattrude.com <i>&mdash; POOL, ###TYPE### Server Status</i></h1>
 </div>
-<p><a href="/">time.mattrude.com</a> / <a href="/status/">status</a> / <a href="/status/POOL/">POOL</a> / <strong>TYPE</strong></p>
+<p><a href="/">time.mattrude.com</a> / <a href="/status/">status</a> / <a href="/status/POOL/">POOL</a> / <strong>###TYPE###</strong></p>
 
-<h2>Host POOL, TYPE Daily Status</h2>
+<h2>Host POOL, ###TYPE### Daily Status</h2>
 <div class="center">
- <p><img src="/bin/graphs-POOL.cgi?0-TYPE"></p>
+ <p><img src="/bin/graphs-POOL.cgi?0-###TYPE###" alt="Daily for POOL ###TYPE###" /></p>
 </div>
 
-<h2>Host POOL, TYPE Weekly Status</h2>
+<h2>Host POOL, ###TYPE### Weekly Status</h2>
 <div class="center">
- <p><img src="/bin/graphs-POOL.cgi?1-TYPE"></p>
+ <p><img src="/bin/graphs-POOL.cgi?1-###TYPE###" alt="Weekly for POOL ###TYPE###" /></p>
 </div>
 
-<h2>Host POOL, TYPE Monthly Status</h2>
+<h2>Host POOL, ###TYPE### Monthly Status</h2>
 <div class="center">
- <p><img src="/bin/graphs-POOL.cgi?2-TYPE"></p>
+ <p><img src="/bin/graphs-POOL.cgi?2-###TYPE###" alt="Monthly for POOL ###TYPE###" /></p>
 </div>
 
-<h2>Host POOL, TYPE Yearly Status</h2>
+<h2>Host POOL, ###TYPE### Yearly Status</h2>
 <div class="center">
- <p><img src="/bin/graphs-POOL.cgi?3-TYPE"></p>
+ <p><img src="/bin/graphs-POOL.cgi?3-###TYPE###" alt="Yearly for POOL ###TYPE###" /></p>
 </div>
 <br />
diff --git a/scripts/templates/template-host b/scripts/templates/template-host
index 4feedcd..31612db 100644
--- a/scripts/templates/template-host
+++ b/scripts/templates/template-host
@@ -1,9 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>time.mattrude.com :: POOL Time Server Status Page</title>
 <link rel="stylesheet" type="text/css" href="/style.css"/>
 <link rel="icon" href="/favicon.ico" type="image/x-icon" />
 </head>
-<html>
 <body>
 <div id="content">
 <div id="primary" class="main">
@@ -25,11 +28,11 @@ disp total dispersion to the primary reference clock
 
 <h2>Host POOL, Daily Status</h2>
 <div id="graphs" class="center">
- <p><a href="/status/POOL/clients/"><img src="/bin/graphs-POOL.cgi?0-clients"></a></p>
- <p><a href="/status/POOL/offset/"><img src="/bin/graphs-POOL.cgi?0-offset"></a></p>
- <p><a href="/status/POOL/freq/"><img src="/bin/graphs-POOL.cgi?0-freq"></a></p>
- <p><a href="/status/POOL/sjit/"><img src="/bin/graphs-POOL.cgi?0-sjit"></a></p>
- <p><a href="/status/POOL/cjit/"><img src="/bin/graphs-POOL.cgi?0-cjit"></a></p>
- <p><a href="/status/POOL/wander/"><img src="/bin/graphs-POOL.cgi?0-wander"></a></p>
- <p><a href="/status/POOL/disp/"><img src="/bin/graphs-POOL.cgi?0-disp"></a></p>
+ <p><a href="/status/POOL/clients/"><img src="/bin/graphs-POOL.cgi?0-clients" alt="Clients" /></a></p>
+ <p><a href="/status/POOL/offset/"><img src="/bin/graphs-POOL.cgi?0-offset" alt="offset" /></a></p>
+ <p><a href="/status/POOL/freq/"><img src="/bin/graphs-POOL.cgi?0-freq" alt="freq" /></a></p>
+ <p><a href="/status/POOL/sjit/"><img src="/bin/graphs-POOL.cgi?0-sjit" alt="sjit" /></a></p>
+ <p><a href="/status/POOL/cjit/"><img src="/bin/graphs-POOL.cgi?0-cjit" alt="cjit" /></a></p>
+ <p><a href="/status/POOL/wander/"><img src="/bin/graphs-POOL.cgi?0-wander" alt="wander" /></a></p>
+ <p><a href="/status/POOL/disp/"><img src="/bin/graphs-POOL.cgi?0-disp" alt="disp" /></a></p>
 </div>