diff --git a/www/about.html b/www/about.html
index 3f3e964ea71dd0d9657d7acaa8dc3d4f10ff0c6f..9a00ce14d65e458b0cb9aaaa1eb67af501117540 100644
--- a/www/about.html
+++ b/www/about.html
@@ -21,7 +21,7 @@
 <div id="mainmenu" class="nav">
     <ul>
         <li><a accesskey="n" href="index.html">Home</a></li>
-        <li><a href="doc.html">Documentation</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
         <li><a accesskey="d" href="download.html">Download</a></li>
         <li><a accesskey="f" href="faq.html">FAQ</a></li>
         <li><a accesskey="h" href="help.html">Help</a></li>
diff --git a/www/download.html b/www/download.html
index 035268e4f47b6c957bbe60b386bf3aae99c14fea..d294c69a78edaa0b1efe22c2384b88cbe1e2d170 100644
--- a/www/download.html
+++ b/www/download.html
@@ -24,7 +24,7 @@
 <div id="mainmenu" class="nav">
     <ul>
         <li class="first"><a accesskey="n" href="index.html">Home</a></li>
-        <li><a accesskey="k" href="doc.html">Documentation</a></li>
+        <li><a accesskey="k" href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
         <li class="active"><a accesskey="d" href="download.html">Download</a></li>
         <li><a accesskey="f" href="faq.html">FAQ</a></li>
         <li><a accesskey="h" href="help.html">Help</a></li>
diff --git a/www/faq.html b/www/faq.html
index d0703cd34f10ec70d2e7e1cb0a39b7ea847805c6..e03173cbb52334cfb0d6b2c27dd77ecf230eae50 100644
--- a/www/faq.html
+++ b/www/faq.html
@@ -24,7 +24,7 @@
 <div id="mainmenu" class="nav">
     <ul>
         <li><a accesskey="n" href="index.html">Home</a></li>
-        <li><a href="doc.html">Documentation</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
         <li><a accesskey="d" href="download.html">Download</a></li>
         <li class="active first"><a accesskey="f" href="faq.html">FAQ</a></li>
         <li><a accesskey="h" href="help.html">Help</a></li>
diff --git a/www/help.html b/www/help.html
index d5a2c67063f46889e088b59efaeb3f3e2af1c49c..f07c535e253ab93d09ce786018d598e96388c02d 100644
--- a/www/help.html
+++ b/www/help.html
@@ -24,7 +24,7 @@
 <div id="mainmenu" class="nav">
     <ul>
         <li class="first"><a accesskey="n" href="index.html">Home</a></li>
-        <li><a href="doc.html">Documentation</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
         <li><a accesskey="d" href="download.html">Download</a></li>
         <li><a accesskey="f" href="faq.html">FAQ</a></li>
         <li class="active"><a accesskey="h" href="help.html">Help</a></li>
diff --git a/www/index.html b/www/index.html
index 5af9911b23877ddc7125b14f76e192991241f4cc..e6d5a147a4739613a919e2cf28eb56e6d6163002 100644
--- a/www/index.html
+++ b/www/index.html
@@ -23,7 +23,7 @@
  <div id="mainmenu" class="nav">    
   <ul>        
     <li class="active first"><a accesskey="n" href="index.html">Home</a></li>        
-    <li><a href="doc.html">Documentation</a></li>        
+    <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>        
     <li><a accesskey="d" href="download.html">Download</a></li>        
     <li><a accesskey="f" href="faq.html">FAQ</a></li>        
     <li><a accesskey="h" href="help.html">Help</a></li>        
@@ -90,7 +90,7 @@ Smartmontools can also be run from one of many different <a href="faq.html#boota
 CDs or floppies</a>. Due to OS-specific issues and also depending on the different state of smartmontools 
 development on the platforms, device support ist not the same for all OS platforms. We provide info
 about <a href="docs/raid-controller_support.html">RAID-controller support</a> here on the homepage
