Update documentation, hack the logo a bit, fix a bad link.

7 files changed, 212 insertions, 184 deletions

diff --git a/gpsd.spec.in b/gpsd.spec.in
index f0c16eb3..3d4d753c 100644
--- a/gpsd.spec.in
+++ b/gpsd.spec.in
@@ -141,7 +141,8 @@ cp gps.py gpsfake.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-package
 
 %changelog
 * Mon Dec 19 2005 Eric S. Raymond <esr@snark.thyrsus.com> - @VERSION@-1
-- Now builds and runs under Cygwin.
+- Now builds and runs under Cygwin.  Correct the speed units in synthetic 
+  NMEA.
 
 * Wed Sep 14 2005 Eric S. Raymond <esr@snark.thyrsus.com> - @VERSION@-1
 - Prevent core dump on -d option.  The .log option is no longer required for
diff --git a/www/gps-hacking.html b/www/gps-hacking.html
index d9d627f6..ebc7d5a2 100644
--- a/www/gps-hacking.html
+++ b/www/gps-hacking.html
@@ -71,7 +71,7 @@ of maritime navigation satellites parked in geosynchronous orbits over
 the middle of the Atlantic and Pacific oceans.</p>
 
 <p>You can look at a very nifty <a
-href="http://www.mich.com/%7Ebuffalo/rhp/gps.html">simulation</a>
+href="http://rhp.detmich.com/gps.html">simulation</a>
 of GPS satellite orbits. (Also includes GLONASS, the Russian military 
 equivalent of GPS.)  You can also look at 
 <a href='http://www.tsgc.utexas.edu/images/spacecraft/gps/'>pictures</a> 
diff --git a/www/gpsd-logo-small.png b/www/gpsd-logo-small.png
index 1d0473e9..83ca3080 100644
--- a/www/gpsd-logo-small.png
+++ b/www/gpsd-logo-small.png
diff --git a/www/gpsd-trans-logo.png b/www/gpsd-trans-logo.png
index 382169cb..ffadc5ec 100644
--- a/www/gpsd-trans-logo.png
+++ b/www/gpsd-trans-logo.png
diff --git a/www/hardware.html b/www/hardware.html
index 9abe81db..24ce1713 100644
--- a/www/hardware.html
+++ b/www/hardware.html
@@ -40,17 +40,17 @@ which this GPS is known to have been successfully tested.</p>
 <td><a href="http://www.garmin.com">Garmin</a></td>
 <td>2.3</td>
 <td>2.0</td>
-<td>GPBOD<br>
-GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPRMB<br>
-GPRMC<br>
-GPRTE<br>
-GPGSV<br>
-GPWPL<br>
-PGRME<br>
-PGRMM<br>
+<td>GPBOD<br/>
+GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPRMB<br/>
+GPRMC<br/>
+GPRTE<br/>
+GPGSV<br/>
+GPWPL<br/>
+PGRME<br/>
+PGRMM<br/>
 PGRMZ</td>
 <td>Garmin 12XL and 45 are nearly identical and should work as well. Details
 on Garmin's proprietary protocol can be found
@@ -67,20 +67,20 @@ on Garmin's proprietary protocol can be found
 <td><a href='http://www.garmin.com/'>Garmin</a></td>
 <td>2.7</td>
 <td>2.0</td>
-<td>GPBOD<br>
-GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPGLL<br>
-GPRMB<br>
-GPRMC<br>
-GPRTE<br>
-GPWPL<br>
-PGRME<br>
-PGRMM<br>
+<td>GPBOD<br/>
+GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPGLL<br/>
+GPRMB<br/>
+GPRMC<br/>
+GPRTE<br/>
+GPWPL<br/>
+PGRME<br/>
+PGRMM<br/>
 PGRMZ</td>
 <td>Reported by Ron Marosko, Jr. &lt;rmarosko&#x40;wirelessfrontier.net&gt;
