More editing of User Guide. Bring some images up to Version 1.6.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6102 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

doc/CMakeLists.txt

@@ -31,19 +31,6 @@ set (UG_SRCS
   user_guide/make-qso.adoc
   user_guide/new_features.adoc
   user_guide/platform-dependencies.adoc
-  user_guide/rig-config-adat.adoc
-  user_guide/rig-config-alinco.adoc
-  user_guide/rig-config-aor.adoc
-  user_guide/rig-config-drake.adoc
-  user_guide/rig-config-elecraft.adoc
-  user_guide/rig-config-flexrad.adoc
-  user_guide/rig-config-icom.adoc
-  user_guide/rig-config-kenwood.adoc
-  user_guide/rig-config-main.adoc
-  user_guide/rig-config-softrock.adoc
-  user_guide/rig-config-template.adoc
-  user_guide/rig-config-tentec.adoc
-  user_guide/rig-config-yaesu.adoc
   user_guide/settings-audio.adoc
   user_guide/settings-colors.adoc
   user_guide/settings-frequencies.adoc

doc/user_guide/acknowledgements.adoc

@@ -8,10 +8,10 @@ suggestions and advice that have greatly aided the development of
 _WSJT_ and its sister programs.
 
 For _WSJT-X_ in particular, we acknowledge contributions from *AC6SL,
-AE4JY, DJ0OT, G4KLA, G4WJS, K3WYC, K9AN, KA6MAL, KA9Q, KB1ZMX, KI7MT,
+AE4JY, DJ0OT, G4KLA, G4WJS, K3WYC, K9AN, KA6MAL, KA9Q, KB1ZMX, KD6EKQ,
-KK1D, PY2SDR, VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB*.  Each of these
+KI7MT, KK1D, ND0B, PY2SDR, VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB*.
-amateurs has helped to bring the program’s design, code, and
+Each of these amateurs has helped to bring the program’s design, code,
-documentation to its present state.
+and documentation to its present state.
 
 Most of the color palettes for the _WSJT-X_ waterfall were copied from
 the excellent, well documented, open-source program _fldigi_, by *W1HKJ*

doc/user_guide/install-linux.adoc

@@ -36,7 +36,7 @@ You may also need to execute the following commands in a terminal:
 All Linux users must install a companion program called +kvasd+, an
 implementation of the the Koetter-Vardy algebraic soft-decision
 decoder for the Reed Solomon (63,12) code.  Users of Ubuntu and other
-Debian-based sysyems can install +kvasd+ by executing the following
+Debian-based systems can install +kvasd+ by executing the following
 commands in a terminal:
 
  sudo add-apt-repository ppa:ki7mt/kvasd-installer
@@ -61,7 +61,7 @@ following standard tools already installed:
 
  autoconf awk bash dialog libgfortran svn
 
-Download the {kvasd_installer} tarfile to a conveniant directory, then
+Download the {kvasd_installer} tarfile to a convenient directory, then
 execute the following commands in a terminal there:
 
  tar xzf kvasd-installer-1.12.14.tar.gz

doc/user_guide/install-windows.adoc

@@ -13,6 +13,10 @@ installation directory and its subdirectories.
 - Logs and other writeable files will normally be found in the 
 directory +C:\Users\<username>\AppData\Local\WSJT-X+.
 
+IMPORTANT: Note that your computer might be configured so that this
+directory is ``invisible''.  It's there, however, and accessible.
+An alternative (shortcut) directory name is %LOCALAPPDATA%\WSJT-X\.
+
 - The built-in Windows facility for time synchronization is usually
 not adequate. We recommend the program _Meinberg NTP_: see {ntpsetup}
 for downloading and installation instructions.

doc/user_guide/introduction.adoc

@@ -35,12 +35,12 @@ central database called {wsprnet} that provides a mapping facility,
 archival storage, and many other features.
 
 Echo mode allows you to detect and measure your own lunar echoes,
- even when they are far below the threshold of audibility.
+even if they are far below the audible threshold.
 
 _WSJT-X_ provides spectral displays for passbands up to 5 kHz,
 flexible rig control for nearly all modern radios used by amateurs,
 and a wide variety of special aids such as automatic Doppler control
-for EME QSOs and echo testing.  The program runs equally well on
+for EME QSOs and Echo testing.  The program runs equally well on
 Windows, Macintosh, and Linux systems, and installation packages are
 available for all three platforms.
 

doc/user_guide/jt65-jt9-differences.adoc

@@ -16,7 +16,7 @@ By comparison, JT9 allows for signal reports in the range –50 to +49
 dB. It manages this by taking over a small portion of ``message
 space'' that would otherwise be used for grid locators within 1 degree
 of the south pole. The S/N scale of the present JT9 decoder is
-reasonably linear (although it’s not intended to be a precision
+reasonably linear (although it's not intended to be a precision
 measurement tool).  
 
 With clean signals and a clean noise background, JT65 achieves nearly

doc/user_guide/logging.adoc

@@ -1,7 +1,7 @@
 A basic logging facility in _WSJT-X_ saves QSO information to flies
 named +wsjtx.log+ (in comma-separated text format) and +wsjtx_log.adi+
 (in standard ADIF format).  These files can be imported directly into
-other programs, for example spreadsheets and popular logging prgrams.
+other programs, for example spreadsheets and popular logging programs.
 As described in the <<INSTALL,Installation>> and <<PLATFORM,Platform
 Dependencies>> sections, different operating systems may place your
 local log files in different locations.  You can always navigate to

doc/user_guide/new_features.adoc

@@ -4,39 +4,40 @@ For quick reference, here's a short list of features and capabilities
 added to _WSJT-X_ since Version 1.5.0:
 
 - *WSPR* mode, including coordinated automatic band-hopping and a
-two-pass decoder that can decode overlapping signals.
+new two-pass decoder that can decode overlapping signals.
 
 - EME-motivated features including *JT4* (submodes *A-G*), *Echo*
 mode, and automatic *Doppler tracking*.  The JT4 decoder is more
 sensitive than that in the latest WSJT, and message averaging is fully
 automated.  (Note that submodes *JT65B* and *JT65C* are also present
-in Version 1.6, but the high-sensitivity decoder required for EME is
+in Version 1.6, but the high-sensitivity decoder required for EME with
-not yet included.)
+JT65 is not yet included.)
 
 - Tools for accurate *frequency calibration* of your radio, so you can
-be automatically on-frequency to within about 1 Hz.
+be always on-frequency to within about 1 Hz.
 
-- Mode-specific working frequencies accessible from the drop-down
+- Mode-specific standard working frequencies accessible from the
-band selector.
+drop-down band selector.
 
-- Many corrections of balky rig-control features implemented through
+- A number of corrections have been made to the Hamlib library, thereby
-the hamlib library, and removal of a few unreliable features peculiar
+fixing balky rig-control features.  A few unreliable features peculiar
-to particular radios.
+to particular radios have been removed.
  
 === Future releases
 
-Much work has already been done on what will become Version 1.7 of
+Much work has already been done on Version 1.7 of _WSJT-X_.  (Up to
-_WSJT-X_.  (Up to now it has been called v1.6.1.)  A number of people
+now it has been called v1.6.1.)  More than 100 people have been
-have been building this version for themselves, as development
+building this version for themselves, as development progresses, and
-progresses, and reporting on their experiences.  The next release will
+reporting on their experiences.  The next release will likely have the
-almost certainly have the following features not present in Version
+following features not present in Version 1.6.0, and perhaps others as
-1.6.0, and perhaps others as well:
+well:
 
 - *JTMSK* mode, intended for meteor scatter, ionospheric scatter,
 aircraft scatter, and the like.  Unlike the FSK441, ISCAT, and JTMS
-modes present in the older program _WSJT_, JTMSK includes strong
+modes present in the older program _WSJT_, *JTMSK* uses strong forward
-forward error correction and uses structured messages identical to
+error correction and structured messages identical to those in JT4,
-those in JT4, JT9, and JT65.
+JT9, and JT65.
 
-- Significantly improved decoding for JT65, especially in crowded HF
+- A significantly improved decoder for JT65, especially advantageous
-bands.
+when used in crowded HF bands.  Starting with Version 1.7, _WSJT-X_
+will longer use the patented, closed-source Koetter-Vardy algorithm.

doc/user_guide/rig-config-adat.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= ADAT Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}. 
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,ADAT1>>|<<X2,ADAT2>>|ADAT3|ADAT4|ADAT5
-|========
-
-[[X1]]
-== ADAT-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== ADAT-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-alinco.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= Alinco Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,Alinco1>>|<<X2,Alinco2>>|Alinco3|Alinco4|Alinco5
-|========
-
-[[X1]]
-== Alinco-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== Alinco-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-aor.adoc