-and of course in the <a href="doc.html#man-pages">manpages</a>.</p>
+and of course in the <a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc#Manpages">manpages</a>.</p>
 
  <p>Thanks to Alexander Shaduri, there is also a graphical user interface for <tt>smartctl</tt>
  available. Go to the Homepage of <a href="http://gsmartcontrol.berlios.de/">
@@ -105,7 +105,7 @@ and of course in the <a href="doc.html#man-pages">manpages</a>.</p>
  <p>If smartmontools is not already installed on your system, then go to our 
  <a href="download.html">download section</a> to get it. You will also find installation instructions 
 for different operating systems and distributions. If you are looking for smartmontools 
-user guides and tutorials, go to the <a href="doc.html">documentation page</a>. 
+user guides and tutorials, go to the <a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">documentation page</a>. 
 Scan section <a href="faq.html">Frequently asked Questions</a>, if you have 
 specific problems or questions. Further support is available via the <a href="help.html">help page</a>.</p>
 
diff --git a/www/links.html b/www/links.html
index 2e54bab33526bb386ecfcdced6d25eeeb775f229..6f64f6cb8e4cfa1103b1970b95b397fbb63f6dae 100644
--- a/www/links.html
+++ b/www/links.html
@@ -21,7 +21,7 @@
 <div id="mainmenu" class="nav">
     <ul>
         <li><a accesskey="n" href="index.html">Home</a></li>
-        <li><a href="doc.html">Documentation</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
         <li><a accesskey="d" href="download.html">Download</a></li>
         <li><a accesskey="f" href="faq.html">FAQ</a></li>
         <li><a accesskey="h" href="help.html">Help</a></li>
diff --git a/www/man5/syslog.conf.5.html b/www/man5/syslog.conf.5.html
index 1163b4e3c09617649f8461e5a77249b07c72fbf7..3e59c5e4b8a42bfcb3578bce46f760c6a42e8f79 100644
--- a/www/man5/syslog.conf.5.html
+++ b/www/man5/syslog.conf.5.html
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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">
-<head>
- <title>Link to manual page for syslog.conf(5) (last updated $Date: 2008/04/27 00:00:09 $)</title>
- <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
- <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
- <meta name="description" content="smartmontools link to manpage for syslog.conf(5)" />
- <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" type="text/css" href="../css/style.css" />
-</head>
-<body>
-<!-- $Id: syslog.conf.5.html,v 1.1 2008/04/27 00:00:09 dipohl Exp $ -->
-<div id="header">
-    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
-    Link to man page for syslog.conf(5)</h1>
-</div>
-
-<div id="mainmenu" class="nav">
-    <ul>
-        <li><a accesskey="n" href="../index.html">Home</a></li>
-        <li><a href="../doc.html">Documentation</a></li>
-        <li><a accesskey="d" href="../download.html">Download</a></li>
-        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
-        <li><a accesskey="h" href="../help.html">Help</a></li>
-        <li><a accesskey="a" href="../about.html">About</a></li>
-        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
-        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
-    </ul>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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">
+<head>
+ <title>Link to manual page for syslog.conf(5) (last updated $Date$)</title>
+ <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
+ <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
+ <meta name="description" content="smartmontools link to manpage for syslog.conf(5)" />
+ <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" type="text/css" href="../css/style.css" />
+</head>
+<body>
+<!-- $Id$ -->
+<div id="header">
+    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
+    Link to man page for syslog.conf(5)</h1>
 </div>
