Bob reported a problem making the new site live:

	+-- Bob wrote
	| I don't know what I've done, but somehow I've broken the
	| update.pl script (I think).  On jmri.sf.net, it doesn't seem to
	| actually be doing the update to replace /site.new/ to / in the
	| various links.
	+--

The fix is to make docroot "/" in update.pl AND to modify
templates/[HFSL]* to not put explicit slashes after ${docroot}
so you don't end up with double slashes.

If you desire to have update.pl use a docroot of something other
than "/", you need to ensure that it explicitly ends in a slash,
such as
	$docroot = "/site.new/";

  -John

templates/Footer

@@ -2,12 +2,12 @@
     <hr class="hide">
     <div id="footer">
 	<ul id="bn">
-	<li><a href="${docroot}/sitemap/">Site Map</a></li>
-	<li><a href="${docroot}/contact/">Contact Us</a></li>
+	<li><a href="${docroot}sitemap/">Site Map</a></li>
+	<li><a href="${docroot}contact/">Contact Us</a></li>
 	</ul>
 
 	<p>Thanks and congratulations to
-	   <A href="${docroot}/community/" title="Who is JMRI">
+	   <A href="${docroot}community/" title="Who is JMRI">
 	   	all who contributed</A>! </p>
 
 	<p>Copyright &copy; 2003,2004 JMRI Community</p>

templates/Header

@@ -1,16 +1,16 @@
 <!-- Header -->
     <div id="header">
 	<!-- Logo -->
-	<a href="${docroot}/" title="Return to home page" accesskey="1">
-	    <img src="${docroot}/${logo}" width="160" height="135" alt=${logoalt}> </a>
+	<a href="${docroot}" title="Return to home page" accesskey="1">
+	    <img src="${docroot}${logo}" width="160" height="135" alt=${logoalt}> </a>
 	<!-- /Logo -->
 	<ul id="mainNav"> <!-- Top tool bar -->
-	   <li><a href="${docroot}/download/"  title="Get the latest software">Download</a></li>
-	   <li><a href="${docroot}/apps/"      title="Learn about JMRI applications">Applications</a></li>
-	   <li><a href="${docroot}/hardware/"  title="What hardware does JMRI support">Hardware</a></li>
-	   <li><a href="${docroot}/doc/Manual/"   title="Trouble-shooting, and FAQs">Manual</a></li>
-	   <li><a href="${docroot}/doc/Technical/" title="Developing and extending JMRI">Developers</a></li>
-	   <li><A href="${docroot}/community/" title="Who is JMRI">Acknowledgements</a></li>
+	   <li><a href="${docroot}download/"  title="Get the latest software">Download</a></li>
+	   <li><a href="${docroot}apps/"      title="Learn about JMRI applications">Applications</a></li>
+	   <li><a href="${docroot}hardware/"  title="What hardware does JMRI support">Hardware</a></li>
+	   <li><a href="${docroot}doc/Manual/"   title="Trouble-shooting, and FAQs">Manual</a></li>
+	   <li><a href="${docroot}doc/Technical/" title="Developing and extending JMRI">Developers</a></li>
+	   <li><A href="${docroot}community/" title="Who is JMRI">Acknowledgements</a></li>
 	</ul>
 
 	<div id="searchform"> <!--  Search Form -->

templates/Logo

@@ -1,4 +1,4 @@
 <!-- Logo -->
-    <a href="${docroot}/" title="Return to home page" accesskey="1">
-	<img src="${docroot}/${logo}" width="160" height="135" alt=${logoalt}> </a>
+    <a href="${docroot}" title="Return to home page" accesskey="1">
+	<img src="${docroot}${logo}" width="160" height="135" alt=${logoalt}> </a>
 <!-- /Logo -->

templates/Style

@@ -1,7 +1,7 @@
 <!-- Style -->
   <META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-  <link rel="stylesheet" type="text/css" href="${docroot}/css/default.css" media="screen">
-  <link rel="stylesheet" type="text/css" href="${docroot}/css/print.css" media="print">
-  <link rel="icon" href="${docroot}/images/jmri.ico" type="image/png">
-  <link rel="home" title="Home" href="${docroot}/">
+  <link rel="stylesheet" type="text/css" href="${docroot}css/default.css" media="screen">
+  <link rel="stylesheet" type="text/css" href="${docroot}css/print.css" media="print">
+  <link rel="icon" href="${docroot}images/jmri.ico" type="image/png">
+  <link rel="home" title="Home" href="${docroot}">
 <!-- /Style -->

update.pl

@@ -6,10 +6,10 @@
 $dir=".";	# start in current directory...
 
 # $docroot="/trains/JMRI/site.new";
-$docroot="/site.new";
+$docroot="/";
 $logoalt = "\"JMRI Logo\"";
-# absolute path from docroot...
-$logo = "/images/logo-jmri.gif";
+# absolute path from docroot, without the leading slash...
+$logo = "images/logo-jmri.gif";
 
 $TDIR="./templates";