-and Amaury Jacquot &lt;sxpert@esitcom.org&gt;.<br>
+and Amaury Jacquot &lt;sxpert@esitcom.org&gt;.<br/>
 DGPS information in GPGGA sentence is not returned. Magnetic variation
 information is not available in binary mode. Garmin uses a nonstandard
 16-bit SNR scale for signal quality in GSA. Can be switched to NMEA 3.0
@@ -115,17 +115,17 @@ WAAS is supported.</td>
 <td><a href='http://www.garmin.com/'>Garmin</a></td>
 <td>2.5</td>
 <td>2.0 and 2.3</td>
-<td>GPALM<br>
-GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
-GPVTG<br>
-PGRMB<br>
-PGRME<br>
-PGRMF<br>
-PGRMT<br>
+<td>GPALM<br/>
+GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPVTG<br/>
+PGRMB<br/>
+PGRME<br/>
+PGRMF<br/>
+PGRMT<br/>
 PGRMV</td>
 <td>The RS232 versions emit NMEA and are found by normal autoconfiguration.
 GPS-18 LVC and GPS-18 LVC/5m have PPS outputs. WAAS is supported.</td>
@@ -141,15 +141,15 @@ GPS-18 LVC and GPS-18 LVC/5m have PPS outputs. WAAS is supported.</td>
 <td><a href="http://www.garmin.com">Garmin</a></td>
 <td>2.13</td>
 <td>3.0</td>
-<td>GPBOD<br>
-GPGLL<br>
-GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMB<br>
-GPRMC<br>
-GPRTE<br>
-PGRME<br>
+<td>GPBOD<br/>
+GPGLL<br/>
+GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMB<br/>
+GPRMC<br/>
+GPRTE<br/>
+PGRME<br/>
 PGRMZ</td>
 <td>Submitted by Jose Luis Domingo Lopez &lt;jdomingo&#x40;24x7linux.com&gt;</td>
 </tr>
@@ -164,12 +164,12 @@ PGRMZ</td>
 <td><a href="http://www.haicom.com.tw/">Haicom</a></td>
 <td>2.25</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
-<td>From Denis Perchine &lt;dyp&#x40;perchine.com&gt;<br>
+<td>From Denis Perchine &lt;dyp&#x40;perchine.com&gt;<br/>
 NMEA works, but SiRF binary does not. This device seems to ignore the
 $PSRF100 mode switch command. (SiRF binary may be available on the
 auxiliary serial port, but this is unconfirmed.) This device ships
@@ -186,11 +186,11 @@ with XTrac Firmware.</td>
 <td><a href="http://www.holux.com.tw">Holux</a></td>
 <td>2.24</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td> Reported by  Patrick L. McGillan &lt;pmcgillan&#x40;pateri.com&gt;.</td>
 </tr>
@@ -205,10 +205,10 @@ GPVTG</td>
 <td><a href='http://www.globalsat.com.tw/english/products.php'>GlobalSat</a></td>
 <td>2.20</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td>Reported by Frank Nicholas &lt;frank&#x40;nicholasfamilycentral.com&gt;.</td>
 </tr>
@@ -223,10 +223,10 @@ GPVTG</td>
 <td><a href="http://www.holux.com.tw">Holux</a></td>
 <td>2.19</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td>4 color LED showing: Bluetooth, Navigation Update and Battery and
 Charger Status Indication. FLASH based program memory. Firmware upgradeable
@@ -243,11 +243,11 @@ through serial interface. Water resistant.</td>
 <td><a href='http://www.billionton.com/english/index.htm'>Billionton</a></td>
 <td>2.16</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPRMC<br>
-GPGSA<br>
+<td>GPGGA<br/>
+GPRMC<br/>
+GPGSA<br/>
 GPGSV</td>
-<td>Reported by Oleg Gusev &lt;oleg&#x40;crista.uni-wuppertal.de&gt;.<br>
+<td>Reported by Oleg Gusev &lt;oleg&#x40;crista.uni-wuppertal.de&gt;.<br/>
 Uses SiRF firmware version 220.006.000ES. Accepts WAAS Mode Disable
 (<tt>$PSRF108,00*02</tt>) and WAAS Mode Enable (<tt>$PSRF108,01*03</tt>)
 controls.</td>
