diff --git a/doc/common/links.adoc b/doc/common/links.adoc index 754b93570..158400854 100644 --- a/doc/common/links.adoc +++ b/doc/common/links.adoc @@ -67,7 +67,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :fmt_group: https://groups.yahoo.com/neo/groups/FMT-nuts/info[FMT Group] :fmt_k5cm: http://www.k5cm.com/[FMT Event Info] :fmt_wspr: http://www.physics.princeton.edu/pulsar/K1JT/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup] -:ft8_tips: http://www.physics.princeton.edu/pulsar/K1JT/FT8_Operating_Tips.pdf[here] +:ft8_tips: http://www.g4ifb.com/FT8_Hinson_tips_for_HF_DXers.pdf[FT8 Operating Guide] :ft8_DXped: http://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode] :gnu_gpl: http://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License] :homepage: http://physics.princeton.edu/pulsar/K1JT/[WSJT Home Page] diff --git a/doc/user_guide/en/images/colors.png b/doc/user_guide/en/images/colors.png index 7c6813529..8845ada9c 100644 Binary files a/doc/user_guide/en/images/colors.png and b/doc/user_guide/en/images/colors.png differ diff --git a/doc/user_guide/en/settings-colors.adoc b/doc/user_guide/en/settings-colors.adoc index 3a67d228a..fc2f748bc 100644 --- a/doc/user_guide/en/settings-colors.adoc +++ b/doc/user_guide/en/settings-colors.adoc @@ -1,7 +1,10 @@ image::colors.png[align="center",alt="Colors Screen"] -_WSJT-X_ uses colors to highlight decoded messages containing -information of particular interest. Check the box to select any -that interest you. Drag any line up or down to raise or lower -its logical priority. Right-click any line to select a new -foreground or background color. +_WSJT-X_ uses colors to highlight decoded CQ messages of particular +interest. Check the box *Show DXCC, grid, and worked-before status* +on the *Settings | General* tab, and any boxes of interest to you on +the *Colors* tab. You can drag any line up or down to raise or lower +its logical priority. Right-click any line to set a new foreground or +background color. Foreground and background colors are applied +separately, and careful choices of foreground, background, and +priority can provide two indications of worked-before status. diff --git a/doc/user_guide/en/settings-frequencies.adoc b/doc/user_guide/en/settings-frequencies.adoc index bebf6a313..5cdf26dbd 100644 --- a/doc/user_guide/en/settings-frequencies.adoc +++ b/doc/user_guide/en/settings-frequencies.adoc @@ -4,9 +4,9 @@ image::settings-frequencies.png[align="center",alt="Frequency Screen"] _Working Frequencies_: By default the *Working Frequencies* table -contains a list of frequencies conventionally used for modes JT4, JT9, -JT65, MSK144, WSPR, and Echo. Conventions may change with time or -by user preference; you can modify the frequency table as desired. +contains a list of frequencies conventionally used for modes FT8, JT4, +JT9, JT65, MSK144, WSPR, and Echo. Conventions may change with time +or by user preference; you can modify the frequency table as desired. - To change an existing entry, double-click to edit it, type a desired frequency in MHz or select from the drop down list of options, then diff --git a/doc/user_guide/en/tutorial-example3.adoc b/doc/user_guide/en/tutorial-example3.adoc index 3f2ee03f6..931067760 100644 --- a/doc/user_guide/en/tutorial-example3.adoc +++ b/doc/user_guide/en/tutorial-example3.adoc @@ -46,13 +46,14 @@ when double-clicking. NOTE: To avoid QRM from competing callers, it is frequently desirable to answer a CQ on a different frequency from that of the CQing station. The same is true when you tail-end another QSO. Choose a Tx -frequency that appears to be not in use. +frequency that appears to be not in use. You might want to check the +box *Hold Tx Freq*. NOTE: Keyboard shortcuts *Shift+F11* and *Shift+F12* provide an easy way to move your Tx frequency down or up in 60 Hz steps. -NOTE: Further helpful tips on FT8 operating procedures are available -{ft8_tips}. Thanks to ZL2IFB! +NOTE: An online {ft8_tips} by ZL2IFB offers many helpful tips on +operating procedures. .FT8 DXpedition Mode: diff --git a/doc/user_guide/en/wsjtx-main.adoc b/doc/user_guide/en/wsjtx-main.adoc index aa4a9aa57..704ad74c4 100644 --- a/doc/user_guide/en/wsjtx-main.adoc +++ b/doc/user_guide/en/wsjtx-main.adoc @@ -1,5 +1,5 @@ // This is a comment line, anything with // is ignored at process time. -= _WSJT-X_ User Guide += _WSJT-X 2.0_ User Guide Joseph H Taylor, Jr, K1JT :revnumber: {VERSION} // For web-pages, adding :badges: is ok, but is a security issue for diff --git a/lib/fmtmsg.f90 b/lib/fmtmsg.f90 index 2ceb81554..81789e2a9 100644 --- a/lib/fmtmsg.f90 +++ b/lib/fmtmsg.f90 @@ -1,16 +1,16 @@ subroutine fmtmsg(msg,iz) - character*22 msg + character*(*) msg ! Convert all letters to upper case - iz=22 - do i=1,22 + iz=len(msg) + do i=1,iz if(msg(i:i).ge.'a' .and. msg(i:i).le.'z') & msg(i:i)= char(ichar(msg(i:i))+ichar('A')-ichar('a')) if(msg(i:i).ne.' ') iz=i enddo - do iter=1,5 !Collapse multiple blanks into one + do iter=1,37 !Collapse multiple blanks into one ib2=index(msg(1:iz),' ') if(ib2.lt.1) go to 100 msg=msg(1:ib2)//msg(ib2+2:)