Fix up user guide sources for use in WSJT-X build

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

doc/user_guide/cooperating-programs.adoc

@@ -23,4 +23,4 @@ many operating aids including
 
 - convenient direct access to various web services such as callsign lookup. 
 
-image::images/jtalert.png[align="left",alt="JTAlert-X image"]
+//image::images/jtalert.png[align="left",alt="JTAlert-X image"]

doc/user_guide/install-from-source.adoc

@@ -11,13 +11,17 @@ following packages:
 - fftw3
 - MinGW (for Windows only)
 
-Source code for _WSJT-X_ 1.5.0 can be downloaded with the command:
+Source code for _WSJT-X_ v{VERSION} can be downloaded with the command:
 
- svn co svn://svn.code.sf.net/p/wsjt/wsjt/tags/wsjtx-1.5.0
+=====
+svn co svn://svn.code.sf.net/p/wsjt/wsjt/tags/wsjtx-{VERSION}
+=====
 
 and for the current development branch,
 
- svn co svn://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx
+=====
+svn co svn://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx
+=====
 
 If you are interested in contributing to the development and
 documentation of _WSJT_ and its sister programs, please join the

doc/user_guide/install-linux.adoc

@@ -2,31 +2,33 @@
 
 * For Debian, Ubuntu, and other Debian-based systems:
 ** 32-bit: {debian32}
-- To install: +sudo dpkg -i wsjtx_1.5.0_i386.deb+
+- To install: +sudo dpkg -i wsjtx_{VERSION}_i386.deb+
 - Uninstall:  +sudo dpkg -P wsjtx+
 ** 64-bit: {debian64}
-- To install: +sudo dpkg -i wsjtx_1.5.0_amd64.deb+
+- To install: +sudo dpkg -i wsjtx_{VERSION}_amd64.deb+
 - Uninstall:  +sudo dpkg -P wsjtx+
 ** You may also need to execute the following commands in a terminal:
 
- sudo apt-get install libqt5multimedia5-plugins libqt5serialport5 
- sudo apt-get install libfftw3-single3
-
 * For Ubuntu 15.04 and similar systems:
++
+=====
+sudo apt-get install libqt5multimedia5-plugins libqt5serialport5
 
- sudo apt-get install libqt5multimedia5-plugins libqt5serialport5 
- sudo apt-get install libfftw3-single3 libqt5opengl5 
+sudo apt-get install libfftw3-single3 libqt5opengl5 
+=====
 
 * For Fedora, Red Hat, and other rpm-based systems:
 ** 32-bit: {fedora32}
-- To install: +sudo rpm -i wsjtx-1.5.0_i686.rpm+
+- To install: +sudo rpm -i wsjtx-{VERSION}-i686.rpm+
 - Uninstall: +sudo rpm -e wsjtx+
 ** 64-bit: {fedora64}
-- To install: +sudo rpm -i wsjtx-1.5.0_x86_64.rpm+
+- To install: +sudo rpm -i wsjtx-{VERSION}-x86_64.rpm+
 - Uninstall: +sudo rpm -e wsjtx+
 ** You may also need to execute the following commands in a terminal:
-
- sudo rpm install fftw-libs-single qt5-qtmultimedia qt5-qtserialport 
++
+=====
+sudo yum install fftw-libs-single qt5-qtmultimedia qt5-qtserialport 
+=====
 
 * Linux users must install a companion program called *kvasd*.  
 Instructions for a simple, quick menu-driven installation may be 

doc/user_guide/install-mac.adoc

@@ -1,8 +1,8 @@
 // These instructions are up-to-date for WSJT-X v1.4
 
-* OS X 10.7 and later: {osx_107} 
+* OS X 10.7 and later: {osx} 
 
-* After downloading it to your desktopo, double-click on the dmg file
+* After downloading it to your desktop, double-click on the dmg file
 and consult its +ReadMe+ file for important installation notes.
 
 * If you have already installed a previous version, you can retain it by

doc/user_guide/wsjtx-main.adoc

@@ -1,6 +1,6 @@
 // This is a comment line, anything with // is ignored at process time.
 = WSJT-X User Guide
-:Revision: 1.5
+:Revision: {VERSION}
 // For web-pages, adding :badges: is ok, but is a security issue for
 // package building .deb, .rpm, etc as it exposes the IP address and the images
 // are non-free, so can't be included as part of the Debian package.
@@ -12,7 +12,7 @@
 :prog: WSJT-X
 
 // use global link file
-include::../../global/links.adoc[]
+include::../common/links.adoc[]
 
 // These [[xxxx]] labels are HTML anchors, and can be used to
 // navigate though the document easily: <<INTRO,See Introduction>> will
@@ -201,5 +201,5 @@ include::acknowledgements.adoc[]
 
 [[LICENSE]]
 == License
-include::../../global/license.adoc[]
+include::../common/license.adoc[]