-<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php?parameter=syslog.conf&mode=man">syslog.conf(5)</a>.</h4>
-<hr style="clear:left" />
-<div align="center">
-Hosted by<br />
-<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
-   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
- <br />
-<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
-Last update: $Date: 2008/04/27 00:00:09 $</div><br />
-<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman5/syslog.conf.5.html">W3C Link-Checker</a><br />
-<a href="http://validator.w3.org/check?uri=referer"><img
-        src="http://www.w3.org/Icons/valid-xhtml10-blue"
-        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img style="border:0;width:88px;height:31px"
-        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-        alt="CSS is valid!" /></a>
-</div>
-</body>
-</html>
+
+<div id="mainmenu" class="nav">
+    <ul>
+        <li><a accesskey="n" href="../index.html">Home</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
+        <li><a accesskey="d" href="../download.html">Download</a></li>
+        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
+        <li><a accesskey="h" href="../help.html">Help</a></li>
+        <li><a accesskey="a" href="../about.html">About</a></li>
+        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
+        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
+    </ul>
+</div>
+<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php?parameter=syslog.conf&mode=man">syslog.conf(5)</a>.</h4>
+<hr style="clear:left" />
+<div align="center">
+Hosted by<br />
+<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
+   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
+ <br />
+<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
+Last update: $Date$</div><br />
+<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman5/syslog.conf.5.html">W3C Link-Checker</a><br />
+<a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-xhtml10-blue"
+        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
+<a href="http://jigsaw.w3.org/css-validator/check/referer">
+    <img style="border:0;width:88px;height:31px"
+        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+        alt="CSS is valid!" /></a>
+</div>
+</body>
+</html>
diff --git a/www/man7/regex.7.html b/www/man7/regex.7.html
index 186075aa6cfeea5ff27ee9f916ca80fab0b8423e..00831fd031c4c0440ad372ed02b8f6bd08eb442a 100644
--- a/www/man7/regex.7.html
+++ b/www/man7/regex.7.html
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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">
-<head>
- <title>Link to manual page for regex(7) (last updated $Date: 2008/04/28 18:27:18 $)</title>
- <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
- <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
- <meta name="description" content="smartmontools link to manpage for regex(7)" />
- <meta name="keywords" content="regex(7), regex, manpage, manual, manual page" />
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" type="text/css" href="../css/style.css" />
-</head>
-<body>
-<!-- $Id: regex.7.html,v 1.1 2008/04/28 18:27:18 dipohl Exp $ -->
-<div id="header">
-    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
-    Link to man page for regex(7)</h1>
-</div>
-
-<div id="mainmenu" class="nav">
-    <ul>
-        <li><a accesskey="n" href="../index.html">Home</a></li>
-        <li><a href="../doc.html">Documentation</a></li>
-        <li><a accesskey="d" href="../download.html">Download</a></li>
-        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
-        <li><a accesskey="h" href="../help.html">Help</a></li>
-        <li><a accesskey="a" href="../about.html">About</a></li>
-        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
-        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
-    </ul>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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">
+<head>
+ <title>Link to manual page for regex(7) (last updated $Date$)</title>
+ <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
+ <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
+ <meta name="description" content="smartmontools link to manpage for regex(7)" />
+ <meta name="keywords" content="regex(7), regex, manpage, manual, manual page" />
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" type="text/css" href="../css/style.css" />
+</head>
+<body>
+<!-- $Id$ -->
+<div id="header">
+    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
+    Link to man page for regex(7)</h1>
 </div>
