Index: bin/testenv
===================================================================
--- bin/testenv	(revision 4173)
+++ bin/testenv	(working copy)
@@ -285,44 +285,128 @@
 	<title>TWiki Test Environment</title>
 	<style type="text/css" media="all">
 		html body {
-			line-height:1.55em;
-			font-family:Avenir, "Lucida Grande", "Bitstream Vera Sans", lucida, arial, verdana, sans-serif;
-			background-color:#C3C3C3;
+			line-height:1.45em; /*C10*/
+			font-family:"Lucida Grande", verdana, lucida, helvetica, sans-serif;
+			background-color:#f8f8f8; /*C7*/
 			margin:0;
 			padding:0;
 			font-size:x-small;
+			voice-family:"\"}\""; 
+			voice-family:inherit;
 			font-size:small;
 		}
+		h1, h2, h3, h4, h5, h6 {
+			font-family:"Lucida Grande", helvetica, lucida, verdana, sans-serif;
+			line-height:104%;
+			padding:0;
+			margin:1em 0 0.1em 0;
+		}
 		h1 {
-		font-size:210%;
-		background-color:#C3C3C3;
-		padding:0.2em 0.7em;
-		color:#C90000;
-		margin:1em -0.7em 0.15em -0.7em;
+			font-size:210%;
+			color:#e24628;
+			margin:0 0 0.1em 0;
+			padding:1em;
 		}
