From 45602675a729868280ed6829e363f6f2f2ca5903 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Fri, 5 Jun 2015 11:33:56 +0000
Subject: [PATCH] Updates to manpages

Aliased wsprd to the wsjtx manpage.

Added a {VERSION} attribute to the manpage generation in line with the
User Guide generation.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5536 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 manpages/CMakeLists.txt      |  1 +
 manpages/man1/jt65code.1.txt | 29 +++++++++++++++++------------
 manpages/man1/wsjtx.1.txt    | 15 ++++++++-------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/manpages/CMakeLists.txt b/manpages/CMakeLists.txt
index 1576ad549..10456eb92 100644
--- a/manpages/CMakeLists.txt
+++ b/manpages/CMakeLists.txt
@@ -32,6 +32,7 @@ set (A2X_OPTS
   --xsltproc-opts=${XSLTPROC_OPTS}
   --doctype=manpage
   --no-xmllint
+  -a VERSION=${wsjtx_VERSION}
   )
 
 set (MANPAGES)
diff --git a/manpages/man1/jt65code.1.txt b/manpages/man1/jt65code.1.txt
index 4730ebfd2..ef3bf74ea 100644
--- a/manpages/man1/jt65code.1.txt
+++ b/manpages/man1/jt65code.1.txt
@@ -1,6 +1,6 @@
 :doctype: manpage
 :man source: AsciiDoc
-:man version: {revnumber}
+:man version: {VERSION}
 :man manual: WSJT-X Manual
 = jt65code(1)
 
@@ -10,11 +10,22 @@ jt65code, jt9code, jt4code - Weak signal communications encoding support utility
 
 == SYNOPSIS
 
-*jt65code* MESSAGE
+*jt65code* "'MESSAGE'"
 
-*jt9code* MESSAGE
+*jt65code* ['OPTIONS']
 
-*jt4code* MESSAGE
+*jt9code* "'MESSAGE'"
+
+*jt9code* ['OPTIONS']
+
+*jt4code* "'MESSAGE'"
+
+*jt4code* ['OPTIONS']
+
+== OPTIONS
+*-t*::
+ Prints a selection of messages alongside their corresponding
+ decoded form and types.
 
 == DESCRIPTION
 
@@ -83,14 +94,8 @@ information-carrying channel symbols.
 
 WSJT-X home page:: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html
 
-WSJT-X User's Guide:: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main.html
-
-== OPTIONS
-*-t::
- Prints a selection of different messages with their corresponding
- decodes ad types.
-
-== FILES
+WSJT-X User's Guide::
+http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main-{VERSION}.html
 
 == AUTHOR
 
diff --git a/manpages/man1/wsjtx.1.txt b/manpages/man1/wsjtx.1.txt
index c88c43b4e..18afbdbbe 100644
--- a/manpages/man1/wsjtx.1.txt
+++ b/manpages/man1/wsjtx.1.txt
@@ -1,25 +1,26 @@
 :doctype: manpage
 :man source: AsciiDoc
-:man version: {revnumber}
+:man version: {VERSION}
 :man manual: WSJT-X Manual
 = wsjtx(1)
 
 == NAME
 
-wsjtx, jt9 - Weak signal communications program.
+wsjtx, jt9, wsprd - Weak signal communications program.
 
 == SYNOPSIS
 
-*wsjtx* [OPTIONS]
+*wsjtx* ['OPTIONS']
 
 == DESCRIPTION
 
-*wsjtx* is a weak signal communications program supporting two operating
-modes: JT65 and JT9 (*wsjtx* version 1 supported JT9 only).
+*wsjtx* is a weak signal communications program supporting several operating
+modes: JT65, JT9, JT4 and WSPR (*wsjtx* version 1 supported JT9 only).
 
 WSJT-X home page:: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html
 
-WSJT-X User's Guide:: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main-toc2.html
+WSJT-X User's Guide::
+http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main-{VERSION}.html
 
 An alternative JT65 decoder executable *kvasd* for i386 Ubuntu is
 available at http://www.physics.princeton.edu/pulsar/K1JT/kvasd .
@@ -105,7 +106,7 @@ Joe Taylor, K1JT.
 
 == COPYING
 
-*wsjtx* is Copyright (C) 2001 - 2014 by Joseph H. Taylor, Jr., K1JT,
+*wsjtx* is Copyright (C) 2001 - 2015 by Joseph H. Taylor, Jr., K1JT,
 with contributions from additional authors.  WSJT-X is Open Source
 software, licensed under the GNU General Public License (GPLv3).