summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/README7
-rw-r--r--test/daemon/GPSmap-76S.log2
-rw-r--r--test/daemon/ac12.log2
-rw-r--r--test/daemon/ac12_binary.logbin25806 -> 25803 bytes
-rw-r--r--test/daemon/ait250.log2
-rw-r--r--test/daemon/blumax-gps009.log2
-rw-r--r--test/daemon/bn-9015.log2
-rw-r--r--test/daemon/bt-q818.log2
-rw-r--r--test/daemon/bt451.log2
-rw-r--r--test/daemon/bu303-climbing.logbin12941 -> 12938 bytes
-rw-r--r--test/daemon/bu303-moving.logbin13882 -> 13879 bytes
-rw-r--r--test/daemon/bu303-nofix.logbin3490 -> 3487 bytes
-rw-r--r--test/daemon/bu303-stillfix.logbin5198 -> 5195 bytes
-rw-r--r--test/daemon/bu303b-nofix.logbin3205 -> 3202 bytes
-rw-r--r--test/daemon/ch-4701.log2
-rw-r--r--test/daemon/ch-4711.log2
-rw-r--r--test/daemon/com-1289.log2
-rw-r--r--test/daemon/eXplorist210.log2
-rw-r--r--test/daemon/et-332.log2
-rw-r--r--test/daemon/firefly-II.log2
-rw-r--r--test/daemon/foretrex-201.log2
-rw-r--r--test/daemon/garmin-10x.log2
-rw-r--r--test/daemon/garmin-geko201.log2
-rw-r--r--test/daemon/garmin17n.log2
-rw-r--r--test/daemon/garmin25lp.log2
-rw-r--r--test/daemon/garmin38.log2
-rw-r--r--test/daemon/garmin48.log2
-rw-r--r--test/daemon/geos-1m.log2
-rw-r--r--test/daemon/geostar-geos1m-binary.logbin137372 -> 137369 bytes
-rw-r--r--test/daemon/gp-320fw-2019-03-28.log2
-rw-r--r--test/daemon/gp-320fw-2019-04-06-overflow.log2
-rw-r--r--test/daemon/gp-320fw-2019-04-07-coldboot.logbin7862 -> 7859 bytes
-rw-r--r--test/daemon/gps-360.log2
-rw-r--r--test/daemon/gpslim236.log2
-rw-r--r--test/daemon/holux-gm-210.log2
-rw-r--r--test/daemon/hp58534a.log2
-rw-r--r--test/daemon/humminbird-M37.log2
-rw-r--r--test/daemon/iTrek.log2
-rw-r--r--test/daemon/italk-binary.logbin31821 -> 31818 bytes
-rw-r--r--test/daemon/magellan-ec10.log2
-rw-r--r--test/daemon/magellan315.log2
-rw-r--r--test/daemon/motorola-t805.log2
-rw-r--r--test/daemon/mtk-3301.log2
-rw-r--r--test/daemon/mtk-3329.log2
-rw-r--r--test/daemon/myguide-3100.log2
-rw-r--r--test/daemon/naujoks-ntrip.log2
-rw-r--r--test/daemon/naujoks-rtcm2.log2
-rw-r--r--test/daemon/navcom.logbin15144 -> 15141 bytes
-rw-r--r--test/daemon/nd-1005.log2
-rw-r--r--test/daemon/nl402u.log2
-rw-r--r--test/daemon/nokia-ld-4w.log2
-rw-r--r--test/daemon/oncore.log2
-rw-r--r--test/daemon/pharos-360.log2
-rw-r--r--test/daemon/polarx2.log2
-rw-r--r--test/daemon/rgm3800.log2
-rw-r--r--test/daemon/rtcm2.log2
-rw-r--r--test/daemon/rtcm3.logbin395 -> 392 bytes
-rw-r--r--test/daemon/saab-r4.log2
-rw-r--r--test/daemon/sounder.log2
-rw-r--r--test/daemon/superstar2.logbin24021 -> 24018 bytes
-rw-r--r--test/daemon/tn200-all.log2
-rw-r--r--test/daemon/tn200.log2
-rw-r--r--test/daemon/tn204.log2
-rw-r--r--test/daemon/tnt-revolution.log2
-rw-r--r--test/daemon/tomtom-mkII.log2
-rw-r--r--test/daemon/tr737A+.log2
-rw-r--r--test/daemon/trimble-lassen_iq-3dfix.logbin7543 -> 7540 bytes
-rw-r--r--test/daemon/trimble-lassen_iq-playacar.logbin4464 -> 4461 bytes
-rw-r--r--test/daemon/trimble-lassen_iq.logbin10314 -> 10311 bytes
-rw-r--r--test/daemon/uBlox-aek-4t.logbin14728 -> 14725 bytes
-rw-r--r--test/daemon/uBlox-lea-4h.log2
-rw-r--r--test/daemon/uBlox-lea-4s.log2
-rw-r--r--test/daemon/uBlox-lea-5h.log2
-rw-r--r--test/daemon/uBlox-sirf1.logbin17489 -> 17486 bytes
-rw-r--r--test/daemon/ublox-lea-5q.log2
-rw-r--r--test/daemon/venus634lp.log2
-rw-r--r--test/daemon/zodiac.logbin5648 -> 5645 bytes
-rw-r--r--test/sample.rtcm22
-rw-r--r--www/faq.html.in4
79 files changed, 65 insertions, 64 deletions
diff --git a/test/README b/test/README
index a15090e7..1549fdd7 100644
--- a/test/README
+++ b/test/README
@@ -5,8 +5,9 @@ regression-test loads for gpsfake -p.
Structured headers are as follows:
# Name: Product name
-# Chipset: chipset name and (if possible) firmware revision level.
-# Description: product description (optional)
-# Submitted-by: who sent it
+# Chipset: chipset name
+# Firmware: firmware revision level
+# Submitter: who sent it
# Date: when it was received (ISO8601 yyyy-mm-dd)
# Location: city, state/province, country, approximate lat/lon
+# Sample-Notes: Notes on how the sample was taken
diff --git a/test/daemon/GPSmap-76S.log b/test/daemon/GPSmap-76S.log
index 24d288ed..a3505620 100644
--- a/test/daemon/GPSmap-76S.log
+++ b/test/daemon/GPSmap-76S.log
@@ -1,6 +1,6 @@
# Name: Garmin GPSmap 76S
# Description: Garmin handset GPS
-# Submitted-by: Brad Skillman <brad.skillman@cobham.com>
+# Submitter: Brad Skillman <brad.skillman@cobham.com>
# Date: 2011-10-24
# Location: Centreville, VA, 38.9084N, 77.4408W
$GPRMC,125106,V,3854.5087,N,07726.4523,W,0.0,0.0,241011,10.5,W,S*28
diff --git a/test/daemon/ac12.log b/test/daemon/ac12.log
index aabbf5b6..d38997bc 100644
--- a/test/daemon/ac12.log
+++ b/test/daemon/ac12.log
@@ -1,6 +1,6 @@
# Name: Magellan Professional (formerly Thales/Ashtech) AC12
# Chipset: AC12
-# Submitted-by: Chris Kuethe <chris.kuethe@gmail.com>
+# Submitter: Chris Kuethe <chris.kuethe@gmail.com>
# Date: 2007-12-23
# Location: Playa del Carmen, Mexico. 20.63N/87.07W
#
diff --git a/test/daemon/ac12_binary.log b/test/daemon/ac12_binary.log
index 145f7cf1..6955ffe9 100644
--- a/test/daemon/ac12_binary.log
+++ b/test/daemon/ac12_binary.log
Binary files differ
diff --git a/test/daemon/ait250.log b/test/daemon/ait250.log
index 2fb7ef62..3f6e1a66 100644
--- a/test/daemon/ait250.log
+++ b/test/daemon/ait250.log
@@ -1,7 +1,7 @@
# Name: Digital Yacht AIT250
# Chipset: Unknown
# Description: Class B Marine AIS receiver
-# Submitted-by: Jan Veninga <veninga@familiemail.nl>
+# Submitter: Jan Veninga <veninga@familiemail.nl>
# Date: 2009-07-30
# Location: Enkhuizen, The Netherlands, 52.69997N/5.290465E
#
diff --git a/test/daemon/blumax-gps009.log b/test/daemon/blumax-gps009.log
index 490c3170..40fc4991 100644
--- a/test/daemon/blumax-gps009.log
+++ b/test/daemon/blumax-gps009.log
@@ -1,6 +1,6 @@
# Name: Blumax GPS-009
# Chipset: SiRF Star III (according to data sheet)
-# Submitted-by: Hartmut Holzgraefe <hartmut@php.net>
+# Submitter: Hartmut Holzgraefe <hartmut@php.net>
# Date: 2008-07-18
# Location: Bielefeld, DE, 52=B0 01' N, 08=B0 31' O
#
diff --git a/test/daemon/bn-9015.log b/test/daemon/bn-9015.log
index 52d07197..64a4af1c 100644
--- a/test/daemon/bn-9015.log
+++ b/test/daemon/bn-9015.log
@@ -1,6 +1,6 @@
# Name: Bluenext BN-9015
# Chipset: Skytraq Venus 6
-# Submitted-by: Andrew Gray <andy_r_gray@hotmail.com>
+# Submitter: Andrew Gray <andy_r_gray@hotmail.com>
# Date: 2010-06-12
# Location: Delft, NL, 52.01N 4.36E
#
diff --git a/test/daemon/bt-q818.log b/test/daemon/bt-q818.log
index 5fb2d807..b2da310e 100644
--- a/test/daemon/bt-q818.log
+++ b/test/daemon/bt-q818.log
@@ -1,6 +1,6 @@
# Name: BT-Q818
# Chipset: MTK
-# Submitted-by: Jason Komut <jason.komut+gpsd@gmail.com>
+# Submitter: Jason Komut <jason.komut+gpsd@gmail.com>
# Date: 2010-06-03
# Time: 7:53 PST
# Location: +34? 1' 58.80", -117? 44' 49.56"
diff --git a/test/daemon/bt451.log b/test/daemon/bt451.log
index fd19c8ae..ebe7fe1c 100644
--- a/test/daemon/bt451.log
+++ b/test/daemon/bt451.log
@@ -1,6 +1,6 @@
# Name: BT-451
# Chipset: ANTARIS ATR062x
-# Submitted-by: Mindaugas <mindedie@zebra.lt>
+# Submitter: Mindaugas <mindedie@zebra.lt>
# Date: 2009-12-09
# Location: Lithuania, 55.8N 23.6E
#
diff --git a/test/daemon/bu303-climbing.log b/test/daemon/bu303-climbing.log
index f1ca1066..2cb7022a 100644
--- a/test/daemon/bu303-climbing.log
+++ b/test/daemon/bu303-climbing.log
Binary files differ
diff --git a/test/daemon/bu303-moving.log b/test/daemon/bu303-moving.log
index fcf4e017..61b6b654 100644
--- a/test/daemon/bu303-moving.log
+++ b/test/daemon/bu303-moving.log
Binary files differ
diff --git a/test/daemon/bu303-nofix.log b/test/daemon/bu303-nofix.log
index 4eecb3d1..a0c716c4 100644
--- a/test/daemon/bu303-nofix.log
+++ b/test/daemon/bu303-nofix.log
Binary files differ
diff --git a/test/daemon/bu303-stillfix.log b/test/daemon/bu303-stillfix.log
index 3a562484..7cb417c7 100644
--- a/test/daemon/bu303-stillfix.log
+++ b/test/daemon/bu303-stillfix.log
Binary files differ
diff --git a/test/daemon/bu303b-nofix.log b/test/daemon/bu303b-nofix.log
index 7ac715c9..54640d24 100644
--- a/test/daemon/bu303b-nofix.log
+++ b/test/daemon/bu303b-nofix.log
Binary files differ
diff --git a/test/daemon/ch-4701.log b/test/daemon/ch-4701.log
index c88cc81e..9ed5d4e3 100644
--- a/test/daemon/ch-4701.log
+++ b/test/daemon/ch-4701.log
@@ -1,7 +1,7 @@
# Name: NAVIOR-24
# Chipset: CH-4701
# Description: single board 24-channel OEM receiver, GLONASS/GPS systems.
-# Submitted-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
+# Submitter: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
# Date: 2008-05-29
# Location: Minsk, Belarus, 53N 27E
$GPGGA,123433.000,5356.21442,N,02734.85952,E,1,04,07.2,251.9,M,26.0,M,,*67
diff --git a/test/daemon/ch-4711.log b/test/daemon/ch-4711.log
index de9b5d74..f955f23a 100644
--- a/test/daemon/ch-4711.log
+++ b/test/daemon/ch-4711.log
@@ -1,7 +1,7 @@
# Name: CH-4711
# Chipset: CH-4706, rev "m4706 03.10 02/06/09 | 12044 | M2002 05.01 02/06/09"
# Description: Russian-made GPS mouse emitting GLONASS sentences.
-# Submitted-by: walkie@mail.ru
+# Submitter: walkie@mail.ru
# Date: 2009-12-05
# Location = Moscow, Russia, 55.71N 37.41E
# Notes: Emits GLONASS sentences. Mostly 2D fixes but it loses
diff --git a/test/daemon/com-1289.log b/test/daemon/com-1289.log
index ad8b5e09..4fa34d6f 100644
--- a/test/daemon/com-1289.log
+++ b/test/daemon/com-1289.log
@@ -1,6 +1,6 @@
# Name: Eurotech Com-1289
# Chipset: Fastrax iTrax03
-# Submitted-by: Simon Le Pape <simon.le-pape@hotmail.fr>
+# Submitter: Simon Le Pape <simon.le-pape@hotmail.fr>
# Date: 2007-12-10
# Location: Rennes, Ile-etVilaine, France
# Documentation says this chip emits ZDA and RMC in that order.
diff --git a/test/daemon/eXplorist210.log b/test/daemon/eXplorist210.log
index 37ca5add..5ac3164d 100644
--- a/test/daemon/eXplorist210.log
+++ b/test/daemon/eXplorist210.log
@@ -1,6 +1,6 @@
# Name: Magellan eXplorist 210
# Chipset: unknown
-# Submitted-by: "Paul B van den Berg" <paulberg@wanadoo.nl>
+# Submitter: "Paul B van den Berg" <paulberg@wanadoo.nl>
# Date: 2006-05-20
# Location: Groningen, NL, 53.2N6.6E
#
diff --git a/test/daemon/et-332.log b/test/daemon/et-332.log
index e8b083af..06b2019e 100644
--- a/test/daemon/et-332.log
+++ b/test/daemon/et-332.log
@@ -1,6 +1,6 @@
# Name: ET-322 engine board from GlobalSat
# Chipset: SiRF-III
-# Submitted-by: Val Schmidt <vschmidt@ccom.unh.edu>
+# Submitter: Val Schmidt <vschmidt@ccom.unh.edu>
# Date: 2010-04-25
# Location: Newark, DE
# Transport: UDP
diff --git a/test/daemon/firefly-II.log b/test/daemon/firefly-II.log
index 308ed105..0f308155 100644
--- a/test/daemon/firefly-II.log
+++ b/test/daemon/firefly-II.log
@@ -1,6 +1,6 @@
# Name: Firefly-IIa
# Chipset: UBLOX NEO-5Q
-# Submitted-by: Said Jackson <saidjack@aol.com>
+# Submitter: Said Jackson <saidjack@aol.com>
# Date: 2010-07-07
# Location: Los Gatos, CA, 170 Knowles Drive
$GPGGA,005947.00,3715.6616,N,12157.6709,W,,11,0.8,86.0,M,-30.1,M,,*54
diff --git a/test/daemon/foretrex-201.log b/test/daemon/foretrex-201.log
index ac8bfd9d..14aaea82 100644
--- a/test/daemon/foretrex-201.log
+++ b/test/daemon/foretrex-201.log
@@ -1,6 +1,6 @@
# Name: Garmin Foretrex 201
# Description: A small GPS meant to be worn like a wristwatch
-# Submitted-by: Anders Lund <anders@alweb.dk>
+# Submitter: Anders Lund <anders@alweb.dk>
# Date: 2010-08-26
# Location: 55.04N 10.25E, Ulbølle, Denmark
# Notes: The device was just lying in the window, I used
diff --git a/test/daemon/garmin-10x.log b/test/daemon/garmin-10x.log
index 42a0d0bb..25b94284 100644
--- a/test/daemon/garmin-10x.log
+++ b/test/daemon/garmin-10x.log
@@ -1,6 +1,6 @@
# Name: Garmin Mobile 10
# Description: Garmin Mobile 10 for laptops
-# Submitted-by: David Ludlow <davel@adsllc.com>
+# Submitter: David Ludlow <davel@adsllc.com>
# Date: 2010-07-18
# Location: Toledo, OH 41.7 N 83.6 W
#
diff --git a/test/daemon/garmin-geko201.log b/test/daemon/garmin-geko201.log
index c644f0eb..04465be9 100644
--- a/test/daemon/garmin-geko201.log
+++ b/test/daemon/garmin-geko201.log
@@ -1,6 +1,6 @@
# Name: Garmin Geko 201
# Chipset: Garmin proprietary
-# Submitted-by: "Jose Luis Domingo Lopez" <gps@24x7linux.com>
+# Submitter: "Jose Luis Domingo Lopez" <gps@24x7linux.com>
# Date: 2005-06-14
# Location: Madrid, Madrid, Spain (ES), 40.39N 03.64E
# Comments: This is demo-mode data, with no actual fixes.
diff --git a/test/daemon/garmin17n.log b/test/daemon/garmin17n.log
index 5d031f56..33138551 100644
--- a/test/daemon/garmin17n.log
+++ b/test/daemon/garmin17n.log
@@ -1,6 +1,6 @@
# Name: Garmin 17N
# Chipset:
-# Submitted-by: Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Submitter: Wojciech Kazubski <wk@ire.pw.edu.pl>
# Comment: Only emits GPRMC when it has a fix.
# Date: 2005-03-12
#
diff --git a/test/daemon/garmin25lp.log b/test/daemon/garmin25lp.log
index 57ae9c58..4f11c4dd 100644
--- a/test/daemon/garmin25lp.log
+++ b/test/daemon/garmin25lp.log
@@ -1,6 +1,6 @@
# Name: Garmin 25LP
# Chipset: Garmin proprietary, emits NMEA 2.0
-# Submitted-by: Daniele Giangrazi <daniele.giangrazi@elital.net>
+# Submitter: Daniele Giangrazi <daniele.giangrazi@elital.net>
# Date: 2005-03-22
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/garmin38.log b/test/daemon/garmin38.log
index 24448a7d..3e47aad3 100644
--- a/test/daemon/garmin38.log
+++ b/test/daemon/garmin38.log
@@ -1,5 +1,5 @@
# Name: Garmin 38
-# Submitted-by: "Pascal F. Martin" <pascal.martin@cox.net>
+# Submitter: "Pascal F. Martin" <pascal.martin@cox.net>
# Date: 2005-03-18
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/garmin48.log b/test/daemon/garmin48.log
index 9272fa14..4489f2ec 100644
--- a/test/daemon/garmin48.log
+++ b/test/daemon/garmin48.log
@@ -6,7 +6,7 @@
# from the GPRMC and GPGGA timestamps. Appears to take 2 fixes
# per cycle, GLL can include a fix update!
#
-# Submitted-by: Hamish <hamish_nospam@yahoo.com>
+# Submitter: Hamish <hamish_nospam@yahoo.com>
# Date: 2005-03-11
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/geos-1m.log b/test/daemon/geos-1m.log
index ec31c007..752353c5 100644
--- a/test/daemon/geos-1m.log
+++ b/test/daemon/geos-1m.log
@@ -1,6 +1,6 @@
# Name: GeoS 1M
# Description: A combined GPS/GLONASS OEM receiver board, 24 channels
-# Submitted-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
+# Submitter: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
# Date: 2010-07-09
# Location: Minsk, Belarus, 53N 27E
# Notes: NMEA output for a few minutes after power-up
diff --git a/test/daemon/geostar-geos1m-binary.log b/test/daemon/geostar-geos1m-binary.log
index a76466d5..1a1ed8c3 100644
--- a/test/daemon/geostar-geos1m-binary.log
+++ b/test/daemon/geostar-geos1m-binary.log
Binary files differ
diff --git a/test/daemon/gp-320fw-2019-03-28.log b/test/daemon/gp-320fw-2019-03-28.log
index 1456de5d..c952caea 100644
--- a/test/daemon/gp-320fw-2019-03-28.log
+++ b/test/daemon/gp-320fw-2019-03-28.log
@@ -1,7 +1,7 @@
# Name: GPS-320FW
# Chipset: SE4100L + PL-6313
# Description: OEM module from RF Solutions, Inc
-# Submitted-by: f4eru <f4eru@free.fr>
+# Submitter: f4eru <f4eru@free.fr>
# Date: 2010-10-16
# Notes: This is the chip in normal operation, but with a sat simulator
# spoofing it into thinking it is 2019-03-28. The chip is known to have
diff --git a/test/daemon/gp-320fw-2019-04-06-overflow.log b/test/daemon/gp-320fw-2019-04-06-overflow.log
index c3504f31..694a859f 100644
--- a/test/daemon/gp-320fw-2019-04-06-overflow.log
+++ b/test/daemon/gp-320fw-2019-04-06-overflow.log
@@ -1,7 +1,7 @@
# Name: GPS-320FW
# Chipset: SE4100L + PL-6313
# Description: OEM module from RF Solutions, Inc
-# Submitted-by: f4eru <f4eru@free.fr>
+# Submitter: f4eru <f4eru@free.fr>
# Date: 2010-10-16
# Notes: This is the chip in normal operation after warm boot, but
# with a sat simulator spoofing it into thinking it is
diff --git a/test/daemon/gp-320fw-2019-04-07-coldboot.log b/test/daemon/gp-320fw-2019-04-07-coldboot.log
index 27c05a16..19c80f49 100644
--- a/test/daemon/gp-320fw-2019-04-07-coldboot.log
+++ b/test/daemon/gp-320fw-2019-04-07-coldboot.log
Binary files differ
diff --git a/test/daemon/gps-360.log b/test/daemon/gps-360.log
index d9589f64..91b8eefc 100644
--- a/test/daemon/gps-360.log
+++ b/test/daemon/gps-360.log
@@ -1,6 +1,6 @@
# Name: Pharos GPS-360
# Chipset: SiRfII
-# Submitted-by: "Jeff Fisher" <guppy@techmonkeys.org>
+# Submitter: "Jeff Fisher" <guppy@techmonkeys.org>
# Date: 2006-07-27
# Location: Regina, Saskatchewan, Canada, 50N104W
#
diff --git a/test/daemon/gpslim236.log b/test/daemon/gpslim236.log
index 281f01aa..885ec1b8 100644
--- a/test/daemon/gpslim236.log
+++ b/test/daemon/gpslim236.log
@@ -1,6 +1,6 @@
# Name: Holux GPSlim 236
# Chipset: SiRF-III
-# Submitted-by: "Kévin REDON" <kevredon@gmail.com>
+# Submitter: "Kévin REDON" <kevredon@gmail.com>
# Date: 2006-07-22
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/holux-gm-210.log b/test/daemon/holux-gm-210.log
index c0c5d704..3f41b2d2 100644
--- a/test/daemon/holux-gm-210.log
+++ b/test/daemon/holux-gm-210.log
@@ -1,6 +1,6 @@
# Name: Holux GM-210
# Chipset: SiRF-II
-# Submitted-by: "Patrick L. McGillan" <pmcgillan@pateri.com>
+# Submitter: "Patrick L. McGillan" <pmcgillan@pateri.com>
# Date: 2005-04-04
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/hp58534a.log b/test/daemon/hp58534a.log
index 4b36f8d4..61ccfddd 100644
--- a/test/daemon/hp58534a.log
+++ b/test/daemon/hp58534a.log
@@ -1,5 +1,5 @@
# Name: HP (Symmetricom) 58534AGPS
-# Submitted-by: aquarat
+# Submitter: aquarat
# Date: 2010-10-26
# Notes: shows GPZDA bug in gpsd 2.95
#
diff --git a/test/daemon/humminbird-M37.log b/test/daemon/humminbird-M37.log
index dd5a2b4a..07da611f 100644
--- a/test/daemon/humminbird-M37.log
+++ b/test/daemon/humminbird-M37.log
@@ -1,5 +1,5 @@
# Name: Humminbird Matrix 37 Fishing System, Humminbird GR16 Receiver
-# Submitted-by: "Carl Brown"<cbsled@verizon.net>
+# Submitter: "Carl Brown"<cbsled@verizon.net>
# Date: 2006-09-16
# Location: Connecticut River, New Hampshire, USA, 44N71W
# Comments: Powerboat track with NMEA depth (DPT) and water temperature (MTW) sentences
diff --git a/test/daemon/iTrek.log b/test/daemon/iTrek.log
index d8af5337..e2d9bd79 100644
--- a/test/daemon/iTrek.log
+++ b/test/daemon/iTrek.log
@@ -1,5 +1,5 @@
# Name: i.Trek M3
-# Submitted-by: "Lance Fetters" <ashikase@users.sourceforge.net>
+# Submitter: "Lance Fetters" <ashikase@users.sourceforge.net>
# Date: 2005-07-27
# Location: Anpachi, Gifu, JP, 35N136E
# Note that this log file is a combination of two separate logs,
diff --git a/test/daemon/italk-binary.log b/test/daemon/italk-binary.log
index d241bf4f..93a76c55 100644
--- a/test/daemon/italk-binary.log
+++ b/test/daemon/italk-binary.log
Binary files differ
diff --git a/test/daemon/magellan-ec10.log b/test/daemon/magellan-ec10.log
index 3bc3374b..39e8e63f 100644
--- a/test/daemon/magellan-ec10.log
+++ b/test/daemon/magellan-ec10.log
@@ -1,5 +1,5 @@
# Name: Magellan EC-10X
-# Submitted-by: "Gary E. Miller" <gem@rellim.com>
+# Submitter: "Gary E. Miller" <gem@rellim.com>
# Date: 2005-06-09
# Time: 20:52 UTC
# Location: Bend, OR 44N121W
diff --git a/test/daemon/magellan315.log b/test/daemon/magellan315.log
index f70dbc6a..01f66d66 100644
--- a/test/daemon/magellan315.log
+++ b/test/daemon/magellan315.log
@@ -1,5 +1,5 @@
# Name: Magellan 315
-# Submitted-by: Ángel Marqués Mateu <amarques@cgf.upv.es>
+# Submitter: Ángel Marqués Mateu <amarques@cgf.upv.es>
# Date: 2005-03-12
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/motorola-t805.log b/test/daemon/motorola-t805.log
index 473e9d20..28b4e71f 100644
--- a/test/daemon/motorola-t805.log
+++ b/test/daemon/motorola-t805.log
@@ -2,7 +2,7 @@
# Chipset: SiRF III f
# Pause-noted: Y
# Well-behaved: Y
-# Submitted-by: "Olivier Lahaye"=20
+# Submitter: "Olivier Lahaye"=20
# Date: 2007-12-18
# Location: Nozay, 48.66564N2.24812E
#
diff --git a/test/daemon/mtk-3301.log b/test/daemon/mtk-3301.log
index 09233773..388a94a8 100644
--- a/test/daemon/mtk-3301.log
+++ b/test/daemon/mtk-3301.log
@@ -1,6 +1,6 @@
# Name: San Jose Navigation FV-M11
# Chipset: MKT-3301
-# Submitted-by: "Henk Fijnvandraat"
+# Submitter: "Henk Fijnvandraat"
# Date: 2008-08-23
# Location: Enschede, NL, 52.21N 6.88E
#
diff --git a/test/daemon/mtk-3329.log b/test/daemon/mtk-3329.log
index 53e77a4b..b4a122ec 100644
--- a/test/daemon/mtk-3329.log
+++ b/test/daemon/mtk-3329.log
@@ -1,7 +1,7 @@
# Name: Fastrax IT520U
# Chipset: MTK
# Description: OEM module
-# Submitted-by: Kai Scharwies <scharwies@imst.de>
+# Submitter: Kai Scharwies <scharwies@imst.de>
# Date: 2011-02-21
# Location: Kamp Lintfort, DE, 51deg 29min N, 6deg 32min E
#
diff --git a/test/daemon/myguide-3100.log b/test/daemon/myguide-3100.log
index 36338e95..2dc827ba 100644
--- a/test/daemon/myguide-3100.log
+++ b/test/daemon/myguide-3100.log
@@ -2,7 +2,7 @@
# Vendor: Typhoon
# Chipset: Unknown
# Description: Car-dash GPS
-# Submitted-by: Gleb Smirnoff <glebius@glebius.int.ru>
+# Submitter: Gleb Smirnoff <glebius@glebius.int.ru>
# Date: 2011-03-23
# Notes: Contains initial segement of no fix followed by stationary fix.
# The 3100 has been end-of-lifed but is still found in the wild.
diff --git a/test/daemon/naujoks-ntrip.log b/test/daemon/naujoks-ntrip.log
index 6c82991c..7a43daf4 100644
--- a/test/daemon/naujoks-ntrip.log
+++ b/test/daemon/naujoks-ntrip.log
@@ -1,6 +1,6 @@
# Name: Ntrip caster
# Description: RTCM2 data returened by an Ntrip caster
-# Submitted-by: Andre Naujoks <nautsch2@googlemail.com>
+# Submitter: Andre Naujoks <nautsch2@googlemail.com>
# Date: 2011-02-22
#
GET /EPS_NI HTTP/1.1
diff --git a/test/daemon/naujoks-rtcm2.log b/test/daemon/naujoks-rtcm2.log
index 2ede4b18..7526864b 100644
--- a/test/daemon/naujoks-rtcm2.log
+++ b/test/daemon/naujoks-rtcm2.log
@@ -1,6 +1,6 @@
# Name: RTCM2 test data
# Description: Bare RTCM2 data
-# Submitted-by: Andre Naujoks <nautsch2@googlemail.com>
+# Submitter: Andre Naujoks <nautsch2@googlemail.com>
# Date: 2011-04-05
# Note: There's an ASCII dump of the first 22 packets in this data in the
# test directory as naujoks-rtcm2.dcd
diff --git a/test/daemon/navcom.log b/test/daemon/navcom.log
index 762d69d0..9c5e7ade 100644
--- a/test/daemon/navcom.log
+++ b/test/daemon/navcom.log
Binary files differ
diff --git a/test/daemon/nd-1005.log b/test/daemon/nd-1005.log
index 4e4ad474..3868134a 100644
--- a/test/daemon/nd-1005.log
+++ b/test/daemon/nd-1005.log
@@ -1,7 +1,7 @@
# Name: Globalsat ND-1005
# Chipset: SiRF-3
# Description: GPS mouse
-# Submitted-by: George E Farmer <gefgef@hotmail.com>
+# Submitter: George E Farmer <gefgef@hotmail.com>
# Date: 2011-03-14
# Location: Aberdeen, SCOTLAND, 57.16N 2.12W
# Notes: Unit stationary.
diff --git a/test/daemon/nl402u.log b/test/daemon/nl402u.log
index 4b8be9df..5afcfea5 100644
--- a/test/daemon/nl402u.log
+++ b/test/daemon/nl402u.log
@@ -1,6 +1,6 @@
# Name: NL-402U USB Empfänger
# Chipset: u-blox5 GPS & GALILEO SuperSense®
-# Submitted-by: Klaus Plöger k.ploeger@gastradata.de
+# Submitter: Klaus Plöger k.ploeger@gastradata.de
# Date: 2009-07-24
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/nokia-ld-4w.log b/test/daemon/nokia-ld-4w.log
index c779a7c7..a7aefffc 100644
--- a/test/daemon/nokia-ld-4w.log
+++ b/test/daemon/nokia-ld-4w.log
@@ -1,7 +1,7 @@
# Name: Nokia LD-4W
# Chipset: SiRF-3
# Description: Bletooth add-on for Nokia mobile phone
-# Submitted-by: jussi.kivilinna@mbnet.fi
+# Submitter: jussi.kivilinna@mbnet.fi
# Date: 2009-12-05
# Location: Oulu, FI, 65N 25E
#
diff --git a/test/daemon/oncore.log b/test/daemon/oncore.log
index f0f48437..62c1e3b8 100644
--- a/test/daemon/oncore.log
+++ b/test/daemon/oncore.log
@@ -1,5 +1,5 @@
# Name: Oncore GT+
-# Submitted-by: Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Submitter: Wojciech Kazubski <wk@ire.pw.edu.pl>
# Date: 2005-04-12
#
# This file is Copyright (c) 2010 by the GPSD project
diff --git a/test/daemon/pharos-360.log b/test/daemon/pharos-360.log
index 8b4c28e3..3c989fa9 100644
--- a/test/daemon/pharos-360.log
+++ b/test/daemon/pharos-360.log
@@ -1,6 +1,6 @@
# Name: Pharos GPS-360
# Chipset: Sirf-II
-# Submitted-by: "Jeff Fisher" <guppy@techmonkeys.org>
+# Submitter: "Jeff Fisher" <guppy@techmonkeys.org>
# Date: 2006-07-27
# Location: Regina, Saskatchewan, Canada, 50N104W
#
diff --git a/test/daemon/polarx2.log b/test/daemon/polarx2.log
index 2ee1e606..e03cd4d7 100644
--- a/test/daemon/polarx2.log
+++ b/test/daemon/polarx2.log
@@ -1,7 +1,7 @@
# Name: Septentrio PolarRx2
# Chipset: PolarRx2
# Description: OEM module
-# Submitted-by: José Miguel Gonçalves <jose.goncalves@inov.pt>
+# Submitter: José Miguel Gonçalves <jose.goncalves@inov.pt>
# Date: 2012-03-22
# Notes: Submitter writes:
# While working with a Septentrio PolarRx2 receiver, I've noticed that
diff --git a/test/daemon/rgm3800.log b/test/daemon/rgm3800.log
index b116bd82..c91baead 100644
--- a/test/daemon/rgm3800.log
+++ b/test/daemon/rgm3800.log
@@ -1,6 +1,6 @@
# Name: Royaltek RGM-3800
# Chipset: Sirf GSC3f/LP ?
-# Submitted-by: "Philipp Klenze" <hq.ks@web.de>
+# Submitter: "Philipp Klenze" <hq.ks@web.de>
# Date: 2008-08-21
# Location: TU Munich, Garching, DE, 48.3N, 11.7E
#
diff --git a/test/daemon/rtcm2.log b/test/daemon/rtcm2.log
index 310a373d..c8f726b4 100644
--- a/test/daemon/rtcm2.log
+++ b/test/daemon/rtcm2.log
@@ -1,6 +1,6 @@
# Name: RTCM-104 source from a DGPSIP server
# Type: RTCM
-# Submitted-by: Wolfgang Rupprecht <wolfgang@dwsrcc.com>
+# Submitter: Wolfgang Rupprecht <wolfgang@dwsrcc.com>
# Notes: Has leading garbage, to test parity locking.
# This is a truncated version of the sample.rtcm file used to test
# gpsdecode.
diff --git a/test/daemon/rtcm3.log b/test/daemon/rtcm3.log
index 1d994eea..69a3b04b 100644
--- a/test/daemon/rtcm3.log
+++ b/test/daemon/rtcm3.log
Binary files differ
diff --git a/test/daemon/saab-r4.log b/test/daemon/saab-r4.log
index 6064a84b..7f05777a 100644
--- a/test/daemon/saab-r4.log
+++ b/test/daemon/saab-r4.log
@@ -1,6 +1,6 @@
# Name: Saab AIS-GPS R4 Positioning System
# Description: product description (optional)
-# Submitted-by: vwf@julkor.net
+# Submitter: vwf@julkor.net
# Date: 2011-06-01
!AIVDM,1,1,,B,13aGhtw0R<OJf=6LgQ?Ad1FF05`L,0*24
diff --git a/test/daemon/sounder.log b/test/daemon/sounder.log
index 16364402..31c2eda8 100644
--- a/test/daemon/sounder.log
+++ b/test/daemon/sounder.log
@@ -1,6 +1,6 @@
# Name: Generic depth sounder
# Description: Generic depth sounder returning NMEA SDDBT
-# Submitted-by: John Hawley <johnhawley@blueyonder.co.uk>
+# Submitter: John Hawley <johnhawley@blueyonder.co.uk>
# Date: 2012-01-19
$SDDBT,7.7,f,2.3,M,1.3,F*05
$ECGLL,5119.881,N,00125.169,E,164326,A,D*52
diff --git a/test/daemon/superstar2.log b/test/daemon/superstar2.log
index 69d6026b..a3133f1c 100644
--- a/test/daemon/superstar2.log
+++ b/test/daemon/superstar2.log
Binary files differ
diff --git a/test/daemon/tn200-all.log b/test/daemon/tn200-all.log
index 5965e508..37be1a4f 100644
--- a/test/daemon/tn200-all.log
+++ b/test/daemon/tn200-all.log
@@ -1,6 +1,6 @@
# Name: Rayming Tripnav TN-200
# Chipset: SiRF-II
-# Submitted-by: "Chris Kuethe" <chris.kuethe@gmail.com>
+# Submitter: "Chris Kuethe" <chris.kuethe@gmail.com>
# Date: 2005-06-08
# Location: Edmonton, Alberta, CA 53N113W
# Comments - Nearby airports include YEG and YXD. This capture was done
diff --git a/test/daemon/tn200.log b/test/daemon/tn200.log
index 24d039d7..765bf9fa 100644
--- a/test/daemon/tn200.log
+++ b/test/daemon/tn200.log
@@ -1,6 +1,6 @@
# Name: Rayming Tripnav TN-200
# Chipset: SiRF-II
-# Submitted-by: "Chris Kuethe" <chris.kuethe@gmail.com>
+# Submitter: "Chris Kuethe" <chris.kuethe@gmail.com>
# Date: 2005-06-08
# Location: Edmonton, Alberta, CA 53N113W
# Comments - Nearby airports include YEG and YXD. This capture was done
diff --git a/test/daemon/tn204.log b/test/daemon/tn204.log
index 241b9437..2102b97b 100644
--- a/test/daemon/tn204.log
+++ b/test/daemon/tn204.log
@@ -1,6 +1,6 @@
# Name: Rayming TripNav 204
# Chipset: SiRF-II?
-# Submitted-by: "Pascal F. Martin" <pascal.martin@cox.net>
+# Submitter: "Pascal F. Martin" <pascal.martin@cox.net>
# Date: 2005-03-18
#
# The NMEA looks like Garmin.
diff --git a/test/daemon/tnt-revolution.log b/test/daemon/tnt-revolution.log
index 8327dbb1..2b880fe0 100644
--- a/test/daemon/tnt-revolution.log
+++ b/test/daemon/tnt-revolution.log
@@ -1,6 +1,6 @@
# Name: TNT Revolution
# Chipset: TNT
-# Submitted-by: Eric S. Raymond <esr@thyrsus.com>
+# Submitter: Eric S. Raymond <esr@thyrsus.com>
# Date: 2010-04-10
# Location: Unknown
# Notes: Collected remotely from jon Schleuter's nog.yazug.com
diff --git a/test/daemon/tomtom-mkII.log b/test/daemon/tomtom-mkII.log
index 30016da1..e5dff4ca 100644
--- a/test/daemon/tomtom-mkII.log
+++ b/test/daemon/tomtom-mkII.log
@@ -1,6 +1,6 @@
# Name: TomTom Mark II
# Chipset: SiRF-3
-# Submitted-by: Jose Baars peut@peut.org
+# Submitter: Jose Baars peut@peut.org
# Date: 2010-06-20
# Location: Veldhoven, NL
$GPGGA,175736,5125.8714,N,00524.2350,E,1,04,3.40,60.28,M,46.999,M,,*79
diff --git a/test/daemon/tr737A+.log b/test/daemon/tr737A+.log
index 972761fe..78e717a6 100644
--- a/test/daemon/tr737A+.log
+++ b/test/daemon/tr737A+.log
@@ -1,7 +1,7 @@
# Name: 737A+
# Chipset: MTK MT3329
# Description: Transystem 737A+ Bluetooth mouse
-# Submitted-by: Gary E. Miller <gem@rellim.com>
+# Submitter: Gary E. Miller <gem@rellim.com>
# Date: 2011-11-10
# Location: Bend, Oregon 44N, 121W
$PMTK010,001*2E
diff --git a/test/daemon/trimble-lassen_iq-3dfix.log b/test/daemon/trimble-lassen_iq-3dfix.log
index 0cafd429..43a1b950 100644
--- a/test/daemon/trimble-lassen_iq-3dfix.log
+++ b/test/daemon/trimble-lassen_iq-3dfix.log
Binary files differ
diff --git a/test/daemon/trimble-lassen_iq-playacar.log b/test/daemon/trimble-lassen_iq-playacar.log
index 22194da9..180f2dd5 100644
--- a/test/daemon/trimble-lassen_iq-playacar.log
+++ b/test/daemon/trimble-lassen_iq-playacar.log
Binary files differ
diff --git a/test/daemon/trimble-lassen_iq.log b/test/daemon/trimble-lassen_iq.log
index fabd0747..dae5b8a0 100644
--- a/test/daemon/trimble-lassen_iq.log
+++ b/test/daemon/trimble-lassen_iq.log
Binary files differ
diff --git a/test/daemon/uBlox-aek-4t.log b/test/daemon/uBlox-aek-4t.log
index 95cec516..f4ccb7c0 100644
--- a/test/daemon/uBlox-aek-4t.log
+++ b/test/daemon/uBlox-aek-4t.log
Binary files differ
diff --git a/test/daemon/uBlox-lea-4h.log b/test/daemon/uBlox-lea-4h.log
index feb9a81c..584494d5 100644
--- a/test/daemon/uBlox-lea-4h.log
+++ b/test/daemon/uBlox-lea-4h.log
@@ -1,7 +1,7 @@
# Name: uBlox LEA-4H module
# Chipset: ANTARIS
# Description: uBlox LEA-4H module
-# Submitted-by: "Dave Hylands" dhylands@gmail.com
+# Submitter: "Dave Hylands" dhylands@gmail.com
# Date: 2006-08-10
# Location: Surrey, British Columbia, Canada, 49.126356N 122.710015W
#
diff --git a/test/daemon/uBlox-lea-4s.log b/test/daemon/uBlox-lea-4s.log
index 39d78cbb..d0a7be5e 100644
--- a/test/daemon/uBlox-lea-4s.log
+++ b/test/daemon/uBlox-lea-4s.log
@@ -1,6 +1,6 @@
# Name: LEA-4S
# Chipset: ANTARIS
-# Submitted-by: "Ali Utku Selen" <selenau@kentkart.com.tr>
+# Submitter: "Ali Utku Selen" <selenau@kentkart.com.tr>
# Date: 2006-12-11
# Location: İzmir, TR, 38N27E
#
diff --git a/test/daemon/uBlox-lea-5h.log b/test/daemon/uBlox-lea-5h.log
index 912b24d4..1ee900a5 100644
--- a/test/daemon/uBlox-lea-5h.log
+++ b/test/daemon/uBlox-lea-5h.log
@@ -1,6 +1,6 @@
# Name: U-Blox, EVK-5H-0, ID: 1546:01a5
# Chipset: LEA-5H-0
-# Submitted-by: Stephan Dierick <sac.dierick@hccnet.nl>
+# Submitter: Stephan Dierick <sac.dierick@hccnet.nl>
# Date: 2010-08-23
# Location: Rotterdam, NL, 51.9N 4.6E
# Notess: Unit was stationary. Part without fix (antenna
diff --git a/test/daemon/uBlox-sirf1.log b/test/daemon/uBlox-sirf1.log
index cde51e72..3f0481e7 100644
--- a/test/daemon/uBlox-sirf1.log
+++ b/test/daemon/uBlox-sirf1.log
Binary files differ
diff --git a/test/daemon/ublox-lea-5q.log b/test/daemon/ublox-lea-5q.log
index c052f235..83dd76a8 100644
--- a/test/daemon/ublox-lea-5q.log
+++ b/test/daemon/ublox-lea-5q.log
@@ -1,6 +1,6 @@
# Name: uBlox LEA-5q
# Description: OEM module
-# Submitted-by: Thomas Sprinkmeier <thomas.sprinkmeier@gmail.com>
+# Submitter: Thomas Sprinkmeier <thomas.sprinkmeier@gmail.com>
# Date: 2011-02-02
# Location: Adelaide, AU, 34.9S, 138.6E
$GPVTG,,,,,,,,,N*30
diff --git a/test/daemon/venus634lp.log b/test/daemon/venus634lp.log
index 4434b381..94c310e2 100644
--- a/test/daemon/venus634lp.log
+++ b/test/daemon/venus634lp.log
@@ -1,5 +1,5 @@
# Name: Venus634LP
-# Submitted-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
+# Submitter: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
# Date: 2010-02-05
# Location: Minsk, Belarus, 53N 27E
$SkyTraq,Venus6
diff --git a/test/daemon/zodiac.log b/test/daemon/zodiac.log
index 589f011f..a9f75663 100644
--- a/test/daemon/zodiac.log
+++ b/test/daemon/zodiac.log
Binary files differ
diff --git a/test/sample.rtcm2 b/test/sample.rtcm2
index 34edbcda..1d12a371 100644
--- a/test/sample.rtcm2
+++ b/test/sample.rtcm2
@@ -1,6 +1,6 @@
# Name: RTCM-104 source from a DGPSIP server
# Type: RTCM
-# Submitted-by: Wolfgang Rupprecht <wolfgang@dwsrcc.com>
+# Submitter: Wolfgang Rupprecht <wolfgang@dwsrcc.com>
# Date: 2009-01-21
# Comments: Has leading garbage, to test parity locking.
# The date above is meaningless, added so gpsfake won't choke.
diff --git a/www/faq.html.in b/www/faq.html.in
index c84e948d..0faf967f 100644
--- a/www/faq.html.in
+++ b/www/faq.html.in
@@ -229,7 +229,7 @@ Here is the beginning of one log file I already have:</p>
<pre>
# Name: Magellan eXplorist 210
# Chipset: unknown
-# Submitted-by: "Paul B van den Berg" &lt;paulberg@wanadoo.nl&gt;
+# Submitter: "Paul B van den Berg" &lt;paulberg@wanadoo.nl&gt;
# Date: 2006-05-26
# Location: Groningen, NL, 53.2N 6.6E
#
@@ -267,7 +267,7 @@ $GPGSV,3,2,10,29,26,162,,18,24,255,42,22,24,298,44,28,10,056,*75
$GPGSV,3,3,10,14,09,319,,11,03,016,,136,27,157,,124,28,162,*71
</pre>
-<p>The way to fill in the Name, Submitted-by, and Date
+<p>The way to fill in the Name, Submitter, and Date
headers should be pretty obvious.</p>
<p>Chipset should include the name and (if possible) model and/or