-<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php/man/regex/7">regex(7)</a>.</h4>
-<hr style="clear:left" />
-<div align="center">
-Hosted by<br />
-<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
-   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
- <br />
-<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
-Last update: $Date: 2008/04/28 18:27:18 $</div><br />
-<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman7/regex.7.html">W3C Link-Checker</a><br />
-<a href="http://validator.w3.org/check?uri=referer"><img
-        src="http://www.w3.org/Icons/valid-xhtml10-blue"
-        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img style="border:0;width:88px;height:31px"
-        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-        alt="CSS is valid!" /></a>
-</div>
-</body>
-</html>
+
+<div id="mainmenu" class="nav">
+    <ul>
+        <li><a accesskey="n" href="../index.html">Home</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
+        <li><a accesskey="d" href="../download.html">Download</a></li>
+        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
+        <li><a accesskey="h" href="../help.html">Help</a></li>
+        <li><a accesskey="a" href="../about.html">About</a></li>
+        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
+        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
+    </ul>
+</div>
+<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php/man/regex/7">regex(7)</a>.</h4>
+<hr style="clear:left" />
+<div align="center">
+Hosted by<br />
+<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
+   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
+ <br />
+<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
+Last update: $Date$</div><br />
+<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman7/regex.7.html">W3C Link-Checker</a><br />
+<a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-xhtml10-blue"
+        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
+<a href="http://jigsaw.w3.org/css-validator/check/referer">
+    <img style="border:0;width:88px;height:31px"
+        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+        alt="CSS is valid!" /></a>
+</div>
+</body>
+</html>
diff --git a/www/man8/badblocks.8.html b/www/man8/badblocks.8.html
index 9ad4b5288321923054240e013f89af316d8fc2d5..531f8adb7632fee6b735eb47b4bbfc1553ff7a0e 100644
--- a/www/man8/badblocks.8.html
+++ b/www/man8/badblocks.8.html
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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">
-<head>
- <title>Link to manual page for badblocks(8) (last updated $Date: 2008/04/28 17:55:54 $)</title>
- <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
- <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
- <meta name="description" content="smartmontools link to manpage for badblocks(8)" />
- <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" type="text/css" href="../css/style.css" />
-</head>
-<body>
-<!-- $Id: badblocks.8.html,v 1.1 2008/04/28 17:55:54 dipohl Exp $ -->
-<div id="header">
-    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
-    Link to man page for badblocks(8)</h1>
-</div>
-
-<div id="mainmenu" class="nav">
-    <ul>
-        <li><a accesskey="n" href="../index.html">Home</a></li>
-        <li><a href="../doc.html">Documentation</a></li>
-        <li><a accesskey="d" href="../download.html">Download</a></li>
-        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
-        <li><a accesskey="h" href="../help.html">Help</a></li>
-        <li><a accesskey="a" href="../about.html">About</a></li>
-        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
-        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
-    </ul>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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">
+<head>
+ <title>Link to manual page for badblocks(8) (last updated $Date$)</title>
+ <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
+ <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
+ <meta name="description" content="smartmontools link to manpage for badblocks(8)" />
+ <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" type="text/css" href="../css/style.css" />
+</head>
+<body>
+<!-- $Id$ -->
+<div id="header">
+    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
+    Link to man page for badblocks(8)</h1>
 </div>