@@ -1,103 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= AOR Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}. 
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,AOR1>>|<<X2,AOR2>>|AOR3|AOR4|AOR5
-|========
-
-[[X1]]
-== AOR-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== AOR-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew

doc/user_guide/rig-config-drake.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= Drake Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,Drake1>>|<<X2,Drake2>>|Drake3|Drake4|Drake5
-|========
-
-[[X1]]
-== Drake-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== Drake-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-elecraft.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= ElectroCraft Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,ElectroCraft1>>|<<X2,ElectroCraft2>>|ElectroCraft3|ElectroCraft4|ElectroCraft5
-|========
-
-[[X1]]
-== ElectroCraft-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== ElectroCraft-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-flexrad.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= Flex Radio Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,Flex1>>|<<X2,Flex2>>|Flex3|Flex4|Flex5
-|========
-
-[[X1]]
-== Flex-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== Flex-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-icom.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= Icom Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,Icom1>>|<<X2,Icom2>>|Icom3|Icom4|Icom5
-|========
-
-[[X1]]
-== Icom-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== Icom-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-kenwood.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= Kenwood Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,Kenwood1>>|<<X2,Kenwood2>>|Kenwood3|Kenwood4|Kenwood5
-|========
-
-[[X1]]
-== Kenwood-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== Kenwood-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-main.adoc