@@ -263,11 +263,11 @@ controls.</td>
 <td><a href='http://www.techwayinc.com.tw/'>Techway</a></td>
 <td>2.3</td>
 <td>2.x</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td>Advertises that it's waterproof.</td>
 </tr>
@@ -282,10 +282,10 @@ GPVTG</td>
 <td><a href='http://www.haicom.com.tw/'>Haicom</a></td>
 <td>2.24</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td>SiRF firmware level 231ES (XTrac). Haicom provided a test unit. Manual
 states incorrectly that VTG is off by default.</td>
@@ -301,13 +301,13 @@ states incorrectly that VTG is off by default.</td>
 <td><a href='http://www.rikaline.com/gps_receiver.htm'>Rikaline</a></td>
 <td>2.20</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 </td>
-<td>Reported by Olli Salonen &lt;olli&#x40;cabbala.net&gt;.<br>
+<td>Reported by Olli Salonen &lt;olli&#x40;cabbala.net&gt;.<br/>
 Uses SiRF firmware version 2.3.2-GSW2-2.05.024-C1Prod1.1. Manufacturer
 claims it is waterproof (1 meter), WAAS and EGNOS are supported.</td>
 </tr>
@@ -322,13 +322,13 @@ claims it is waterproof (1 meter), WAAS and EGNOS are supported.</td>
 <td><a href="http://www.pharosgps.com/">Pharos</a></td>
 <td>2.23</td>
 <td>2.3</td>
-<td>GPGSV<br>
-GPRMC<br>
-GPGLL<br>
-GPGSA<br>
-GPGGA<br>
+<td>GPGSV<br/>
+GPRMC<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGGA<br/>
 GPVTG</td>
-<td>Reported by Robert Pouliot &lt;krynos&#x40;saturnus.com&gt;<br>
+<td>Reported by Robert Pouliot &lt;krynos&#x40;saturnus.com&gt;<br/>
 The Pharos comes with adaptors for SDIO, CF, USB and plain RS232. Usually
 ships with XTrac firmware. It is strongly recommended that this device not be
 flashed with a different firmware as all reflashed receivers tested thus far
@@ -345,13 +345,13 @@ fail to work afterward. May come bundled with Microsoft Streets and Trips.</td>
 <td><a href="http://www.navisky.com/">NaviSky</a></td>
 <td>2.24</td>
 <td>2.x</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
-<td>Reported by Jeff Francis &lt;jeff&#x40;gritch.org&gt;<br>
+<td>Reported by Jeff Francis &lt;jeff&#x40;gritch.org&gt;<br/>
 Included with Rand McNally's horrible Windows navigation software.
 </td>
 </tr>
@@ -366,11 +366,11 @@ Included with Rand McNally's horrible Windows navigation software.
 <td><a href='http://www.usglobalsat.com/'>GlobalSat</a>; OEM for many</td>
 <td>2.24</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td>GlobalSat provided three test units, SiRF firmware level 231ES.
 Older versions of the BU-303 had a <a href='bu_303b.html'>design
@@ -390,11 +390,11 @@ works but no test hardware.</td>
 <td><a href='http://www.usglobalsat.com/'>USGlobalSat</a> (formerly Rayming)</td>
 <td>2.16</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td> We tested a version with SiRF Firmware level 231ES. The <a
 href='http://ftdi-usb-sio.sourceforge.net/'>FTDI USB-to-serial chip</a> is
@@ -414,11 +414,11 @@ USB-to-serial chip.</td>
 <td><a href='http://www.delorme.com/'>DeLorme</a></td>
 <td>2.5</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
-GPGLL<br>
+<td>GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPGLL<br/>
 GPVTG</td>
 <td>This is the replacement for the old Zodiac version that spoke Rockwell
 binary protocol. Some other sentences can be enabled. Requires a 2.6.10 or