-<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php?parameter=badblocks&amp;mode=man">badblocks(8)</a>.</h4>
-<hr style="clear:left" />
-<div align="center">
-Hosted by<br />
-<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
-   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
- <br />
-<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
-Last update: $Date: 2008/04/28 17:55:54 $</div><br />
-<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman8/badblocks.8.html">W3C Link-Checker</a><br />
-<a href="http://validator.w3.org/check?uri=referer"><img
-        src="http://www.w3.org/Icons/valid-xhtml10-blue"
-        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img style="border:0;width:88px;height:31px"
-        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-        alt="CSS is valid!" /></a>
-</div>
-</body>
-</html>
+
+<div id="mainmenu" class="nav">
+    <ul>
+        <li><a accesskey="n" href="../index.html">Home</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
+        <li><a accesskey="d" href="../download.html">Download</a></li>
+        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
+        <li><a accesskey="h" href="../help.html">Help</a></li>
+        <li><a accesskey="a" href="../about.html">About</a></li>
+        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
+        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
+    </ul>
+</div>
+<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php?parameter=badblocks&amp;mode=man">badblocks(8)</a>.</h4>
+<hr style="clear:left" />
+<div align="center">
+Hosted by<br />
+<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
+   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
+ <br />
+<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
+Last update: $Date$</div><br />
+<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman8/badblocks.8.html">W3C Link-Checker</a><br />
+<a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-xhtml10-blue"
+        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
+<a href="http://jigsaw.w3.org/css-validator/check/referer">
+    <img style="border:0;width:88px;height:31px"
+        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+        alt="CSS is valid!" /></a>
+</div>
+</body>
+</html>
diff --git a/www/man8/ide-smart.8.html b/www/man8/ide-smart.8.html
index 3df4a8d32db05ee564215c42788988d732d900f3..b0d4c5e2bd6838a48c729b5dea07ae347a0c37d3 100644
--- a/www/man8/ide-smart.8.html
+++ b/www/man8/ide-smart.8.html
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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">
-<head>
- <title>Link to manual page for ide-smart(8) (last updated $Date: 2008/04/28 17:43:33 $)</title>
- <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
- <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
- <meta name="description" content="smartmontools link to manpage for ide-smart(8)" />
- <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" type="text/css" href="../css/style.css" />
-</head>
-<body>
-<!-- $Id: ide-smart.8.html,v 1.1 2008/04/28 17:43:33 dipohl Exp $ -->
-<div id="header">
-    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
-    Link to man page for ide-smart(8)</h1>
-</div>
-
-<div id="mainmenu" class="nav">
-    <ul>
-        <li><a accesskey="n" href="../index.html">Home</a></li>
-        <li><a href="../doc.html">Documentation</a></li>
-        <li><a accesskey="d" href="../download.html">Download</a></li>
-        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
-        <li><a accesskey="h" href="../help.html">Help</a></li>
-        <li><a accesskey="a" href="../about.html">About</a></li>
-        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
-        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
-    </ul>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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">
+<head>
+ <title>Link to manual page for ide-smart(8) (last updated $Date$)</title>
+ <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
+ <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
+ <meta name="description" content="smartmontools link to manpage for ide-smart(8)" />
+ <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" type="text/css" href="../css/style.css" />
+</head>
+<body>
+<!-- $Id$ -->
+<div id="header">
+    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
+    Link to man page for ide-smart(8)</h1>
 </div>
-<h4>Here you find a manual page for <a href="http://www.linuxcertif.com/man/8/ide-smart/">ide-smart(8)</a>.</h4>
-<hr style="clear:left" />
-<div align="center">
-Hosted by<br />
-<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
-   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
- <br />
-<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
-Last update: $Date: 2008/04/28 17:43:33 $</div><br />
-<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman8/ide-smart.8.html">W3C Link-Checker</a><br />
-<a href="http://validator.w3.org/check?uri=referer"><img
-        src="http://www.w3.org/Icons/valid-xhtml10-blue"
-        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img style="border:0;width:88px;height:31px"
-        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-        alt="CSS is valid!" /></a>
-</div>
-</body>
-</html>
+
+<div id="mainmenu" class="nav">
+    <ul>
+        <li><a accesskey="n" href="../index.html">Home</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
+        <li><a accesskey="d" href="../download.html">Download</a></li>
+        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
+        <li><a accesskey="h" href="../help.html">Help</a></li>
+        <li><a accesskey="a" href="../about.html">About</a></li>
+        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
+        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
+    </ul>
+</div>
+<h4>Here you find a manual page for <a href="http://www.linuxcertif.com/man/8/ide-smart/">ide-smart(8)</a>.</h4>
+<hr style="clear:left" />
+<div align="center">
+Hosted by<br />
+<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
+   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
+ <br />
+<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
+Last update: $Date$</div><br />
+<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman8/ide-smart.8.html">W3C Link-Checker</a><br />
+<a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-xhtml10-blue"
+        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
+<a href="http://jigsaw.w3.org/css-validator/check/referer">
+    <img style="border:0;width:88px;height:31px"
+        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+        alt="CSS is valid!" /></a>
+</div>
+</body>
+</html>
diff --git a/www/man8/syslogd.8.html b/www/man8/syslogd.8.html
index 58025376f70df0a0808a5fdb5d8246173b3bb4fa..c0790d0313a7a192594e20b906a388c18bbf97b3 100644
--- a/www/man8/syslogd.8.html
+++ b/www/man8/syslogd.8.html
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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">
-<head>
- <title>Link to manual page for syslogd(8) (last updated $Date: 2008/04/28 18:08:37 $)</title>
- <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
- <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
- <meta name="description" content="smartmontools link to manpage for syslogd(8)" />
- <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" type="text/css" href="../css/style.css" />
-</head>
-<body>
-<!-- $Id: syslogd.8.html,v 1.1 2008/04/28 18:08:37 dipohl Exp $ -->
-<div id="header">
-    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
-    Link to man page for syslogd(8)</h1>
-</div>
-
-<div id="mainmenu" class="nav">
-    <ul>
-        <li><a accesskey="n" href="../index.html">Home</a></li>
-        <li><a href="../doc.html">Documentation</a></li>
-        <li><a accesskey="d" href="../download.html">Download</a></li>
-        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
-        <li><a accesskey="h" href="../help.html">Help</a></li>
-        <li><a accesskey="a" href="../about.html">About</a></li>
-        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
-        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
-    </ul>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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">
+<head>
+ <title>Link to manual page for syslogd(8) (last updated $Date$)</title>
+ <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
+ <meta http-equiv="content-type" content="application/xhtml+xml; charset=ISO-8859-1" />
+ <meta name="description" content="smartmontools link to manpage for syslogd(8)" />
+ <meta name="keywords" content="syslog.conf(5), manpage, manual, manual page" />
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" type="text/css" href="../css/style.css" />
+</head>
+<body>
+<!-- $Id$ -->
+<div id="header">
+    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
+    Link to man page for syslogd(8)</h1>
 </div>