@@ -1,33 +0,0 @@
-// Status=review
-:adat: link:rig-config-adat.html[ ADAT]
-:alinco: link:rig-config-alinco.html[ Alinco ]
-:aor: link:rig-config-aor.html[ AOR ]
-:drake: link:rig-config-drake.html[ Drake ]
-:elecraft: link:rig-config-elecraft.html[ Elecraft ]
-:flexrad: link:rig-config-flexrad.html[ Flex Radio ]
-:kenwood: link:rig-config-kenwood.html[ Kenwood ]
-:icom: link:rig-config-icom.html[ Icom ]
-:rig_template: link:rig-config-template.html[Template]
-:softrock: link:rig-config-softrock.html[ Soft Rock ]
-:tentec: link:rig-config-tentec.html[ Ten Tec ]
-:yaesu: link:rig-config-yaesu.html[Yaesu]
-
-Some rigs work with DTR, RTS, Polling, CAT, and PTT while others do
-not. The number of possible combinations is virtually endless.  The
-purpose of this section is to provide configuration information for
-specific rig models, e.g. Icom 756 Pro-III, Kenwood TS-2000, Yaesu
-FT-1000MP, Flex-5000, etc. This is a work-in-progress, and some rigs
-may never be covered.
-
-IMPORTANT: If you have configuration data for a rig that is not listed, or
-comments about a particular rig configuration, please use the
-{rig_template} and send it to {devmail}.
-
-.Select Manufacturer
-[align="center",valign="middle",halign="center"]
-|========
-|{adat}|{aor}|{alinco}|{drake}|{elecraft}
-|{flexrad}|{kenwood}|{icom}|{softrock}|{tentec}
-|{yaesu}|{rig_template}|||
-|========
-