@@ -435,11 +435,11 @@ better kernel for the Cypress USB-HID support.</td>
 <td><a href='http://www.royaltek.com/'>RoyalTek</a></td>
 <td>1.97</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSV<br>
-GPRMC<br>
-GPVTG<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPVTG<br/>
 GPGSA</td>
 <td>There's an RS232 variant as well, not yet tested.</td>
 </tr>
@@ -454,13 +454,13 @@ GPGSA</td>
 <td><a href='http://www.semsons.com/gpshardware.html'>Semsons &amp; Co.</a></td>
 <td>2.28</td>
 <td>2.20</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSV<br>
-GPRMC<br>
-GPVTG<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPVTG<br/>
 GPGSA</td>
-<td>Reported by Lance Fetters &lt;ashikase&#x40;users.sourceforge.net&gt;<br>
+<td>Reported by Lance Fetters &lt;ashikase&#x40;users.sourceforge.net&gt;<br/>
 This GPS emits a weirdly broken GSA sentence that crashed gpsd versions prior
 to 2.28. Serial parameters default to 38400; 8, N, 1.
 May come bundled with Microsoft Streets and Trips.
@@ -477,13 +477,13 @@ May come bundled with Microsoft Streets and Trips.
 <td><a href='http://www.usglobalsat.com/'>USGlobalSat</a></td>
 <td>pre-2.29</td>
 <td>2.3</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSV<br>
-GPRMC<br>
-GPVTG<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPVTG<br/>
 GPGSA</td>
-<td>Reported by Chris Kuethe &lt;chris.kuethe&#x40;gmail.com&gt;.<br>
+<td>Reported by Chris Kuethe &lt;chris.kuethe&#x40;gmail.com&gt;.<br/>
 This receiver, or at least the firmware it ships with does not support PPS
 timing output, nor does it support WAAS - something born out by the claimed
 10m positioning accuracy. These will hopefully be fixed in future firmware
@@ -501,10 +501,10 @@ could be show-stoppers for various applications.</td>
 <td><a href='http://www.haicom.com.tw/'>Haicom</a></td>
 <td>2.6</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
 <td>Probably uses PL2303 but we have not verified this.</td>
 </tr>
@@ -519,8 +519,8 @@ GPVTG</td>
 <td><a href='http://www.delorme.com/'>DeLorme</a></td>
 <td>2.0</td>
 <td>2.2?</td>
-<td>GPRMC<br>
-GPGSA<br>
+<td>GPRMC<br/>
+GPGSA<br/>
 PRWIZCH</td>
 <td>The old Zodiac version spoke Rockwell binary protocol. These models
 have been discontinued but are still common.</td>
@@ -536,13 +536,13 @@ have been discontinued but are still common.</td>
 <td><a href='http://www.sanav.com/'>San Jose Navigation</a></td>
 <td>2.0</td>
 <td>2.3</td>
-<td>GPDTM<br>
-GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
-GPVTG<br>
+<td>GPDTM<br/>
+GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPVTG<br/>
 GPZDA</td>
 <td>Special gpsd support uses 8N2 and requests sentences that gpsd requires.
 OEM module only, not a retail version.</td>
@@ -558,11 +558,11 @@ OEM module only, not a retail version.</td>
 <td><a href='http://www.delorme.com/'>DeLorme</a></td>
 <td>1.97</td>
 <td>?</td>
-<td>GPGSA<br>
-GPGGA<br>
-GPGSV<br>
-GPRMC<br>
-PRWIRID<br>
+<td>GPGSA<br/>
+GPGGA<br/>
+GPGSV<br/>
+GPRMC<br/>
+PRWIRID<br/>
 PRWIZCH</td>
 <td> Discontinued sometime before November 1998. Takes optional latitude
 and longitude initialization.</td>
@@ -577,9 +577,9 @@ and longitude initialization.</td>
 <td><a href='http://www.magellangps.com'>Magellan</a></td>
 <td>2.24</td>
 <td>?</td>
-<td>GPGRMB<br>
+<td>GPGRMB<br/>
 GPRMC</td>