+		h2, h3, h4, h5, h6 {color:#900;} /*C5*/
 		h2 {
-		background-color:#F0F0F0;
-		padding:0.2em 0.7em;
+			font-size:145%;
+			display:block;
+			background-color:#F3EDE7; /*C8*/
+			padding:0.2em 0.7em;
+			margin:1em -0.7em 0.15em -0.7em;
+			height:auto;
 		}
-		.twikiMain {
+		h3 { font-size:140%;}
+		h4 { font-size:125%;}
+		h5 { font-size:110%;}
+		h6 { font-size:95%;}
+		
+		/* Links */
+		
+		:link:focus,
+		:visited:focus,
+		:link,
+		:visited,
+		:link:active,
+		:visited:active {
+			text-decoration:none;
+			color:#1559B3; /*C1*/;
+			background-color:transparent;
+		}
+		:link:hover,
+		:visited:hover {
+			text-decoration:underline;
+			color:#0F47A3; /*C3*/
+			background-color:#b4d5ff; /*C2*/
+		}
+		
+		th a:link font,
+		th a:visited font {}
+		th a:hover font,
+		th a:hover font {
+			color:#0F47A3; /*C3*/
+		}
+		.twikiMain {	
 			padding:0em 3.5em 2em;
 			margin-top:2.5em;
 			margin-right:2.5em;
 			margin-left:2.5em;
 			margin-bottom:2.5em;
 			background-color:white;
-			border-width:4px;
-			border-style:ridge;
-			border-color:#484848 #dddddd #818181 #A6A6A6;
+			border-width:1px;
+			border-style:solid;
+			border-color:#ddd #ddd #ddd #ddd;
 		}
+		/* Topic text */
+		
+		.twikiTopic {
+			padding-bottom:1.5em;
+			background-color:transparent;
+		}
+		.twikiTopic table {
+			width:auto;
+		}
+		.twikiTopic table th a:link,
+		.twikiTopic table th a:visited {
+			text-decoration:none;
+		}
+		.twikiTopic ul {
+			margin-top:0;
+			line-height:130%;
+		}
+		.twikiTopic a:link {
+			text-decoration:underline;
+		}
+		.twikiTopic a:visited {
+			text-decoration:underline;
+			color:#666;
+		}
+		.twikiTopic h1 a:link,
+		.twikiTopic h1 a:visited,
+		.twikiTopic h2 a:link,
+		.twikiTopic h2 a:visited {
+			text-decoration:none;
+			color:#1559B3; /*C1*/
+			border:none;
+			font-weight:bold;
+		}
+		.twikiTopic a:hover {
+			color:#0F47A3; /*C3*/
+		}
 	</style>
 </head>
 <body>
 <div class="twikiMain">
+<div class="twikiTopic">
 EOM
 #print $query->start_html("TWiki Diagnostic Environment"),
+<<<<<<< .mine
+print "<h1>TWiki Test Environment</h1>\n<ul>\n<li>Please read the <a href='http://TWiki.org/cgi-bin/view/TWiki/TWikiInstallationGuide'>TWikiInstallationGuide</a> for more information on TWiki installation.</li>\n<li>
+If your TWiki site is working, the front page should be <a href='view'>right here</a>.\n</li></ul>";
+=======
 print "<h1>TWiki Test Environment</h1>\n<small>Please read the <a href='http://TWiki.org/cgi-bin/view/TWiki/TWikiInstallationGuide'>TWikiInstallationGuide</a> for more information on TWiki installation.</small><br />
 If your TWiki site is working, the front page should be <a href='$cfg{ScriptUrlPath}/view$cfg{ScriptSuffix}'>right here</a>.";
+>>>>>>> .r4173
 
 # TWiki.cfg was read earlier, in BEGIN block.
 # Check for broken TWiki.cfg and report any Perl error(s)
@@ -1032,10 +1116,10 @@
 }
 
 print $query->end_table();
-print "</div><div class=\"twikiMain\">\n";
-print $query->h1("Complete list of configuration parameters"),
+print "</div></div><div class=\"twikiMain\"><div class=\"twikiTopic\">\n";
+print "<h1>Complete list of configuration parameters</h1>",
   explode(\%cfg);
-print "</div>\n";
+print "</div></div>\n";
 print $query->end_html();
 
 # End of code
@@ -1173,7 +1257,7 @@
 
 # both columns used to show a heading
 sub BIGHEAD {
-    BOTH("<hr /><h2>",join(" ",@_),"</h2>");
+    BOTH("<h2>",join(" ",@_),"</h2>");
 }
 
 # a note
Index: index.html
===================================================================
--- index.html	(revision 4173)
+++ index.html	(working copy)
@@ -1,57 +1,148 @@
 <!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>Welcome to TWiki - A Web-based Collaboration Platform</title>
- <style type="text/css" media="all">
+	<head>
+		<title>Welcome to TWiki - A Web-based Collaboration Platform</title>
+	<style type="text/css" media="all">
 		html body {
-			line-height:1.55em;
-			font-family:Avenir, "Lucida Grande", "Bitstream Vera Sans", lucida, arial, verdana, sans-serif;
-			background-color:#C3C3C3;
+			line-height:1.45em; /*C10*/
+			font-family:"Lucida Grande", verdana, lucida, helvetica, sans-serif;
+			background-color:#f8f8f8; /*C7*/
 			margin:0;
 			padding:0;
 			font-size:x-small;
+			voice-family:"\"}\""; 
+			voice-family:inherit;
 			font-size:small;
 		}
+		h1, h2, h3, h4, h5, h6 {
+			font-family:"Lucida Grande", helvetica, lucida, verdana, sans-serif;
+			line-height:104%;
+			padding:0;
+			margin:1em 0 0.1em 0;
+		}
 		h1 {
-		font-size:210%;
-		background-color:#C3C3C3;
-		padding:0.2em 0.7em;
-		color:#C90000;
-		margin:1em -0.7em 0.15em -0.7em;
+			font-size:210%;
+			color:#e24628;
+			margin:0 0 0.1em 0;
+			padding:1em;
 		}
-		.twikiToc li {
-			list-style-image:url(http://thetabase.net/twiki/pub/Main/PatternSkin/i_arrow_down.gif);
-		}	        
-		.twikiWebIndicator {
-			background-color:#D0d0d0;
+		h2, h3, h4, h5, h6 {color:#900;} /*C5*/
+		h2 {
+			font-size:145%;
+			display:block;
+			background-color:#F3EDE7; /*C8*/
+			padding:0.2em 0.7em;
+			margin:1em -0.7em 0.15em -0.7em;
+			height:auto;
 		}
-		.twikiMiddleContainer {}
-		.twikiMain {
-			padding:0em 3.5em;
-			margin-top:5em;
-			margin-right:10em;
-			margin-left:10em;
-			margin-bottom:5em;
+		h3 { font-size:140%;}
+		h4 { font-size:125%;}
+		h5 { font-size:110%;}
+		h6 { font-size:95%;}
+		
+		/* Links */
+		
+		:link:focus,
+		:visited:focus,
+		:link,
+		:visited,
+		:link:active,
+		:visited:active {
+			text-decoration:none;
+			color:#1559B3; /*C1*/;
+			background-color:transparent;
+		}
+		:link:hover,
+		:visited:hover {
+			text-decoration:underline;
+			color:#0F47A3; /*C3*/
+			background-color:#b4d5ff; /*C2*/
+		}
+		
+		th a:link font,
+		th a:visited font {}
+		th a:hover font,
+		th a:hover font {
+			color:#0F47A3; /*C3*/
+		}
+		.twikiMain {	
+			padding:0em 3.5em 2em;
+			margin-top:2.5em;
+			margin-right:2.5em;
+			margin-left:2.5em;
+			margin-bottom:0.5em;
 			background-color:white;
-			border-width:4px;
-			border-style:ridge;
-			border-color:#484848 #dddddd #818181 #A6A6A6;
+			border-width:1px;
+			border-style:solid;
+			border-color:#ddd #ddd #ddd #ddd;
 		}
-		</style>
-		<style type="text/css" media="all"></style>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-</head>
-<body class='twikiViewPage'>
-<div class="twikiMain">
- <h1>Welcome to TWiki</h1>
- <ul>
-  <li> <a href="readme.txt">readme.txt</a> </li>
-  <li> <a href="license.txt">license.txt</a> </li>
-  <li> <a href="TWikiDocumentation.html">TWikiDocumentation.html</a> </li>
-  <li> <a href="TWikiHistory.html">TWikiHistory.html</a> </li>
- </ul>
- <p><b>Note:</b> These pages do not need to be accessible by http. Access
- <tt>http://your.server.com/your-cgi-bin/view/Main/WebHome</tt> after you install TWiki</p>
-</div>
-</body>
+		/* Topic text */
+		
+		.twikiTopic {
+			padding-bottom:1.5em;
+			background-color:transparent;
+		}
+		.twikiTopic table {
+			width:auto;
+		}
+		.twikiTopic table th a:link,
+		.twikiTopic table th a:visited {
+			text-decoration:none;
+		}
+		.twikiTopic ul {
+			margin-top:0;
+			line-height:130%;
+		}
+		.twikiTopic a:link {
+			text-decoration:underline;
+		}
+		.twikiTopic a:visited {
+			text-decoration:underline;
+			color:#666;
+		}
+		.twikiTopic h1 a:link,
+		.twikiTopic h1 a:visited,
+		.twikiTopic h2 a:link,
+		.twikiTopic h2 a:visited {
+			text-decoration:none;
+			color:#1559B3; /*C1*/
+			border:none;
+			font-weight:bold;
+		}
+		.twikiTopic a:hover {
+			color:#0F47A3; /*C3*/
+		}
+	</style>
+		<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	</head>
+	<body class='twikiViewPage'>
+		<div class="twikiMain">
+		<div class="twikiTopic">
+			<h1>Welcome to TWiki</h1>
+			<h2><strong>A Web-based Collaboration Platform</strong></h2>
+			<strong>Documents:</strong>
+			<ul>
+				<li><a href="readme.txt">ReadMe:</a> A brief introduction to TWiki. </li>
+				<li><a href="LICENSE">License:</a> TWiki licensing related information.</li>
+				<li><a href="AUTHORS">Authors:</a> List of TWiki Contributors.</li>
+				<li><a href="COPYRIGHT">Copyright:</a> GNU General Public License Version 2, June 1991</li>
+				<li><a href="TWikiHistory.html">TWiki History:</a> A record of changes made to TWiki over the years. </li>
+				<li><a href="TWikiDocumentation.html"> TWiki Documentation:</a> Everything you need to know to install and use TWiki.</li>
+			</ul>
+			<strong>Notes:</strong>
+			<ul>
+				<li>These pages do not need to be accessible by your http server.</li>
+				<li>After your TWiki installation is complete you can access it with a URL similar to the example below:</li>
+				<li><tt>http://your.server.com/your-cgi-bin/view/Main/WebHome</tt></li>
+			</ul>
+		</div>
+		</div>
+		<p>
+			<ins>
+				<center>
+					<a href="http://twiki.org"><small><i>Powered by TWiki</i></small></a>
+				</center>
+			</ins>
+		</p>
+	</body>
 </html>