doc/user_guide/rig-config-softrock.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= SoftRock Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,SR1>>|<<X2,SR2>>|SR3|SR4|SR5
-|========
-
-[[X1]]
-== SR-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== SR-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-template.adoc

@@ -1,60 +0,0 @@
-// Status=review
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-= Rig Template
-
-This is a simple guide for providing rig configuration data for the WSJT-X
-User Guide. Try to fill out as much as possible, but do not worry if you cannot
-fill in all the fields. OS Specific & Interface Notes are a bonus.
-
-* Copy and paste the template into a text file.
-* Save as the rig's model.txt: rig-confg-ic756p3.txt
-* Email the file to {devmail} for inclusion.
-* Alternatively, join the team and submit the updates directly.
-
-.Copy & Paste the following:
-----------
-Manufacturer:
-Model:
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-----------
-

doc/user_guide/rig-config-tentec.adoc

@@ -1,104 +0,0 @@
-// Status=needsupdate
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= Ten Tec Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,TenTec1>>|<<X2,TenTec2>>|TenTec3|TenTec4|TenTec5
-|========
-
-[[X1]]
-== TenTec-1
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== TenTec-2
-.Configuration Covers:
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-- Note-1/2/3
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio
--In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/rig-config-yaesu.adoc

@@ -1,102 +0,0 @@
-// Status=review
-// This is a comment line, anything with // is ignored at process time.
-// because the page is not a main page include, we need to add
-// ref-links again, as they are not global.
-:icons:
-:badges:
-:rig_template: link:rig-config-template.html[Template]
-:devmail: mailto:wsjt-devel@lists.berlios.de[wsjt-devel]
-
-= Yaesu Configuration Guide
-Available Configurations
-
-If you have configuration data for a rig that is not listed, or comments about a
-particular rig configuration, please use the {rig_template} and send it to
-{devmail}.
-
-[align="center",valign="middle",halign="center"]
-// 5 Models per line please
-|========
-|<<X1,FT-1000>>|<<X2,FT-2000>>|FT-3000|FT-5000|FT-9000
-|========
-
-[[X1]]
-== FT-1000
-.Configuration Covers FT-1000, FT-1000MP, FT-1000D
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-
-[[X2]]
-== FT-2000
-.Configuration Covers FT-2000, FT-2000D
-
-* MyCall:
-* MyGrid:
-* PTT Method:
-* Pskreporter:
-* CW Id After 73:
-* CW Interval:
-* CAT NOTES:
-* DTR:
-* RTS:
-* CAT Port:
-* CAT Port Settings:
-* Split:
-* Polling:
-* Audio-In:
-* Audio-In Mono:
-* Audio-Out:
-* Audio-Out:
-
-=== OS Specific Notes
-.Notes Relating To Operating System
-
-* Windows: XP, Vista, Win7, Win8, etc.
-* Linux: Slackaware, Fedora, FreeBSD, Ubuntu, Debian, etc
-* Mac OSx: 
-
-=== Interface Notes
-.Notes Relating To Rig Interface
-
-* Navigator
-* SignaLink
-* ShackLan
-* Kam
-* DX-Doubler
-* Array Solutions
-* Home-Brew
-

doc/user_guide/settings-audio.adoc

@@ -21,6 +21,6 @@ can select another location if desired.
 - _AzEl Directory_: A file named +azel.dat+ will appear in the
 specified directory.  The file contains information usable by another
 program for automatic tracking of the Sun or Moon, as well as
-predicted Doppler shift for the specified EME path.  The file is
+calculated Doppler shift for the specified EME path.  The file is
 updated once per second.
 

doc/user_guide/settings-colors.adoc

@@ -1,8 +1,7 @@
 [[COLORS]]
 