-<td>Reported by Gary E. Miller &lt;gem&#x40;rellim.com&gt;.<br>
+<td>Reported by Gary E. Miller &lt;gem&#x40;rellim.com&gt;.<br/>
 It was cool in its day, now it's a dinosaur mainly good for regression
 testing. NMEA time is accurate to about 500mS.</td>
 </tr>
@@ -594,13 +594,13 @@ testing. NMEA time is accurate to about 500mS.</td>
 <td><a href='http://www.motorola.com/ies/GPS/products_legacy.html'>Motorola</a></td>
 <td>2.20</td>
 <td>2.2</td>
-<td>GPGGA<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
-GPVTG<br>
+<td>GPGGA<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPVTG<br/>
 GPZDA</td>
-<td>Reported by Wojciech Kazubski &lt;wk&#x40;ire.pw.edu.pl&gt;.<br>
+<td>Reported by Wojciech Kazubski &lt;wk&#x40;ire.pw.edu.pl&gt;.<br/>
 RTCM input, no WAAS. In binary mode can deliver differential correction for
 another Oncore GT+. Similar Motorola Oncore UT timing receiver has less
 functions but better timing accuracy.</td>
@@ -616,7 +616,7 @@ functions but better timing accuracy.</td>
 <td><a href="http://www.trimble.com/">Trimble</a></td>
 <td>2.26</td>
 <td>2.1</td>
-<td>GPGGA<br>
+<td>GPGGA<br/>
 GPVTG</td>
 <td> Reported by Rob Janssen</td>
 </tr>
@@ -631,11 +631,11 @@ GPVTG</td>
 <td><a href='http://www.magellangps.com'>Magellan</a></td>
 <td>2.21</td>
 <td>v1.5 APA, v1.5 XTE, v2.1 GSA</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 PMGNST</td>
 <td>Reported by Chris S. Newell &lt;chris&#x40;newellfamily.net&gt;</td>
 </tr>
@@ -650,14 +650,14 @@ PMGNST</td>
 <td><a href='http://www.sanav.com/'>San Jose Navigation</a></td>
 <td>2.21</td>
 <td>2.x</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
-GPVTG<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
+GPVTG<br/>
 GPZDA</td>
-<td>Reported by  Angus Ainslie &lt;angusa&#x40;deltatee.com&gt;.<br>
+<td>Reported by  Angus Ainslie &lt;angusa&#x40;deltatee.com&gt;.<br/>
 Reports bad checksum when it doesn't have a fix.</td>
 </tr>
 <!-- End GM-38 -->
@@ -671,13 +671,13 @@ Reports bad checksum when it doesn't have a fix.</td>
 <td><a href='http://www.bona.com.tw:8080/product/GPS-USB.htm'>BONA Computech</a></td>
 <td>2.28</td>
 <td>3.0</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPGSV<br>
-GPRMC<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPGSV<br/>
+GPRMC<br/>
 GPVTG</td>
-<td>Reported by Romain Goyet &lt;r.goyet&#x40;gmail.com&gt;.<br>
+<td>Reported by Romain Goyet &lt;r.goyet&#x40;gmail.com&gt;.<br/>
 The chipset manufacturer's webpage is <a href='http://www.unav-micro.com/chipsets.htm'>here</a>.</td>
 </tr>
 <!-- End Bona iGPS-M -->
@@ -691,17 +691,17 @@ The chipset manufacturer's webpage is <a href='http://www.unav-micro.com/chipset
 <td><a href='http://www.cpit.com/'>Central Pacific</a></td>
 <td>pre-2.29</td>
 <td>3.01</td>
