Fix the links to status/supported pages.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4170 7894878c-1315-0410-8ee3-d5d059ff63e0

6 files changed, 19 insertions, 25 deletions

diff --git a/README b/README
index f852b6f8..95dfaf06 100644
--- a/README
+++ b/README
@@ -114,7 +114,7 @@ We also support some miscellaneous chips:
 
 
 The list above may be out of date;
-see our New Drivers page at http://www.lm-sensors.org/wiki/NewDrivers
+see our Devices page at http://www.lm-sensors.org/wiki/Devices
 for the latest information on supported devices.
 You may also refer to doc/chips/SUMMARY for details on what each chip
 can monitor.
diff --git a/doc/FAQ b/doc/FAQ
index 6c5695c8..5c129ba1 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -373,17 +373,14 @@ This we have good answers for.
    * Sorted by Manufacturer:   `README'
 
    * Sorted by Manufacturer:
-     `http://www.lm-sensors.org/wiki/SupportedDevices'
+     `http://www.lm-sensors.org/wiki/Devices'
 
    * Sorted by Sensor Driver:  `doc/chips/SUMMARY'
 
-   * Newest Driver Status:
-     `http://www.lm-sensors.org/wiki/NewDrivers'
-
 3.2.4 Anybody working on a driver for chip XYZ?
 -----------------------------------------------
 
-Newest Driver Status: `http://www.lm-sensors.org/wiki/NewDrivers'
+Newest Driver Status: `http://www.lm-sensors.org/wiki/Devices'
 
 3.3 Which modules should I insert?
 ==================================
@@ -1098,8 +1095,8 @@ Either
      website.
 
    When you know what chips you have, check the Newest Driver Status
-(http://www.lm-sensors.org/wiki/NewDrivers) web page to see if support
-has been added for your chip in a later release or in CVS.
+(http://www.lm-sensors.org/wiki/Devices) web page to see if support
+has been added for your chip in a later release or in SVN.
 
 4.25 Sensors says `Error: Line xxx: zzzzzzz'
 ============================================
diff --git a/doc/developers/new_drivers b/doc/developers/new_drivers
index cb5d7de5..014b5447 100644
--- a/doc/developers/new_drivers
+++ b/doc/developers/new_drivers
@@ -134,7 +134,7 @@ steps apply.
   http://www.lm-sensors.org/wiki/AuthorsAndContributors
   Make sure to check the current status for your driver first:
   http://www.lm-sensors.org/wiki/Kernel2.6
-  http://www.lm-sensors.org/wiki/NewDrivers
+  http://www.lm-sensors.org/wiki/Devices
 
 ---------------------------------------------------------------------
 Checklist for us to do on the webpage:
diff --git a/doc/lm_sensors-FAQ.html b/doc/lm_sensors-FAQ.html
index d62f8740..636e6b01 100644
--- a/doc/lm_sensors-FAQ.html
+++ b/doc/lm_sensors-FAQ.html
@@ -606,16 +606,15 @@ page on <a href="http://www.lm-sensors.org">our website</a> some good cross-refe
 <p>This we have good answers for.
      <ul>
 <li>Sorted by Manufacturer:   <samp><span class="file">README</span></samp>
-<li>Sorted by Manufacturer:   <a href="http://www.lm-sensors.org/wiki/SupportedDevices">http://www.lm-sensors.org/wiki/SupportedDevices</a>
+<li>Sorted by Manufacturer:   <a href="http://www.lm-sensors.org/wiki/Devices">http://www.lm-sensors.org/wiki/Devices</a>
 <li>Sorted by Sensor Driver:  <samp><span class="file">doc/chips/SUMMARY</span></samp>
-<li>Newest Driver Status:     <a href="http://www.lm-sensors.org/wiki/NewDrivers">http://www.lm-sensors.org/wiki/NewDrivers</a>
 </ul>
 
    <p><a name="Section-3_002e2_002e4"></a>
 
 <h4 class="subsection">3.2.4 Anybody working on a driver for chip XYZ?</h4>
 
-<p>Newest Driver Status: <a href="http://www.lm-sensors.org/wiki/NewDrivers">http://www.lm-sensors.org/wiki/NewDrivers</a>
+<p>Newest Driver Status: <a href="http://www.lm-sensors.org/wiki/Devices">http://www.lm-sensors.org/wiki/Devices</a>
 
 <div class="node">
 <p><hr>