-image::images/colors.png[align="center",alt="Reporting Screen"]
+_WSJT-X_ uses colors to highlight decoded messages containing
+information of particular interest.  Click on one of the buttons to
+select your preferred colors for any message category.
 
-_WSJT-X_ uses colors to highlight decoded messages that contain
+image::images/colors.png[align="center",alt="Reporting Screen"]
-information that may be of particular interest.  Click on one of
-the buttons to select your preferred colors for any message 
-category.

doc/user_guide/settings-frequencies.adoc

@@ -21,12 +21,19 @@ the desired mode (or leave the Mode selection blank).  Then click
 - Click the *Reset* button to return the table to its default
 configuration.
 
-_Frequency Calibration_: If you have calibrated your radio with the
+_Frequency Calibration_: If you have calibrated your radio using WWV
-technique described {fmt_wspr}, or simply by measuring against WWV or
+or other reliable frequency references, or perhaps with the technique
-another reliable frequency reference, enter the measured values for
+described {fmt_wspr}, enter the measured values for Intercept A and
-Intercept and Slope.  Frequency values sent to the radio and received
+Slope B in the equation
-from it will then be adjusted accordingly so that frequencies displayed
+
-by _WSJT-X_ will be correct.
+ Dial error = A * B*f
+
+where ``Dial error'' and A are in Hz, f is frequency in MHz, and B is
+parts per million (ppm).
+
+Frequency values sent to the radio and received from it will
+then be adjusted accordingly so that frequencies displayed by _WSJT-X_
+are correct.
 
 _Station Information_: You can save *Band*, *Offset* and *Antenna
 Description* information for your station.  The antenna information

doc/user_guide/settings-radio.adoc

@@ -63,13 +63,13 @@ result in a cleaner transmitted signal, by keeping the Tx audio always
 in the range 1500 to 2000 Hz so that audio harmonics cannot pass
 through the Tx sideband filter.  Select *Rig* to use the radio's Split
 mode, or *Fake It* to have _WSJT-X_ adjust the VFO frequency as
-needed, just before T/R switching occurs.  Choose *None* if you do not
+needed, when T/R switching occurs.  Choose *None* if you do not
 wish to use split operation.
 
 When all required settings have been made, click *Test CAT* to test
 communication between _WSJT-X_ and your radio.  The button should turn
 green to indicate that proper communication has been established.
 Failure of the CAT-control test turns the button red and displays an
-error message.  After a succesful CAT test, toggle the *Test PTT*
+error message.  After a successful CAT test, toggle the *Test PTT*
 button to confirm that your selected method of T/R control is working
 properly.

doc/user_guide/settings-reporting.adoc

@@ -9,6 +9,5 @@ reception reports to the {pskreporter} mapping facility.
 
 - _UDP Server_: This group of options controls the network name or
 address and port number used by a program that will receive status
-updates from WSJT-X.  It is expected that cooperating applications
+updates from _WSJT-X_.  Cooperating applications like _JTAlert_ use 
-like JTAlert-X use this feature to obtain information about a 
+this feature to obtain information about a running _WSJT-X_ instance.
-running WSJT-X instance.

doc/user_guide/support.adoc

@@ -18,7 +18,7 @@ include at least the following information:
 - Program version
 - Operating system
 - Concise description of the problem
-- Sequence of steps required to reproduce the problem
+- Exact sequence of steps required to reproduce the problem
 
 === Feature Requests
 

doc/user_guide/transceiver-setup.adoc

@@ -2,7 +2,7 @@
 .Receiver Noise Level
 
 - If it is not already highlighted in green, click the *Monitor*
-button to return to normal receive operation.  
+button to start normal receive operation.  
 
 - Be sure your transceiver is set to *USB* (or *USB Data*) mode.
 
@@ -45,7 +45,7 @@ radio into transmit mode and generate a steady audio tone.
 facility. The transmitted tone should be perfectly smooth, with no
 clicks or glitches.
 