-<td>GPGGA<br>
-GPGLL<br>
-GPGSA<br>
-GPRMC<br>
-GPZDA<br>
-GPVTG<br>
-PNMRX300*<br>
-PNMRX301*<br>
-PNMRX302*<br>
-PNMRX303*<br>
-PNMRX304*<br>
+<td>GPGGA<br/>
+GPGLL<br/>
+GPGSA<br/>
+GPRMC<br/>
+GPZDA<br/>
+GPVTG<br/>
+PNMRX300*<br/>
+PNMRX301*<br/>
+PNMRX302*<br/>
+PNMRX303*<br/>
+PNMRX304*<br/>
 PNMRX603</td>
 <td> Reported by Tobias Minich &lt;belgabor&#x40;gmx.de&gt; <ul>
 <li>The marked (*) sentences are only sent on change or by request</li>
@@ -717,6 +717,30 @@ may differ from the syntax found in several documents on the net.</li>
 </tr>
 <!-- End CPIT GP-27 -->
 
+<!-- Begin Rikaline GPS-6010-X5 -->
+<tr>
+<td><a href='http://www.rikaline.com/gps_receiver.htm'>GPS-6010-X5</a></td>
+<td>Good</td>
+<td>SiRFII+PL2303</td>
+<td>USB</td>
+<td>Rikaline</td>
+<td>2.20</td>
+<td>2.2</td>
+<td>
+GPGGA<br/>
+GPGSA<br/>
+GPRMC<br/>
+GPVTG<br/>
+GPGSV<br/>
+</td>
+<td>
+The usb cable is a separate item to order. you can also order an
+rs232 cable or a pda cable. Submitted by Koos van den Hout,
+&gt;koos&#x40;kzdoos.xs4all.nl&gt;
+</td>
+</tr>
+<!--  End Rikaline GPS-6010-X5 -->
+
 <!--
 <tr>
 <td>name, link to technical reference</td>
diff --git a/www/index.html.in b/www/index.html.in
index 7a2cd343..f4c38eda 100644
--- a/www/index.html.in
+++ b/www/index.html.in
@@ -203,7 +203,7 @@ list of NMEA sentences</a>.</p>
 <dd>An analysis of what's wrong with NMEA 0183, and a simple way to fix 
 it.</dd>
 
-<dt><a href="performance/performance.html">Where's the Latency?  Performance analysis of GPSes and GPSD</a></dt>
+<dt><a href="performance.html">Where's the Latency?  Performance analysis of GPSes and GPSD</a></dt>
 <dd>An analysis of latency in the GPS/GPSD system. Has implications for the 
 design of <code>gpsd</code> and vendor claims about binary protocols.</dd>
 </dl>
diff --git a/xgps.1 b/xgps.1
index 5683ecc4..d4a988ae 100644
--- a/xgps.1
+++ b/xgps.1
@@ -36,7 +36,7 @@ xgps, xgpsspeed, cgps \- test clients for gpsd
 .ad l
 .hy 0
 .HP 5
-\fBcgps\fR [\-h] [\-v] [\-speedunits\ {\fBmph\fR\ |\ \fBkph\fR\ |\ \fBknots\fR}] [\-altunits\ {\fBfeet\fR\ |\ \fBmeters\fR}] [\-l\ [\fBd\fR\ |\ \fBm\fR\ |\ \fBs\fR]] [\fIserver\fR [\fI:port\fR [\fI:device\fR]]]
+\fBcgps\fR [\-h] [\-s] [\-v] [\-speedunits\ {\fBmph\fR\ |\ \fBkph\fR\ |\ \fBknots\fR}] [\-altunits\ {\fBfeet\fR\ |\ \fBmeters\fR}] [\-l\ [\fBd\fR\ |\ \fBm\fR\ |\ \fBs\fR]] [\fIserver\fR [\fI:port\fR [\fI:device\fR]]]
 .ad
 .hy
 
@@ -79,6 +79,9 @@ The \-speedunits option can be used to set the speed units for display; follow t
 cgps is a client resembling xgps, but without the pictorial satellite display and able to run on a serial terminal or terminal emulator\&.
 
 .PP
+The \fB\-s\fR option prevents cgps from printing the raw data\&. This display can also be toggled with the s command\&.
+
+.PP
 Rather than use X resources to detemine which units to use, cgps looks at variables in its environment\&. Here are the variables and values it checks:
 
 .IP