@@ -1652,8 +1651,8 @@ Run <samp><span class="command">devfs</span></samp> in the kernel to get the <sa
         </ol>
 
    <p>When you know what chips you have, check the
-<a href="http://www.lm-sensors.org/wiki/NewDrivers">Newest Driver Status</a> web page to
-see if support has been added for your chip in a later release or in CVS.
+<a href="http://www.lm-sensors.org/wiki/Devices">Driver Status</a> web page to
+see if support has been added for your chip in a later release or in SVN.
 
 <div class="node">
 <p><hr>
diff --git a/doc/lm_sensors-FAQ.texi b/doc/lm_sensors-FAQ.texi
index 76ee4e54..41090f64 100644
--- a/doc/lm_sensors-FAQ.texi
+++ b/doc/lm_sensors-FAQ.texi
@@ -335,16 +335,15 @@ We don't support boards, we support chips. @xref{Section 3.2.1, What chips are o
 This we have good answers for.
 @itemize
 @item Sorted by Manufacturer:   @file{README}
-@item Sorted by Manufacturer:   @uref{http://www.lm-sensors.org/wiki/SupportedDevices}
+@item Sorted by Manufacturer:   @uref{http://www.lm-sensors.org/wiki/Devices}
 @item Sorted by Sensor Driver:  @file{doc/chips/SUMMARY}
-@item Newest Driver Status:     @uref{http://www.lm-sensors.org/wiki/NewDrivers}
 @end itemize
 
 
 @anchor{Section 3.2.4}
 @subsection Anybody working on a driver for chip XYZ?
 
-Newest Driver Status: @uref{http://www.lm-sensors.org/wiki/NewDrivers}
+Newest Driver Status: @uref{http://www.lm-sensors.org/wiki/Devices}
 
 
 @node Section 3.3, Section 3.4, Section 3.2, Installation
@@ -1131,8 +1130,8 @@ But in any case you should figure out what is on the board:
 @end enumerate
 
 When you know what chips you have, check the
-@uref{http://www.lm-sensors.org/wiki/NewDrivers, Newest Driver Status} web page to
-see if support has been added for your chip in a later release or in CVS.
+@uref{http://www.lm-sensors.org/wiki/Devices, Driver Status} web page to
+see if support has been added for your chip in a later release or in SVN.
 
 
 @node Section 4.25, Section 4.26, Section 4.24, Problems
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 636c9769..261fd864 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -2258,7 +2258,7 @@ sub adapter_pci_detection
                $try->{driver}, pci_busid($device), $try->{procid};
         if ($try->{driver} eq "to-be-tested") {
           print "\nWe are currently looking for testers for this adapter!\n".
-                "Please see http://www.lm-sensors.org/wiki/NewDrivers\n".
+                "Please check the http://www.lm-sensors.org/wiki/Devices\n".
                 "and/or contact us if you want to help.\n\n";
           print "Continue... ";
           <STDIN>;
@@ -5177,9 +5177,8 @@ sub generate_modprobes
        #check return value from modprobe in case modprobe -l isn't supported
        if((($? >> 8) == 0) && ! $modulefound) {
          $modprobes .= "# Warning: the required module $chip->{driver} is not currently installed\n".
-                       "# on your system. For status of 2.6 kernel ports see\n".
-                       "# http://www.lm-sensors.org/wiki/SupportedDevices and\n".
-                       "# http://www.lm-sensors.org/wiki/NewDrivers. If driver is built\n".
+                       "# on your system. For status of 2.6 kernel ports check the\n".
+                       "# http://www.lm-sensors.org/wiki/Devices If driver is built\n".
                        "# into the kernel, or unavailable, comment out the following line.\n";
        }
        $modprobes .= "modprobe $chip->{driver}\n";
@@ -5370,8 +5369,8 @@ sub main
           "I2C or SMBus adapter that is not supported. See doc/FAQ,\n",
           "doc/lm_sensors-FAQ.html or http://www.lm-sensors.org/wiki/FAQ\n",
           "(FAQ #4.24.3) for further information.\n",
-          "If you find out what chips are on your board, see\n",
-          "http://www.lm-sensors.org/wiki/NewDrivers for driver status.\n";
+          "If you find out what chips are on your board, check\n",
+          "the http://www.lm-sensors.org/wiki/Devices for driver status.\n";
     exit;
   }