1. Update the example QSOs for Type 2 compound callsigns.

2. Remove the compilation instructions, they will go in a separate section
or a developers guide.


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

doc/source/install-from-source.adoc

@@ -2,113 +2,21 @@
 // Note to developers. The URL http://developer.berlios.de/projects/wsjt/. is
 // to a very old src version of WSJT 5.7 or so. WSJTX is not listed at all.
 // Also, all the Qt4 stuff is now obsolete, and needs to be updated.
-==== Linux Makefile Example
 
-// We need a better solutuion, I basically used my buuild scripts to outline
+Source code is available from the public repository at {devsvn}. To
-// The steps here. Auto-tools or a good script much better way to go.
-The example below has been tested on Ubuntu 64-bit: 12.04-LTS, 13.10 and
-14.04-Dev. Source code is available from the public repository at {devsvn}. To
 compile the program you will need to install the following packages:
 
-.General Pkg Requirments
+- Subversion
-[horizontal]
+- Qt 5.x
-+gcc+:: GNU C Compiler
+- g++
-+g{plus}{plus}+:: GNU C{plus}{plus} Compiler
+- gfortran or g95
-+gfortran+:: GNU FOrtran or F90
+- fftw3
-+make+:: GNU Make
+- hamlib
-+libqt5multimedia5-plugins+:: QT5 Media Plugins
+- MinGW (for Windows only)
-+libfftw3-dev+:: Fast Fourier Transformation
-+libpulse-dev+:: Headers and Files for Pulse AUdio
-+libhamlib-dev+:: Headers and Files for Hamlib
-+qtbase5-dev+:: QT5 Base Dev Files
-+qtmultimedia5-dev+:: Qt5 Multimedsia Dev Files
-+pulseaudio+:: Pulse Audio Sound Driver
-+subversion+:: Version Control Software
 
-.kvasd 32-bit required libraries
+With Subversion installed, the full source code for _WSJT-X_ can be
-[horizontal]
+downloaded with the command:
-+libgfortran.so.3+:: from => libgfortran3:i386
-+libc.so.6+:: from => libc6-i386
-+libm.so.6+:: from => libc6-i386
-+libgcc_s.so.1+:: from => lib32gcc1:i386
-+libquadmath.so.0+:: from => lib32quadmath0
-
-.Setup and Build
-[source,bash]
------
-# In a terminal Ctrl+Alt+T
-# Each line is seperate action - Copy & Paste
-
-mkdir -p ~/Projects/wsjtx-build && cd ~/Projects/wsjtx-build
-
-svn co svn://svn.berlios.de/wsjt/branches/wsjtx
-
-cd ./wsjtx/lib && make -f Makfile.linux
-
-cd ../ && export QT_SELECT=qt5 && qmake
-
-j_c=$(grep -c ^processor /proc/cpuinfo) && make -j$j_c
-
-# now mv wsjtx_intall to the new rev-number
-
-rev_num=$(svn log -l1 |awk 'FNR==2 {print $1}')
-
-mv ./wsjtx_install ./wsjtx-$rev_num
-
------
-
-NOTE: You should now have (3) files in ./wjstx-$rev_num (jt9, jt9code and wsjtx).
-By moving the directory, your setup for a clean make again if need be.
-
-.Finial Configuraiton
-Before running _WSJT-X_, we need to download kvasd, and link several file(s).
-
-[source,bash]
------
-# cd to the launch directory
-cd ./wsjtx-$rev_num
-
-wget http://www.physics.princeton.edu/pulsar/K1JT/kvasd
-chmod +x ./kvasd
-
-# Links Files and Folders
-ln -s ../wsjtx/kvasd ./kvasd
-ln -s ../wsjtx/kvasd.dat ./kvasd.dat
-ln -s ../wsjtx/CALL3.TXT ./CALL3.TXT
-ln -s ../wsjtx/cty.dat ./cty.dat
-ln -s ../wsjtx/Palettes ./Palettes
-ln -s ../wsjtx/samples ./samples
-ln -s ../wsjtx/mouse_commands.txt ./mouse_commands.txt
-ln -s ../wsjtx/shortcuts.txt ./shortcuts.txt
-ln -s ../wsjtx/prefixes.txt ./prefixes.txt
------
-
-IMPORTANT: You can copy or link the files {amp} folders but make sure they are
-in the same directory as the _WSJT-X_ binary.
-
-.Test kvasd Can Run Properly
-Before you run _WSJT-X_, you should ensure _kvasd_ is available and functioning
-properly. While still in wsjtx-$rev_num ;
-
-[source,bash]
------
-# Test to ensure kvasd has all the requred libraries it needs with:
-ldd ./kvasd
-
-# If there were no missing library links, test that kvasd will run
-./kvasd
-
-# If sucessful, K1JT's copyright message should be displayed.
------
-
-.Run the New Binary
-[source,bash]
------
-./wsjtx
------
-
-// Need example using CMakefile
-==== Linux, CMake Example
 
+  svn co svn://svn.berlios.de/wsjt/branches/wsjtx 
 
 // Need further compiling Instructions

doc/source/make-qso.adoc

@@ -106,18 +106,26 @@ always displayed in the first label on the *Status Bar*, highlighted
 in yellow.  It is displayed there exactly as another station would
 receive it.
 
-A QSO between two stations using *Type 2* compound-callsign messages
+QSOs involving *Type 2* compound callsigns might look like either
-might look like this:
+of the following sequences
 
  CQ KP4/K1ABC FK68
-                     DE G0XYZ/P IO91
+                     K1ABC G0XYZ IO91
  G0XYZ K1ABC –19
                      K1ABC G0XYZ R–22
  G0XYZ K1ABC RRR
-                     DE G0XYZ/P 73
+                     K1ABC G0XYZ 73
+
+
+ CQ K1ABC FN42
+                     DE G0XYZ/W4 FM18
+ G0XYZ K1ABC –19
+                     K1ABC G0XYZ R–22
+ G0XYZ K1ABC RRR
+                     DE G0XYZ/W4 73
 
 Each operator sends his own compound callsign in the first (and
-perhaps also last) transmission, as may be required by licensing
+possibly also last) transmission, as may be required by licensing
 authorities.  Subsequent transmissions may use the standard structured
 messages without callsign prefix or suffix.