Refresh NEWS and website to reflect support for AIS devices.

4 files changed, 62 insertions, 55 deletions

diff --git a/www/gps_report.cgi b/www/gps_report.cgi
index c2536f64..83bebd7c 100644
--- a/www/gps_report.cgi
+++ b/www/gps_report.cgi
@@ -13,7 +13,7 @@ use strict;
 
 my $query = new CGI;
 print $query->header;
-print $query->start_html(-title=>"GPS Reporting Form",
+print $query->start_html(-title=>"GPSD Receiver Reporting Form",
 			 -background=>"../paper.gif");
 
 my $output_sample_file = $query->param('output_sample');
@@ -81,10 +81,10 @@ if (hasNeededElements($query) && $query->param("action") eq "Send Report"){
 print $query->start_multipart_form;
 
 print <<EOF;
-<h1>GPS Behavior Reporting Form</h1>
+<h1>GPSD Receiver Reporting Form</h1>
 
 <p>Please use this form to report <code>gpsd</code> successes or
-failures with GPS units, and also to upload a sample of the GPS's
+failures with GPS and AIS units, and also to upload a sample of the receiver's
 output so we can add it to our regression tests and ensure continued
 support of the device.</p>
 
@@ -92,7 +92,7 @@ support of the device.</p>
 in for the report to be useful.  These are: submitter contact address, vendor,
 model, documentation URL, and output sample.  Other fields represent things we
 might be able to find out ourselves, but which are easier for you to determine.
-Every bit of information you can give us about your GPS will help make the
+Every bit of information you can give us about your receiver will help make the
 support for it more reliable.</p>
 
 <hr/>
@@ -114,13 +114,13 @@ print <<EOF;
 
 <p>(It is not actually very likely we will contact you, but we need to
 be able to do it if we can find no other way of getting information
-about the device.  Expect to hear from us if your GPS is obsolescent or
+about the device.  Expect to hear from us if your receiver is obsolescent or
 exotic and the information you provide in the rest of this form turns
 out to be insufficient. Or if your browser is broken enough to botch
 the output-sample upload.)</p>
 
 <hr/>
-<h2>GPS type identification</h2>
+<h2>Receiver type identification</h2>
 
 <p><em style='color: #ff0000;'>Important!</em> Identify the vendor and model of
 your device.
@@ -147,15 +147,15 @@ EOF
 print $query->textfield(-name=>"techdoc", -size=>72);
 
 print <<EOF;
-<p>It is useful to have an indication of how the GPS is packaged.
+<p>It is useful to have an indication of how the receiver is packaged.
 
 <ul>
-<li>A "GPS mouse" is a standalone sensor in a display-less case designed 
-be used as an outbard peripheral to a computer.</li>
-<li>A "handset" is a standalone GPS with a display and human-usable controls.</li>
+<li>A "mouse" is a standalone sensor in a display-less case designed 
+be used as an peripheral to a computer.</li>
+<li>A "handset" is a standalone unit with a display and human-usable controls.</li>
 <li>A "handsfree" is a hands-free unit with display designed for mounting 
 on a car windshield or boat dash.</li>
-<li>A "survey" GPS is packaged for field-survey use.</li> 
+<li>A "survey" unit is packaged for field-survey use.</li> 
 <li>An "OEM module" is an un-cased circuit board with edge connectors.</li>
 <li>"chipset" is a bare chip or chips packaged for surface mount.</li>
 </ul>
@@ -164,16 +164,16 @@ on a car windshield or boat dash.</li>
 EOF
 
 print $query->radio_group(-name=>'packaging',
-			  -values=>['GPS mouse', 'handset', 'handsfree',
+			  -values=>['mouse', 'handset', 'handsfree',
 				'survey', 'OEM module', 'chipset', 'other'],
-			  -default=>"GPS mouse",
+			  -default=>"mouse",
 			  -linebreak=>'false');
 
 
 print <<EOF;
-<p>Please identify the GPS chipset and firmware version, if possible.  You
+<p>Please identify the device chipset and firmware version, if possible.  You
 may be able to get this from the display of <code>xgps</code>; look for
-a GPS Type field or at the window title bar. Alternatively, you may find
+a Device Type field or at the window title bar. Alternatively, you may find
 it in the technical manual.
 <br/>Example: <code>SiRF-II</code> amd <code>2.31ES</code>.</p>
 EOF
@@ -184,7 +184,7 @@ print "<p><em>Firmware:</em>",
     $query->textfield(-name=>"firmware", -size=>72),"</p>\n";
 
 print <<EOF;
-<p>Please identify, if possible, the NMEA version the GPS emits.
+<p>Please identify, if possible, the NMEA version the receiver emits.
 You may be able to get this information from the technical manual.
 Likely values are <code>2.0</code>, <code>2.2</code>, and <code>3.0</code>.
 If the GPS emits only a vendor binary protocol, leave this field blank.</p>
@@ -198,11 +198,11 @@ print <<EOF;
 <hr/>
 <h2>Interfaces</h2>
 
-<p>Please identify the GPS's interface type (USB, RS-232, Compact Flash,
-etc.). If the GPS has adapters that support other interfaces, tell us
-the one you have and mention the adapters in the "Technical Notes" box.
-If it has an exotic interface not listed here, select "Other" and tell us
-about it in "Technical Notes".</p>
+<p>Please identify the receiver's interface type (USB, RS-232, Bluetooth,
+Compact Flash, etc.). If the receiver has adapters that support other
+interfaces, tell us the one you have and mention the adapters in the "Technical
+Notes" box.  If it has an exotic interface not listed here, select "Other" and
+tell us about it in "Technical Notes".</p>
 
 EOF
 
@@ -240,13 +240,13 @@ print "<em>Tested with:</em>",$query->textfield(-name=>"tested",
 						-size=>6);
 
 print <<EOF;
-<p>Please rate how well this GPS functions with GPSD:</p>
+<p>Please rate how well this receiver functions with GPSD:</p>
 
 EOF
 
 my %labels=(
     "excellent",
-    "Excellent -- gpsd recognizes the GPS rapidly and reliably, reports are complete and correct.",
+    "Excellent -- gpsd recognizes the receiver rapidly and reliably, reports are complete and correct.",
     "good",
     "Good -- gpsd has minor problems or lag recognizing the device, but reports are complete and correct.",
     "fair",
@@ -292,13 +292,13 @@ print <<EOF;
 <h2>Output sample</h2>
 
 <p><em style='color: #ff0000;'>Important!</em> We need a sample of the output
-from your GPS - not the gpsd logfile, just raw output.  We'll use this for
+from your receiver - not the gpsd logfile, just raw output.  We'll use this for
 mechanical regression testing, which is your best guarantee that support for
 your device won't get broken in a future release. Please be advised that these
 logs will be sent to a publicly archived mailing list, and will be available in
 the public SVN repository.</p>
 
-<p>Almost all GPS receivers will simply start throwing data to your port
+<p>Almost all receivers will simply start throwing data to your port
 immediately when they're plugged in. You should normally be able to capture
 this output to a file with the <code>gpscat</code> utility.</p>
 
@@ -311,9 +311,9 @@ href="mailto:gpsd-dev\@lists.berlios.de">GPSD developers</a> for
 help.</p>
 
 <p>A log file is most useful when it contains (a) some sentences
-generated when the GPS has no fix, (b) some sentences representing
-a fix with the GPS stationary, and (c) some sentences representing
-a fix with the GPS moving.</p>
+generated when the receiver has no fix, (b) some sentences representing
+a fix with the unit stationary, and (c) some sentences representing
+a fix with the unit moving.</p>
 
 EOF
 
@@ -328,7 +328,7 @@ files.</p>
 
 <p>Location of the log capture. A good format would include your
 nearest city or other landmark, state/province, country code, and a
-rough latitude/longitude.  The GPS will give an exact location; we
+rough latitude/longitude.  A GPS will give an exact location; we
 want this as a sanity check.
 <br/>Example: <code>Groningen, NL, 53.2N 6.6E</code></p>
 
@@ -339,7 +339,7 @@ print"<em>Location:</em>",$query->textfield(-name=>"location",
 
 print <<EOF;
 
-<p>Day/month/year of the log capture (the GPS will give us
+<p>Day/month/year of the log capture (the receiver will give us
 hour/minute/second).
 <br/>Example: <code>20 May 2006</code>.</p>
 
@@ -350,9 +350,10 @@ print"<em>Date:</em>",$query->textfield(-name=>"date", -size=>72);
 
 print <<EOF;
 
-<p>The GPS's default sampling interval in seconds.  This will usually be 1.
-For SiRF chips it's always 1 and you can leave it blank; it's mainly
-interesting for NMEA devices with unknown chipsets.</p>
+<p>If the receiver is a GPS, the default sampling interval in seconds (not
+relevant for AIS receivers).  This will usually be 1.  For SiRF chips it's
+always 1 and you can leave it blank; it's mainly interesting for NMEA devices
+with unknown chipsets.</p>
 
 EOF
 
@@ -361,10 +362,11 @@ print"<em>Sampling interval:</em>",$query->textfield(-name=>"interval",
 
 print <<EOF;
 
-<p>First sentence in the GPS's reporting cycle.  Leave this blank for SiRF
-devices; it is mainly interesting for NMEA devices with unknown chipsets.
-You may be able to read it from the manual; if not, slowing the GPS to
-4800 will probably make the intercycle pause visible.</p>
+<p>First sentence in the GPS's reporting cycle (not relevant or AIS
+receivers).  Leave this blank for SiRF devices; it is mainly interesting for
+NMEA devices with unknown chipsets.  You may be able to read it from the
+manual; if not, slowing the GPS to 4800 will probably make the intercycle pause
+visible.</p>
 
 EOF
 
@@ -374,7 +376,7 @@ print"<em>First sentence:</em>",$query->textfield(-name=>"leader",
 print <<EOF;
 
 <p>Finally, add any notes you want to about how the sample was taken.  One
-good thing to put here would a description of how the GPS was moving while the
+good thing to put here would a description of how the unit was moving while the
 log was being captured.  If the sentence mix changes between "fix" and "no fix"
 states, that too is a good thing to note.</p>
 
diff --git a/www/hardware-head.html b/www/hardware-head.html
index cfd86499..38fd7417 100644
--- a/www/hardware-head.html
+++ b/www/hardware-head.html
@@ -103,14 +103,14 @@
 </div>
 </div>
 
-<p><code>gpsd</code> should work with any GPS using an RS232C or USB
-interface that advertises NMEA-0183 compliance.  Here are some notes
-on hardware we have tested.  Hyperlinks lead to technical information.
-The "Works with" column is the last <code>gpsd</code> version with
-which this GPS is known to have been successfully tested; A <img
-src="regression.png"/> in this column means we have a regression test
-load for the device that is checked before each release. Vendors are
-listed in alphabetical order.</p>
+<p><code>gpsd</code> should work with any GPS or AIS receiver using an
+RS232C or USB interface that advertises NMEA-0183 compliance.  Here
+are some notes on hardware we have tested.  Hyperlinks lead to
+technical information.  The "Works with" column is the last
+<code>gpsd</code> version with which this receiver is known to have been
+successfully tested; A <img src="regression.png"/> in this column
+means we have a regression test load for the device that is checked
+before each release. Vendors are listed in alphabetical order.</p>
 
 <p>There is also a <a href="#timing">table of PPS-capable
 receivers</a> which may be appropriate for timing use.</p>
@@ -126,7 +126,7 @@ of the problem. Where possible, we indicate this in the device table.</p>
 <ul>
 <li><img src="star.png"><img src="star.png"><img src="star.png"><img
 src="star.png"> marks devices with <b>Excellent</b> performance: gpsd
-recognizes the GPS rapidly and reliably, reports are complete and
+recognizes the receiver rapidly and reliably, reports are complete and
 correct.</li>
 
 <li><img src="star.png"><img src="star.png"><img src="star.png"> marks
diff --git a/www/history.html b/www/history.html
index bec3c624..f0e57180 100644
--- a/www/history.html
+++ b/www/history.html
@@ -157,6 +157,11 @@ configuration tools; <code>gpsmon</code> dates from this time
 author believes to be our design mistakes. We discuss it <a
 href="gypsy.html">here.</a>.</p>
 
+<p>In July and August 2009 ESR <a
+href="protocol-evolution.html">redesigned the GPSD command
+protocol</a> and gave <code>gpsd</code> the ability to read data from
+marine AIS receivers and pass it to clients.</p>
+
 <p>Further forks of <code>gpsd</code> seem unlikely, as the project is
 now sufficiently large and visible to co-opt most developers who might
 otherwise have forked the old 1.x sources or written a competing
diff --git a/www/index.html.in b/www/index.html.in
index 15d856ba..d00746b7 100644
--- a/www/index.html.in
+++ b/www/index.html.in
@@ -66,11 +66,11 @@
 <h1>About <code>gpsd</code></h1>
 
 <p><code>gpsd</code> is a service daemon that monitors one or more
-GPSes attached to a host computer through serial or USB ports, making
-all data on the location/course/velocity of the sensors available to
-be queried on TCP port 2947 of the host computer.  With
-<code>gpsd</code>, multiple GPS client applications (such as
-navigational and wardriving software) can share access to GPSes
+GPSes or AIS receivers attached to a host computer through serial or
+USB ports, making all data on the location/course/velocity of the
+sensors available to be queried on TCP port 2947 of the host computer.
+With <code>gpsd</code>, multiple location-aware client applications (such as
+navigational and wardriving software) can share access to receivers
 without contention or loss of data. Also, <code>gpsd</code> responds
 to queries with a format that is substantially easier to parse than
 the NMEA 0183 emitted by most GPSes.  The <code>gpsd</code>
@@ -80,8 +80,8 @@ applications can use to encapsulate all communication with
 <code>gpsd</code>.</para>
 
 <p>Besides <code>gpsd</code> itself, the project provides auxiliary
-tools for diagnostic monitoring and profiling of GPSes and feeding
-GPS-aware applications GPS logs for diagnostic purposes.</p>
+tools for diagnostic monitoring and profiling of receivers and feeding
+location-aware applications GPS/AIS logs for diagnostic purposes.</p>
 
 <p>The goal of the <code>gpsd</code> project is to create a solid
 layer of open-source infrastructure for programs running under Linux
@@ -105,7 +105,7 @@ configuration.  Binary packages for this program install hotplug
 scripts that do the right thing when a USB device goes active,
 launching <code>gpsd</code> if needed and telling <code>gpsd</code>
 which device to read data from.  Then, <code>gpsd</code> deduces a
-baud rate and GPS type by looking at the data stream.</p>
+baud rate and GPS/AIS type by looking at the data stream.</p>
 
 <p><code>gpsd</code> is high-quality, carefully-audited code.  It is
 regularly checked with the standard mode of <a