-<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php?parameter=syslogd&amp;mode=man">syslogd(8)</a>.</h4>
-<hr style="clear:left" />
-<div align="center">
-Hosted by<br />
-<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
-   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
- <br />
-<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
-Last update: $Date: 2008/04/28 18:08:37 $</div><br />
-<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman8/syslogd.8.html">W3C Link-Checker</a><br />
-<a href="http://validator.w3.org/check?uri=referer"><img
-        src="http://www.w3.org/Icons/valid-xhtml10-blue"
-        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img style="border:0;width:88px;height:31px"
-        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-        alt="CSS is valid!" /></a>
-</div>
-</body>
-</html>
+
+<div id="mainmenu" class="nav">
+    <ul>
+        <li><a accesskey="n" href="../index.html">Home</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
+        <li><a accesskey="d" href="../download.html">Download</a></li>
+        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
+        <li><a accesskey="h" href="../help.html">Help</a></li>
+        <li><a accesskey="a" href="../about.html">About</a></li>
+        <li class="active"><a accesskey="l" href="../links.html">Links</a></li>
+        <li class="last"><a accesskey="s" href="../sphider/search.php">Search</a></li>
+    </ul>
+</div>
+<h4>Here you find a manual page for <a href="http://www.phpman.info/index.php?parameter=syslogd&amp;mode=man">syslogd(8)</a>.</h4>
+<hr style="clear:left" />
+<div align="center">
+Hosted by<br />
+<a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px"
+   src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a>
+ <br />
+<div class="copyright">Maintained by: <a href="mailto:smartmontools-support@lists.sourceforge.net">Gabriele Pohl</a><br />
+Last update: $Date$</div><br />
+<a href="http://validator.w3.org/checklink?uri=http%3A%2F%2Fsmartmontools.sourceforge.net%2Fman8/syslogd.8.html">W3C Link-Checker</a><br />
+<a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-xhtml10-blue"
+        alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a>
+<a href="http://jigsaw.w3.org/css-validator/check/referer">
+    <img style="border:0;width:88px;height:31px"
+        src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+        alt="CSS is valid!" /></a>
+</div>
+</body>
+</html>
diff --git a/www/sphider/templates/standard/header.html b/www/sphider/templates/standard/header.html
index 3bf5a373113f12e8f01ca75a71a11a3825dc62bb..175f44e258f86c5cd46b2272fcb237738486d63c 100644
--- a/www/sphider/templates/standard/header.html
+++ b/www/sphider/templates/standard/header.html
@@ -1,38 +1,38 @@
-<!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">
-<head>
- <title>smartmontools Home Page (last updated $Date: 2008/04/18 13:36:32 $)</title>
- <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
- <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=ISO-8859-1" />
- <meta name="description" content="smartmontools Home Page" />
- <meta name="keywords" content="S.M.A.R.T., SMART, FreeBSD, Linux, NetBSD, Solaris, Windows, disk, monitor, monitoring" />
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" type="text/css" href="../css/style.css" />
-<!--  <link type="text/css" rel="stylesheet" href="templates/standard/search.css"> -->
-  <!-- suggest script -->
-	<style type="text/css">@import url("include/js_suggest/SuggestFramework.css");</style>
-	<script type="text/javascript" src="include/js_suggest/SuggestFramework.js"></script>
-	<script type="text/javascript">window.onload = initializeSuggestFramework;</script>
-  <!-- /suggest script -->
-</head>
-<body>
-<!-- $Id: header.html,v 1.1 2008/04/18 13:36:32 dipohl Exp $ -->
-<div id="header">
-    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
-    smartmontools Home Page</h1>
-</div>
-
-<div id="mainmenu" class="nav">
-    <ul>
-        <li class="first"><a accesskey="n" href="../index.html">Home</a></li>
-        <li><a href="../doc.html">Documentation</a></li>
-        <li><a accesskey="d" href="../download.html">Download</a></li>
-        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
-        <li><a accesskey="h" href="../help.html">Help</a></li>
-        <li><a accesskey="a" href="../about.html">About</a></li>
-        <li><a accesskey="l" href="../links.html">Links</a></li>
-        <li class="active last"><a accesskey="s" href="search.php">Search</a></li>
-    </ul>
-</div>
-
+<!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">
+<head>
+ <title>smartmontools Home Page (last updated $Date$)</title>
+ <link rev="made" href="mailto:smartmontools-support&#64;sourceforge.net" />
+ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=ISO-8859-1" />
+ <meta name="description" content="smartmontools Home Page" />
+ <meta name="keywords" content="S.M.A.R.T., SMART, FreeBSD, Linux, NetBSD, Solaris, Windows, disk, monitor, monitoring" />
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" type="text/css" href="../css/style.css" />
+<!--  <link type="text/css" rel="stylesheet" href="templates/standard/search.css"> -->
+  <!-- suggest script -->
+	<style type="text/css">@import url("include/js_suggest/SuggestFramework.css");</style>
+	<script type="text/javascript" src="include/js_suggest/SuggestFramework.js"></script>
+	<script type="text/javascript">window.onload = initializeSuggestFramework;</script>
+  <!-- /suggest script -->
+</head>
+<body>
+<!-- $Id$ -->
+<div id="header">
+    <h1><a id="logo" href="http://smartmontools.sourceforge.net/"><img src="../smart_logo.gif" width="105" height="59" border="0" hspace="20" align="middle" name="smartmontools_Logo" alt="S.M.A.R.T. Logo" /></a>
+    smartmontools Home Page</h1>
+</div>
+
+<div id="mainmenu" class="nav">
+    <ul>
+        <li class="first"><a accesskey="n" href="../index.html">Home</a></li>
+        <li><a href="http://sourceforge.net/apps/trac/smartmontools/wiki/TocDoc">Documentation</a></li>
+        <li><a accesskey="d" href="../download.html">Download</a></li>
+        <li><a accesskey="f" href="../faq.html">FAQ</a></li>
+        <li><a accesskey="h" href="../help.html">Help</a></li>
+        <li><a accesskey="a" href="../about.html">About</a></li>
+        <li><a accesskey="l" href="../links.html">Links</a></li>
+        <li class="active last"><a accesskey="s" href="search.php">Search</a></li>
+    </ul>
+</div>
+