-* Open the computer’s audio mixer controls for output (``Playback'')
+* Open the computer's audio mixer controls for output (``Playback'')
 devices and adjust the volume slider downward from its maximum until
 the RF output from your transmitter falls by around ten percent.  This
 will be a good level for audio drive.

doc/user_guide/tutorial-example1.adoc

@@ -12,7 +12,7 @@ those shown in the screen shot below.
 something similar to the to the following screen shot:
 
 [[X12]]
-image::images/main-ui-1.5.png[align="center",alt="Main UI and Wide Graph"]
+image::images/main-ui-1.6.png[align="center",alt="Main UI and Wide Graph"]
 
 .Decoding Overview
 

doc/user_guide/tutorial-wide-graph-settings.adoc

@@ -4,11 +4,10 @@
 - *JT65 .... JT9* = 2500
 - *Start* = 200 Hz
 - *N Avg* = 5
-- *Zero* = 0
-- *Gain* = 0
 - *Palette* = Digipan
 - *Flatten* = checked
-- Select *Cumulative* for data display.
+- Select *Cumulative* for data display
+- *Gain* and *Zero* sliders set near midscale
 
 - Use the mouse to adjust the width of the *Wide Graph* so that its
 upper frequency limit is about 2400 Hz.

doc/user_guide/vhf-features.adoc

@@ -55,7 +55,7 @@ in the moon'' will copy all of you on the selected nominal frequency.
 band.  The home station two-way self Doppler shift is +6193 Hz, so the
 one-way shift is +3096.5 Hz.  Therefore, the receive frequency is set
 to 10,360.103097 Hz.  When a transmission is started, the frequency
-is reset to 3096.5 Hz below the nomial frequency.
+is reset to 3096.5 Hz below the nominal frequency.
 
 
 - Spinner controls at top right of the Astronomical Data window let you
@@ -122,9 +122,14 @@ _Constant frequency on the Moon_
 - Choose your desired test frequency using the _Frequency above nominal
 band edge_ controls.
 
+- Be sure that your rig control has been set up for _Split Operation_
+(either _Rig_ of _Fake It_) on the *Settings | Radio* tab.
+
 - Click *Enable Tx* on the main window to start a sequence of 6-second
 cycles.
 
 - _WSJT-X_ calculates and compensates for Doppler shift automatically.
 Your return echo should always appear at the center of the plot area
-on the Echo Graph window.
+on the Echo Graph window, as in the screen shot below.
+
+image::images/echo_144.png[align="center",alt="Echo 144 MHz"]

doc/user_guide/wsjtx-main.adoc

@@ -62,10 +62,10 @@ include::install-from-source.adoc[]
 == Settings
 
 Select *Settings* from the *File* menu or by typing *F2*.  (On
-Macintosh select *Preferences* from the WSJT-X menu, or use the
+Macintosh select *Preferences* from the _WSJT-X_ menu, or use the
-keyboard *Command* or *Cmd* key.)  The following sections describe
+keyboard shortcut *Cmd+,*).  The following sections describe setup
-setup optiions available on each of seven tabs selectable near the top
+options available on each of seven tabs selectable near the top of the
-of the window.
+window.
 
 [[GENERAL]]
 === General
@@ -106,7 +106,7 @@ Sections <<TUT_MAIN,7.1>> through <<TUT_EX2,7.4>> cover basic
 operation for making two-way QSOs with modes JT9 and JT65 on the HF
 bands.  Section <<TUT_WSPR,7.5>> covers WSPR mode.  If you are a new user
 of _WSJT-X_ we suggest that you go through the full tutorial.  It should
-taks no more than 20 minutes.
+take no more than 20 minutes.
 
 [[TUT_MAIN]]
 === Main Window Settings
@@ -130,7 +130,7 @@ include::wspr.adoc[]
 
 
 [[VHF_AND_UP]]
-== VHF Features
+== VHF+ Features
 include::vhf-features.adoc[]
 
 [[MAKE_QSOS]]