[SCM] Seamless communication between many kinds of Unix branch, debian, updated. 0a2f2a37a759349de3d9f32d578bac4c0781c8ff

Ole Streicher debian at liska.ath.cx
Mon Jan 30 20:19:52 UTC 2012


The following commit has been merged in the debian branch:
commit 0a2f2a37a759349de3d9f32d578bac4c0781c8ff
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jan 30 16:15:56 2012 +0100

    Fix twice patching of the same file

diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 7ee0269..3071c16 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Fix manpages (section, name, and spellfixes) so that lintian 
  does not complain
---- xpa-2.1.13.orig/Makefile.in
-+++ xpa-2.1.13/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -296,14 +296,14 @@ install-binaries: $(LIB) $(PROGS)
  install-man:
  	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
@@ -21,9 +21,9 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  		M="$(MAN_INSTALL_DIR)/man$$E"; \
  		if [ ! -d $$M ] ; then \
  		    echo "Making directory $$M"; \
---- xpa-2.1.13.orig/man/man1/xpaaccess.1
-+++ xpa-2.1.13/man/man1/xpaaccess.1
-@@ -131,7 +131,7 @@
+--- a/man/man1/xpaaccess.1
++++ b/man/man1/xpaaccess.1
+@@ -131,23 +131,23 @@
  .IX Title "xpaaccess 1"
  .TH xpaaccess 1 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
@@ -32,8 +32,43 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  xpaaccess [\-c] [\-h] [\-i nsinet] [\-m method] [\-n] [\-t sval,lval] [\-u users] \-v <template> [type]
---- xpa-2.1.13.orig/man/man1/xpachanges.1
-+++ xpa-2.1.13/man/man1/xpachanges.1
+ .SH "OPTIONS"
+ .IX Header "OPTIONS"
+ .Vb 10
+-\&  -c            contact each access point individually
+-\&  -h            print help message
+-\&  -i            access XPA point on different machine (override XPA_NSINET)
+-\&  -m            override XPA_METHOD environment variable
+-\&  -n            return number of matches instead of "yes" or "no"
+-\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
+-\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
+-\&  -v            print info about each successful access point
+-\&  -V            print info or error about each access point
+-\&  --version     display version and exit
++\&  \-c            contact each access point individually
++\&  \-h            print help message
++\&  \-i            access XPA point on different machine (override XPA_NSINET)
++\&  \-m            override XPA_METHOD environment variable
++\&  \-n            return number of matches instead of "yes" or "no"
++\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
++\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
++\&  \-v            print info about each successful access point
++\&  \-V            print info or error about each access point
++\&  \-\-version     display version and exit
+ .Ve
+ .SH "DESCRIPTION"
+ .IX Header "DESCRIPTION"
+@@ -178,7 +178,7 @@ can shorten the time of delay using the \-t \*(L"short,long\*(R" switch. For
+ example, to shorten the delay time to 2 seconds, use:
+ .PP
+ .Vb 1
+-\&  xpaaccess -c -t "2,2" ds9
++\&  xpaaccess \-c \-t "2,2" ds9
+ .Ve
+ .PP
+ The first argument is the short delay value, and is ignored in this
+--- a/man/man1/xpachanges.1
++++ b/man/man1/xpachanges.1
 @@ -131,7 +131,7 @@
  .IX Title "xpachanges 1"
  .TH xpachanges 1 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -43,9 +78,27 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  This document describes changes that will affect users who migrate
---- xpa-2.1.13.orig/man/man1/xpaget.1
-+++ xpa-2.1.13/man/man1/xpaget.1
-@@ -131,7 +131,7 @@
+@@ -162,7 +162,7 @@ This allows support for better error handling.  If you want xpaset, etc.
+ to return before the callback is complete, use \-n switch:
+ .Sp
+ .Vb 1
+-\&  echo "file foo.fits" | xpaset -n SAOtng
++\&  echo "file foo.fits" | xpaset \-n SAOtng
+ .Ve
+ .IP "\(bu" 4
+ The old \-w switch in xpaset and xpaget is no longer necessary (and is
+@@ -172,7 +172,7 @@ an xpa access point at one time.
+ The new \-p switch on xpaset means you need not read from stdout:
+ .Sp
+ .Vb 1
+-\&  xpaset -p SAOtng colormap I8
++\&  xpaset \-p SAOtng colormap I8
+ .Ve
+ .Sp
+ will send the paramlist to the SAOtng callback without reading from stdin.
+--- a/man/man1/xpaget.1
++++ b/man/man1/xpaget.1
+@@ -131,21 +131,21 @@
  .IX Title "xpaget 1"
  .TH xpaget 1 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
@@ -54,9 +107,31 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  xpaget [\-h] [\-i nsinet] [\-m method] [\-s] [\-t sval,lval] [\-u users] <template|host:port> [paramlist]
---- xpa-2.1.13.orig/man/man1/xpainfo.1
-+++ xpa-2.1.13/man/man1/xpainfo.1
-@@ -131,7 +131,7 @@
+ .SH "OPTIONS"
+ .IX Header "OPTIONS"
+ .Vb 8
+-\&  -h            print help message
+-\&  -i            access XPA point on different machine (override XPA_NSINET)
+-\&  -m            override XPA_METHOD environment variable
+-\&  -n            don't wait for the status message after server completes
+-\&  -s            enter server mode
+-\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
+-\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
+-\&  --version     display version and exit
++\&  \-h            print help message
++\&  \-i            access XPA point on different machine (override XPA_NSINET)
++\&  \-m            override XPA_METHOD environment variable
++\&  \-n            don't wait for the status message after server completes
++\&  \-s            enter server mode
++\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
++\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
++\&  \-\-version     display version and exit
+ .Ve
+ .SH "DESCRIPTION"
+ .IX Header "DESCRIPTION"
+--- a/man/man1/xpainfo.1
++++ b/man/man1/xpainfo.1
+@@ -131,21 +131,21 @@
  .IX Title "xpainfo 1"
  .TH xpainfo 1 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
@@ -65,8 +140,30 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  xpainfo [\-h] [\-i nsinet] [\-m method] [\-n] [\-s] [\-t sval,lval] [\-u users] <template|host:port> [paramlist]
---- xpa-2.1.13.orig/man/man1/xpamb.1
-+++ xpa-2.1.13/man/man1/xpamb.1
+ .SH "OPTIONS"
+ .IX Header "OPTIONS"
+ .Vb 8
+-\&  -h            print help message
+-\&  -i            access XPA point on different machine (override XPA_NSINET)
+-\&  -m            override XPA_METHOD environment variable
+-\&  -n            don't wait for the status message after server completes
+-\&  -s            enter server mode
+-\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
+-\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
+-\&  --version     display version and exit
++\&  \-h            print help message
++\&  \-i            access XPA point on different machine (override XPA_NSINET)
++\&  \-m            override XPA_METHOD environment variable
++\&  \-n            don't wait for the status message after server completes
++\&  \-s            enter server mode
++\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
++\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
++\&  \-\-version     display version and exit
+ .Ve
+ .SH "DESCRIPTION"
+ .IX Header "DESCRIPTION"
+--- a/man/man1/xpamb.1
++++ b/man/man1/xpamb.1
 @@ -131,7 +131,7 @@
  .IX Title "xpamb 1"
  .TH xpamb 1 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -76,9 +173,87 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  The xpamb program can act as a \*(L"classical\*(R" message bus interface
---- xpa-2.1.13.orig/man/man1/xpans.1
-+++ xpa-2.1.13/man/man1/xpans.1
-@@ -131,7 +131,7 @@
+@@ -164,7 +164,7 @@ string to be stored with that data.  This string will be returned
+ by xpaget:
+ .Sp
+ .Vb 1
+-\&  xpaget xpamb foo -info
++\&  xpaget xpamb foo \-info
+ .Ve
+ .Sp
+ (along with other information such as the date/time of storage and the size of
+@@ -172,7 +172,7 @@ the data buffer) if the \-info switch is specified. If the info string contains
+ spaces, you must enclose it in \fBtwo\fR sets of quotes:
+ .Sp
+ .Vb 1
+-\&  cat foo | xpaset xpamb -store foo -info "'this is info on foo'"
++\&  cat foo | xpaset xpamb \-store foo \-info "'this is info on foo'"
+ .Ve
+ .Sp
+ The first set of quotes is removed by the shell while the second is used to
+@@ -189,7 +189,7 @@ Delete the named data buffer and free all allocated space.
+ Switches can be used in any combination that makes sense. For example:
+ .PP
+ .Vb 1
+-\&  cat foo.fits | xpaset xpamb -store foo -info "FITS" "DS9:*" fits foo.fits
++\&  cat foo.fits | xpaset xpamb \-store foo \-info "FITS" "DS9:*" fits foo.fits
+ .Ve
+ .PP
+ will broadcast the foo.fits image to all access points of class
+@@ -197,7 +197,7 @@ will broadcast the foo.fits image to all access points of class
+ name of \fBfoo\fR for later manipulation such as:
+ .PP
+ .Vb 1
+-\&  xpaset -p xpamb -send foo "DS9:*" fits foo.fits
++\&  xpaset \-p xpamb \-send foo "DS9:*" fits foo.fits
+ .Ve
+ .PP
+ will re-broadcast the foo.fits image to all access points of class \*(L"\s-1DS9\s0\*(R".
+@@ -255,7 +255,7 @@ the same time.  The stored data always is send first, followed by the new
+ data:
+ .PP
+ .Vb 1
+-\&  cat foo2.fits | xpaset xpamb -send foo "DS9:*" fits foo.fits
++\&  cat foo2.fits | xpaset xpamb \-send foo "DS9:*" fits foo.fits
+ .Ve
+ .PP
+ will first send the foo.fits file, and then the foo2.fits file to all
+@@ -278,7 +278,7 @@ size in bytes of the data, and the supplied info string.
+ If arguments are specified, they will be in the form:
+ .PP
+ .Vb 1
+-\&  xpaget xpamb [-info] [-data] [name [paramlist]]
++\&  xpaget xpamb [\-info] [\-data] [name [paramlist]]
+ .Ve
+ .PP
+ If the optional \fB\-info\fR and/or \fB\-data\fR switches are specified, then
+@@ -287,20 +287,20 @@ following the switches. You can use either or both of these switches
+ in a single command. For example, if the \-info switch is used:
+ .PP
+ .Vb 1
+-\&  xpaget xpamb -info foo
++\&  xpaget xpamb \-info foo
+ .Ve
+ .PP
+ then the info about that stored data buffer will be returned.
+ If the \-data is used with a specific name:
+ .PP
+ .Vb 1
+-\&  xpaget xpamb -data foo
++\&  xpaget xpamb \-data foo
+ .Ve
+ .PP
+ then the stored data itself will be returned. If both are used:
+ .PP
+ .Vb 1
+-\&  xpaget xpamb -info -data foo
++\&  xpaget xpamb \-info \-data foo
+ .Ve
+ .PP
+ then the info will be returned, followed by the data. Note that it is an
+--- a/man/man1/xpans.1
++++ b/man/man1/xpans.1
+@@ -131,23 +131,23 @@
  .IX Title "xpans 1"
  .TH xpans 1 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
@@ -87,9 +262,63 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man1/xpaset.1
-+++ xpa-2.1.13/man/man1/xpaset.1
-@@ -131,7 +131,7 @@
+-\&  xpans [-h] [-e] [-k sec] [-p port] [-l log] [-s security log] [-P n]
++\&  xpans [\-h] [\-e] [\-k sec] [\-p port] [\-l log] [\-s security log] [\-P n]
+ .Ve
+ .SH "OPTIONS"
+ .IX Header "OPTIONS"
+ .Vb 8
+-\&  -h            print help message
+-\&  -e            exit when there are no more XPA connections
+-\&  -k            send keepalive messages every n sec
+-\&  -l            log data base entries to specified file
+-\&  -p            listen for connections on specified port
+-\&  -s            log security info for each connection to specified file      
+-\&  -P            accept proxy requests (P=1) using separate thread (P=2)
+-\&  --version     display version and exit
++\&  \-h            print help message
++\&  \-e            exit when there are no more XPA connections
++\&  \-k            send keepalive messages every n sec
++\&  \-l            log data base entries to specified file
++\&  \-p            listen for connections on specified port
++\&  \-s            log security info for each connection to specified file      
++\&  \-P            accept proxy requests (P=1) using separate thread (P=2)
++\&  \-\-version     display version and exit
+ .Ve
+ .SH "DESCRIPTION"
+ .IX Header "DESCRIPTION"
+@@ -203,7 +203,7 @@ If \fIxpans\fR is terminated but ds9 still is running, you
+ can re-register both access points for the ds9 process by running:
+ .PP
+ .Vb 1
+-\&  xpaset -p 838e2f67:1863 -nsconnect
++\&  xpaset \-p 838e2f67:1863 \-nsconnect
+ .Ve
+ .PP
+ Notice that the ip:port specifier is used with \fIxpaset\fR to bypass
+@@ -256,8 +256,8 @@ assume that ds9 has been started up using:
+ .PP
+ .Vb 3
+ \&  ds9 &
+-\&  ds9 -title ds9-1-eric &
+-\&  ds9 -title ds9-2-eric &
++\&  ds9 \-title ds9-1-eric &
++\&  ds9 \-title ds9-2-eric &
+ .Ve
+ .PP
+ To lookup all ds9 access points which end in \*(L".eric\*(R" and which can
+@@ -296,7 +296,7 @@ to a proxy-enabled xpans program on host2 (specifying host2's \s-1XPA\s0 method)
+ For example:
+ .PP
+ .Vb 1
+-\&  xpaset -p foo -remote 'host2:28571' + -proxy   # on host1
++\&  xpaset \-p foo \-remote 'host2:28571' + \-proxy   # on host1
+ .Ve
+ .PP
+ When this is done, host2 can use xpaset, xpaget, and xpainfo calls to
+--- a/man/man1/xpaset.1
++++ b/man/man1/xpaset.1
+@@ -131,23 +131,23 @@
  .IX Title "xpaset 1"
  .TH xpaset 1 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
@@ -98,53 +327,106 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  <data> | xpaset  [\-h] [\-i nsinet] [\-m method] [\-n] [\-p] [\-s] [\-t sval,lval] [\-u users] [\-v] <template|host:port> [paramlist]
---- xpa-2.1.13.orig/man/man3/xpaaccess.3
-+++ xpa-2.1.13/man/man3/xpaaccess.3
-@@ -131,8 +131,7 @@
- .IX Title "xpaaccess 3"
- .TH xpaaccess 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--XPAAccess: return XPA access points matching
--template (XPA 2.1 and above)
-+XPAAccess \- return XPA access points matching template (XPA 2.1 and above)
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
---- xpa-2.1.13.orig/man/man3/xpaatexit.3
-+++ xpa-2.1.13/man/man3/xpaatexit.3
-@@ -131,7 +131,7 @@
- .IX Title "xpaatexit 3"
- .TH xpaatexit 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAAtExit: install exit handler\fR
-+XPAAtExit \- install exit handler
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
---- xpa-2.1.13.orig/man/man3/xpacleanup.3
-+++ xpa-2.1.13/man/man3/xpacleanup.3
-@@ -131,7 +131,7 @@
- .IX Title "xpacleanup 3"
- .TH xpacleanup 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPACleanup: release reserved XPA memory\fR
-+XPACleanup \- release reserved XPA memory
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
---- xpa-2.1.13.orig/man/man3/xpaclient.3
-+++ xpa-2.1.13/man/man3/xpaclient.3
-@@ -131,7 +131,7 @@
- .IX Title "xpaclient 3"
- .TH xpaclient 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAClient: The XPA Client\-side Programming Interface\fR
-+XPAClient \- The XPA Client\-side Programming Interface
+ .SH "OPTIONS"
+ .IX Header "OPTIONS"
+ .Vb 10
+-\&  -h            print help message
+-\&  -i            access XPA point on different machine (override XPA_NSINET)
+-\&  -m            override XPA_METHOD environment variable
+-\&  -n            don't wait for the status message after server completes
+-\&  -p            don't read (or send) buf data from stdin
+-\&  -s            enter server mode
+-\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
+-\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
+-\&  -v            verify message to stdout
+-\&  --version     display version and exit
++\&  \-h            print help message
++\&  \-i            access XPA point on different machine (override XPA_NSINET)
++\&  \-m            override XPA_METHOD environment variable
++\&  \-n            don't wait for the status message after server completes
++\&  \-p            don't read (or send) buf data from stdin
++\&  \-s            enter server mode
++\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
++\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
++\&  \-v            verify message to stdout
++\&  \-\-version     display version and exit
+ .Ve
+ .SH "DESCRIPTION"
+ .IX Header "DESCRIPTION"
+@@ -170,7 +170,7 @@ indicate that there is no data being send to stdin. For example, to
+ change the colormap used by the ds9 image display program, use:
+ .PP
+ .Vb 1
+-\&  csh> xpaset -p ds9 cmap Heat
++\&  csh> xpaset \-p ds9 cmap Heat
+ .Ve
+ .PP
+ Of course, this also can be accomplished by sending \s-1EOF\s0 to stdin in
+@@ -189,7 +189,7 @@ can be sent to access points without having to run xpaset multiple times.
+ in server mode is:
+ .PP
+ .Vb 8
+-\&  csh> xpaset -s
++\&  csh> xpaset \-s
+ \&  xpaset ds9 colormap I8
+ \&  ^D
+ \&  xpaset ds9 regions
+--- a/man/man3/xpaaccess.3
++++ b/man/man3/xpaaccess.3
+@@ -131,8 +131,7 @@
+ .IX Title "xpaaccess 3"
+ .TH xpaaccess 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-XPAAccess: return XPA access points matching
+-template (XPA 2.1 and above)
++XPAAccess \- return XPA access points matching template (XPA 2.1 and above)
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ .Vb 1
+--- a/man/man3/xpaatexit.3
++++ b/man/man3/xpaatexit.3
+@@ -131,7 +131,7 @@
+ .IX Title "xpaatexit 3"
+ .TH xpaatexit 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAAtExit: install exit handler\fR
++XPAAtExit \- install exit handler
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ .Vb 1
+--- a/man/man3/xpacleanup.3
++++ b/man/man3/xpacleanup.3
+@@ -131,7 +131,7 @@
+ .IX Title "xpacleanup 3"
+ .TH xpacleanup 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPACleanup: release reserved XPA memory\fR
++XPACleanup \- release reserved XPA memory
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ .Vb 1
+--- a/man/man3/xpaclient.3
++++ b/man/man3/xpaclient.3
+@@ -131,7 +131,7 @@
+ .IX Title "xpaclient 3"
+ .TH xpaclient 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAClient: The XPA Client\-side Programming Interface\fR
++XPAClient \- The XPA Client\-side Programming Interface
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  A description of the \s-1XPA\s0 client-side programming interface.
---- xpa-2.1.13.orig/man/man3/xpaclose.3
-+++ xpa-2.1.13/man/man3/xpaclose.3
+@@ -209,7 +209,7 @@ in the software module that defines or accesses an \s-1XPA\s0 access point and
+ then will link against the libxpa.a library:
+ .PP
+ .Vb 1
+-\&  gcc -o foo foo.c libxpa.a
++\&  gcc \-o foo foo.c libxpa.a
+ .Ve
+ .PP
+ \&\s-1XPA\s0 has been compiled using both C and \*(C+ compilers.
+--- a/man/man3/xpaclose.3
++++ b/man/man3/xpaclose.3
 @@ -131,7 +131,7 @@
  .IX Title "xpaclose 3"
  .TH xpaclose 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -154,8 +436,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpacmdadd.3
-+++ xpa-2.1.13/man/man3/xpacmdadd.3
+--- a/man/man3/xpacmdadd.3
++++ b/man/man3/xpacmdadd.3
 @@ -131,7 +131,7 @@
  .IX Title "xpacmdadd 3"
  .TH xpacmdadd 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -165,8 +447,25 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpacmddel.3
-+++ xpa-2.1.13/man/man3/xpacmddel.3
+@@ -157,14 +157,14 @@ with the exceptions noted below.
+ When help is requested for a command access point using:
+ .PP
+ .Vb 1
+-\&  xpaget -h class:name
++\&  xpaget \-h class:name
+ .Ve
+ .PP
+ all of the command help strings are listed.  To get help for a given
+ command, use:
+ .PP
+ .Vb 1
+-\&  xpaget -h class:name cmd
++\&  xpaget \-h class:name cmd
+ .Ve
+ .PP
+ Also, the acl keyword in the send_mode and receive_mode strings is
+--- a/man/man3/xpacmddel.3
++++ b/man/man3/xpacmddel.3
 @@ -131,7 +131,7 @@
  .IX Title "xpacmddel 3"
  .TH xpacmddel 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -176,8 +475,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpacmdnew.3
-+++ xpa-2.1.13/man/man3/xpacmdnew.3
+--- a/man/man3/xpacmdnew.3
++++ b/man/man3/xpacmdnew.3
 @@ -131,7 +131,7 @@
  .IX Title "xpacmdnew 3"
  .TH xpacmdnew 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -187,8 +486,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpafree.3
-+++ xpa-2.1.13/man/man3/xpafree.3
+--- a/man/man3/xpafree.3
++++ b/man/man3/xpafree.3
 @@ -131,7 +131,7 @@
  .IX Title "xpafree 3"
  .TH xpafree 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -198,8 +497,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpaget.3
-+++ xpa-2.1.13/man/man3/xpaget.3
+--- a/man/man3/xpaget.3
++++ b/man/man3/xpaget.3
 @@ -131,7 +131,7 @@
  .IX Title "xpaget 3"
  .TH xpaget 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -209,8 +508,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpagetfd.3
-+++ xpa-2.1.13/man/man3/xpagetfd.3
+--- a/man/man3/xpagetfd.3
++++ b/man/man3/xpagetfd.3
 @@ -131,7 +131,7 @@
  .IX Title "xpagetfd 3"
  .TH xpagetfd 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -220,8 +519,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpainfo.3
-+++ xpa-2.1.13/man/man3/xpainfo.3
+--- a/man/man3/xpainfo.3
++++ b/man/man3/xpainfo.3
 @@ -131,7 +131,7 @@
  .IX Title "xpainfo 3"
  .TH xpainfo 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -231,8 +530,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpainfonew.3
-+++ xpa-2.1.13/man/man3/xpainfonew.3
+--- a/man/man3/xpainfonew.3
++++ b/man/man3/xpainfonew.3
 @@ -131,7 +131,7 @@
  .IX Title "xpainfonew 3"
  .TH xpainfonew 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -242,8 +541,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpamacros.3
-+++ xpa-2.1.13/man/man3/xpamacros.3
+--- a/man/man3/xpamacros.3
++++ b/man/man3/xpamacros.3
 @@ -131,7 +131,7 @@
  .IX Title "xpamacros 3"
  .TH xpamacros 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -253,8 +552,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpamainloop.3
-+++ xpa-2.1.13/man/man3/xpamainloop.3
+--- a/man/man3/xpamainloop.3
++++ b/man/man3/xpamainloop.3
 @@ -131,7 +131,7 @@
  .IX Title "xpamainloop 3"
  .TH xpamainloop 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -264,8 +563,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpanew.3
-+++ xpa-2.1.13/man/man3/xpanew.3
+--- a/man/man3/xpanew.3
++++ b/man/man3/xpanew.3
 @@ -131,7 +131,7 @@
  .IX Title "xpanew 3"
  .TH xpanew 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -275,8 +574,17 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpanslookup.3
-+++ xpa-2.1.13/man/man3/xpanslookup.3
+@@ -172,7 +172,7 @@ message by setting the \s-1XPA_VERSIONCHECK\s0 environment variable to \*(L"fals
+ The help string is meant to be returned by a request from xpaget:
+ .PP
+ .Vb 1
+-\&  xpaget class:name -help
++\&  xpaget class:name \-help
+ .Ve
+ .PP
+ A send_callback and/or a receive_callback can be specified; at
+--- a/man/man3/xpanslookup.3
++++ b/man/man3/xpanslookup.3
 @@ -131,7 +131,7 @@
  .IX Title "xpanslookup 3"
  .TH xpanslookup 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -286,8 +594,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpaopen.3
-+++ xpa-2.1.13/man/man3/xpaopen.3
+--- a/man/man3/xpaopen.3
++++ b/man/man3/xpaopen.3
 @@ -131,7 +131,7 @@
  .IX Title "xpaopen 3"
  .TH xpaopen 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -297,8 +605,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xpapoll.3
-+++ xpa-2.1.13/man/man3/xpapoll.3
+--- a/man/man3/xpapoll.3
++++ b/man/man3/xpapoll.3
 @@ -131,7 +131,7 @@
  .IX Title "xpapoll 3"
  .TH xpapoll 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
@@ -308,569 +616,88 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
---- xpa-2.1.13.orig/man/man3/xparace.3
-+++ xpa-2.1.13/man/man3/xparace.3
+--- a/man/man3/xparace.3
++++ b/man/man3/xparace.3
 @@ -131,7 +131,7 @@
  .IX Title "xparace 3"
  .TH xparace 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
 -\&\fBXPA Race Conditions\fR
 +XPARace \- XPA Race Conditions
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Potential \s-1XPA\s0 race conditions and how to avoid them.
---- xpa-2.1.13.orig/man/man3/xpaserver.3
-+++ xpa-2.1.13/man/man3/xpaserver.3
-@@ -131,7 +131,7 @@
- .IX Title "xpaserver 3"
- .TH xpaserver 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAServer: The XPA Server\-side Programming Interface\fR
-+XPAServer \- The XPA Server\-side Programming Interface
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- A description of the \s-1XPA\s0 server-side programming interface.
---- xpa-2.1.13.orig/man/man3/xpaset.3
-+++ xpa-2.1.13/man/man3/xpaset.3
-@@ -131,7 +131,7 @@
- .IX Title "xpaset 3"
- .TH xpaset 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPASet: send data to one or more XPA servers\fR
-+XPASet \- send data to one or more XPA servers
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
---- xpa-2.1.13.orig/man/man3/xpasetfd.3
-+++ xpa-2.1.13/man/man3/xpasetfd.3
-@@ -131,7 +131,7 @@
- .IX Title "xpasetfd 3"
- .TH xpasetfd 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPASetFd: send data from stdin to one or more XPA servers\fR
-+XPASetFd \- send data from stdin to one or more XPA servers
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
---- xpa-2.1.13.orig/man/mann/xpa.n
-+++ xpa-2.1.13/man/mann/xpa.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpa n"
--.TH xpa n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpa 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPA: Public Access to Data and Algorithms\fR
-+XPA \- Public Access to Data and Algorithms
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document is the Table of Contents for \s-1XPA\s0.
---- xpa-2.1.13.orig/man/mann/xpaacl.n
-+++ xpa-2.1.13/man/mann/xpaacl.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpaacl n"
--.TH xpaacl n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpaacl 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAAcl: Access Control for XPA Messaging\fR
-+XPAAcl \- Access Control for XPA Messaging\fR
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- \&\s-1XPA\s0 supports host-based access control for each \s-1XPA\s0 access point.  You
---- xpa-2.1.13.orig/man/mann/xpacode.n
-+++ xpa-2.1.13/man/mann/xpacode.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpacode n"
--.TH xpacode n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpacode 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPACode: Where to Find Example/Test Code\fR
-+XPACode \- Where to Find Example/Test Code
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- The \s-1XPA\s0 source code directory contains two test programs,
---- xpa-2.1.13.orig/man/mann/xpacommon.n
-+++ xpa-2.1.13/man/mann/xpacommon.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpacommon n"
--.TH xpacommon n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpacommon 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPACommon: Getting Common Information About Access Points\fR
-+XPACommon \- Getting Common Information About Access Points
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- There are various kinds of generic information you can retrieve about
---- xpa-2.1.13.orig/man/mann/xpaconvert.n
-+++ xpa-2.1.13/man/mann/xpaconvert.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpaconvert n"
--.TH xpaconvert n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpaconvert 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAConvert: Converting the XPA API to 2.0\fR
-+XPAConvert \- Converting the XPA API to 2.0
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document describes tips for converting from xpa 1.0 (Xt\-based
---- xpa-2.1.13.orig/man/mann/xpaenv.n
-+++ xpa-2.1.13/man/mann/xpaenv.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpaenv n"
--.TH xpaenv n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpaenv 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAEnv: Environment Variables for XPA Messaging\fR
-+XPAEnv \- Environment Variables for XPA Messaging
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes the environment variables which can be used to tailor the overall
---- xpa-2.1.13.orig/man/mann/xpainet.n
-+++ xpa-2.1.13/man/mann/xpainet.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpainet n"
--.TH xpainet n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpainet 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAInet: XPA Communication Between Hosts\fR
-+XPAInet \- XPA Communication Between Hosts
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- \&\s-1XPA\s0 uses standard inet sockets to support communication between two or
---- xpa-2.1.13.orig/man/mann/xpaintro.n
-+++ xpa-2.1.13/man/mann/xpaintro.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpaintro n"
--.TH xpaintro n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpaintro 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAIntro: Introduction to the XPA Messaging System\fR
-+XPAIntro \- Introduction to the XPA Messaging System
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- A brief introduction to the \s-1XPA\s0 messaging system, which provides
---- xpa-2.1.13.orig/man/mann/xpamethod.n
-+++ xpa-2.1.13/man/mann/xpamethod.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpamethod n"
--.TH xpamethod n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpamethod 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAMethod: XPA Communication Methods\fR
-+XPAMethod \- XPA Communication Methods
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- \&\s-1XPA\s0 supports both inet and unix (local) socket communication.
---- xpa-2.1.13.orig/man/mann/xpaname.n
-+++ xpa-2.1.13/man/mann/xpaname.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpaname n"
--.TH xpaname n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpaname 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAName: What does XPA stand for?\fR
-+XPAName \- What does XPA stand for?
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- What does \s-1XPA\s0 stand for? Who knows anymore!
---- xpa-2.1.13.orig/man/mann/xpaoom.n
-+++ xpa-2.1.13/man/mann/xpaoom.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpaoom n"
--.TH xpaoom n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpaoom 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXpaoom: What happens when XPA runs out of memory?\fR
-+XPAoom \- What happens when XPA runs out of memory?
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- When \s-1XPA\s0 can't allocate memory, it exits. You can arrange to have it call
---- xpa-2.1.13.orig/man/mann/xpatcl.n
-+++ xpa-2.1.13/man/mann/xpatcl.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpatcl n"
--.TH xpatcl n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpatcl 3tcl "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPATcl: the XPA Interface to the Tcl/Tk Environment\fR
-+XPATcl \- the XPA Interface to the Tcl/Tk Environment
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Tcl/Tk programs can act as \s-1XPA\s0 clients and/or servers using the Tcl
---- xpa-2.1.13.orig/man/mann/xpatemplate.n
-+++ xpa-2.1.13/man/mann/xpatemplate.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpatemplate n"
--.TH xpatemplate n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpatemplate 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPATemplate: Access Point Names and Templates\fR
-+XPATemplate \- Access Point Names and Templates
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- \&\s-1XPA\s0 access points are composed of two parts: a general class and a
---- xpa-2.1.13.orig/man/mann/xpausers.n
-+++ xpa-2.1.13/man/mann/xpausers.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpausers n"
--.TH xpausers n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpausers 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAUsers: Distinguishing Users\fR
-+XPAUsers \- Distinguishing Users
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- \&\s-1XPA\s0 normally distinguishes between users on a given host, but it is possible
---- xpa-2.1.13.orig/man/mann/xpaxt.n
-+++ xpa-2.1.13/man/mann/xpaxt.n
-@@ -129,9 +129,9 @@
- .\" ========================================================================
- .\"
- .IX Title "xpaxt n"
--.TH xpaxt n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpaxt 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
- .SH "NAME"
--\&\fBXPAXt: the XPA Interface to Xt (X Windows)\fR
-+XPAXt \- the XPA Interface to Xt (X Windows)
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes how \s-1XPA\s0 access points can be added to X Toolkit (Xt) programs.
---- xpa-2.1.13.orig/man/man1/xpaset.1
-+++ xpa-2.1.13/man/man1/xpaset.1
-@@ -138,16 +138,16 @@ xpaset - send data to one or more XPA se
- .SH "OPTIONS"
- .IX Header "OPTIONS"
- .Vb 10
--\&  -h            print help message
--\&  -i            access XPA point on different machine (override XPA_NSINET)
--\&  -m            override XPA_METHOD environment variable
--\&  -n            don't wait for the status message after server completes
--\&  -p            don't read (or send) buf data from stdin
--\&  -s            enter server mode
--\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
--\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
--\&  -v            verify message to stdout
--\&  --version     display version and exit
-+\&  \-h            print help message
-+\&  \-i            access XPA point on different machine (override XPA_NSINET)
-+\&  \-m            override XPA_METHOD environment variable
-+\&  \-n            don't wait for the status message after server completes
-+\&  \-p            don't read (or send) buf data from stdin
-+\&  \-s            enter server mode
-+\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
-+\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
-+\&  \-v            verify message to stdout
-+\&  \-\-version     display version and exit
- .Ve
- .SH "DESCRIPTION"
- .IX Header "DESCRIPTION"
-@@ -170,7 +170,7 @@ indicate that there is no data being sen
- change the colormap used by the ds9 image display program, use:
- .PP
- .Vb 1
--\&  csh> xpaset -p ds9 cmap Heat
-+\&  csh> xpaset \-p ds9 cmap Heat
- .Ve
- .PP
- Of course, this also can be accomplished by sending \s-1EOF\s0 to stdin in
-@@ -189,7 +189,7 @@ can be sent to access points without hav
- in server mode is:
- .PP
- .Vb 8
--\&  csh> xpaset -s
-+\&  csh> xpaset \-s
- \&  xpaset ds9 colormap I8
- \&  ^D
- \&  xpaset ds9 regions
---- xpa-2.1.13.orig/man/man1/xpachanges.1
-+++ xpa-2.1.13/man/man1/xpachanges.1
-@@ -162,7 +162,7 @@ This allows support for better error han
- to return before the callback is complete, use \-n switch:
- .Sp
- .Vb 1
--\&  echo "file foo.fits" | xpaset -n SAOtng
-+\&  echo "file foo.fits" | xpaset \-n SAOtng
- .Ve
- .IP "\(bu" 4
- The old \-w switch in xpaset and xpaget is no longer necessary (and is
-@@ -172,7 +172,7 @@ an xpa access point at one time.
- The new \-p switch on xpaset means you need not read from stdout:
- .Sp
- .Vb 1
--\&  xpaset -p SAOtng colormap I8
-+\&  xpaset \-p SAOtng colormap I8
- .Ve
- .Sp
- will send the paramlist to the SAOtng callback without reading from stdin.
---- xpa-2.1.13.orig/man/man1/xpamb.1
-+++ xpa-2.1.13/man/man1/xpamb.1
-@@ -164,7 +164,7 @@ string to be stored with that data.  Thi
- by xpaget:
- .Sp
- .Vb 1
--\&  xpaget xpamb foo -info
-+\&  xpaget xpamb foo \-info
- .Ve
- .Sp
- (along with other information such as the date/time of storage and the size of
-@@ -172,7 +172,7 @@ the data buffer) if the \-info switch is
- spaces, you must enclose it in \fBtwo\fR sets of quotes:
- .Sp
- .Vb 1
--\&  cat foo | xpaset xpamb -store foo -info "'this is info on foo'"
-+\&  cat foo | xpaset xpamb \-store foo \-info "'this is info on foo'"
- .Ve
- .Sp
- The first set of quotes is removed by the shell while the second is used to
-@@ -189,7 +189,7 @@ Delete the named data buffer and free al
- Switches can be used in any combination that makes sense. For example:
- .PP
- .Vb 1
--\&  cat foo.fits | xpaset xpamb -store foo -info "FITS" "DS9:*" fits foo.fits
-+\&  cat foo.fits | xpaset xpamb \-store foo \-info "FITS" "DS9:*" fits foo.fits
- .Ve
- .PP
- will broadcast the foo.fits image to all access points of class
-@@ -197,7 +197,7 @@ will broadcast the foo.fits image to all
- name of \fBfoo\fR for later manipulation such as:
- .PP
- .Vb 1
--\&  xpaset -p xpamb -send foo "DS9:*" fits foo.fits
-+\&  xpaset \-p xpamb \-send foo "DS9:*" fits foo.fits
- .Ve
- .PP
- will re-broadcast the foo.fits image to all access points of class \*(L"\s-1DS9\s0\*(R".
-@@ -255,7 +255,7 @@ the same time.  The stored data always i
- data:
- .PP
- .Vb 1
--\&  cat foo2.fits | xpaset xpamb -send foo "DS9:*" fits foo.fits
-+\&  cat foo2.fits | xpaset xpamb \-send foo "DS9:*" fits foo.fits
- .Ve
- .PP
- will first send the foo.fits file, and then the foo2.fits file to all
-@@ -278,7 +278,7 @@ size in bytes of the data, and the suppl
- If arguments are specified, they will be in the form:
- .PP
- .Vb 1
--\&  xpaget xpamb [-info] [-data] [name [paramlist]]
-+\&  xpaget xpamb [\-info] [\-data] [name [paramlist]]
- .Ve
- .PP
- If the optional \fB\-info\fR and/or \fB\-data\fR switches are specified, then
-@@ -287,20 +287,20 @@ following the switches. You can use eith
- in a single command. For example, if the \-info switch is used:
- .PP
- .Vb 1
--\&  xpaget xpamb -info foo
-+\&  xpaget xpamb \-info foo
- .Ve
- .PP
- then the info about that stored data buffer will be returned.
- If the \-data is used with a specific name:
- .PP
- .Vb 1
--\&  xpaget xpamb -data foo
-+\&  xpaget xpamb \-data foo
- .Ve
- .PP
- then the stored data itself will be returned. If both are used:
- .PP
- .Vb 1
--\&  xpaget xpamb -info -data foo
-+\&  xpaget xpamb \-info \-data foo
- .Ve
- .PP
- then the info will be returned, followed by the data. Note that it is an
---- xpa-2.1.13.orig/man/man1/xpaaccess.1
-+++ xpa-2.1.13/man/man1/xpaaccess.1
-@@ -138,16 +138,16 @@ xpaaccess [\-c] [\-h] [\-i nsinet] [\-m
- .SH "OPTIONS"
- .IX Header "OPTIONS"
- .Vb 10
--\&  -c            contact each access point individually
--\&  -h            print help message
--\&  -i            access XPA point on different machine (override XPA_NSINET)
--\&  -m            override XPA_METHOD environment variable
--\&  -n            return number of matches instead of "yes" or "no"
--\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
--\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
--\&  -v            print info about each successful access point
--\&  -V            print info or error about each access point
--\&  --version     display version and exit
-+\&  \-c            contact each access point individually
-+\&  \-h            print help message
-+\&  \-i            access XPA point on different machine (override XPA_NSINET)
-+\&  \-m            override XPA_METHOD environment variable
-+\&  \-n            return number of matches instead of "yes" or "no"
-+\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
-+\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
-+\&  \-v            print info about each successful access point
-+\&  \-V            print info or error about each access point
-+\&  \-\-version     display version and exit
- .Ve
- .SH "DESCRIPTION"
- .IX Header "DESCRIPTION"
-@@ -178,7 +178,7 @@ can shorten the time of delay using the
- example, to shorten the delay time to 2 seconds, use:
- .PP
- .Vb 1
--\&  xpaaccess -c -t "2,2" ds9
-+\&  xpaaccess \-c \-t "2,2" ds9
- .Ve
- .PP
- The first argument is the short delay value, and is ignored in this
---- xpa-2.1.13.orig/man/man1/xpainfo.1
-+++ xpa-2.1.13/man/man1/xpainfo.1
-@@ -138,14 +138,14 @@ xpainfo [\-h] [\-i nsinet] [\-m method]
- .SH "OPTIONS"
- .IX Header "OPTIONS"
- .Vb 8
--\&  -h            print help message
--\&  -i            access XPA point on different machine (override XPA_NSINET)
--\&  -m            override XPA_METHOD environment variable
--\&  -n            don't wait for the status message after server completes
--\&  -s            enter server mode
--\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
--\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
--\&  --version     display version and exit
-+\&  \-h            print help message
-+\&  \-i            access XPA point on different machine (override XPA_NSINET)
-+\&  \-m            override XPA_METHOD environment variable
-+\&  \-n            don't wait for the status message after server completes
-+\&  \-s            enter server mode
-+\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
-+\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
-+\&  \-\-version     display version and exit
- .Ve
- .SH "DESCRIPTION"
- .IX Header "DESCRIPTION"
---- xpa-2.1.13.orig/man/man1/xpaget.1
-+++ xpa-2.1.13/man/man1/xpaget.1
-@@ -138,14 +138,14 @@ xpaget [\-h] [\-i nsinet] [\-m method] [
- .SH "OPTIONS"
- .IX Header "OPTIONS"
- .Vb 8
--\&  -h            print help message
--\&  -i            access XPA point on different machine (override XPA_NSINET)
--\&  -m            override XPA_METHOD environment variable
--\&  -n            don't wait for the status message after server completes
--\&  -s            enter server mode
--\&  -t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
--\&  -u [users]    XPA points can be from specified users (override XPA_NSUSERS)
--\&  --version     display version and exit
-+\&  \-h            print help message
-+\&  \-i            access XPA point on different machine (override XPA_NSINET)
-+\&  \-m            override XPA_METHOD environment variable
-+\&  \-n            don't wait for the status message after server completes
-+\&  \-s            enter server mode
-+\&  \-t [s,l]      set short and long timeouts (override XPA_[SHORT,LONG]_TIMEOUT)
-+\&  \-u [users]    XPA points can be from specified users (override XPA_NSUSERS)
-+\&  \-\-version     display version and exit
- .Ve
- .SH "DESCRIPTION"
- .IX Header "DESCRIPTION"
---- xpa-2.1.13.orig/man/man1/xpans.1
-+++ xpa-2.1.13/man/man1/xpans.1
-@@ -135,19 +135,19 @@ xpans \- the XPA Name Server
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
--\&  xpans [-h] [-e] [-k sec] [-p port] [-l log] [-s security log] [-P n]
-+\&  xpans [\-h] [\-e] [\-k sec] [\-p port] [\-l log] [\-s security log] [\-P n]
- .Ve
- .SH "OPTIONS"
- .IX Header "OPTIONS"
- .Vb 8
--\&  -h            print help message
--\&  -e            exit when there are no more XPA connections
--\&  -k            send keepalive messages every n sec
--\&  -l            log data base entries to specified file
--\&  -p            listen for connections on specified port
--\&  -s            log security info for each connection to specified file      
--\&  -P            accept proxy requests (P=1) using separate thread (P=2)
--\&  --version     display version and exit
-+\&  \-h            print help message
-+\&  \-e            exit when there are no more XPA connections
-+\&  \-k            send keepalive messages every n sec
-+\&  \-l            log data base entries to specified file
-+\&  \-p            listen for connections on specified port
-+\&  \-s            log security info for each connection to specified file      
-+\&  \-P            accept proxy requests (P=1) using separate thread (P=2)
-+\&  \-\-version     display version and exit
- .Ve
- .SH "DESCRIPTION"
- .IX Header "DESCRIPTION"
-@@ -203,7 +203,7 @@ If \fIxpans\fR is terminated but ds9 sti
- can re-register both access points for the ds9 process by running:
- .PP
- .Vb 1
--\&  xpaset -p 838e2f67:1863 -nsconnect
-+\&  xpaset \-p 838e2f67:1863 \-nsconnect
- .Ve
- .PP
- Notice that the ip:port specifier is used with \fIxpaset\fR to bypass
-@@ -256,8 +256,8 @@ assume that ds9 has been started up usin
- .PP
- .Vb 3
- \&  ds9 &
--\&  ds9 -title ds9-1-eric &
--\&  ds9 -title ds9-2-eric &
-+\&  ds9 \-title ds9-1-eric &
-+\&  ds9 \-title ds9-2-eric &
- .Ve
- .PP
- To lookup all ds9 access points which end in \*(L".eric\*(R" and which can
-@@ -296,7 +296,7 @@ to a proxy-enabled xpans program on host
- For example:
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ Potential \s-1XPA\s0 race conditions and how to avoid them.
+--- a/man/man3/xpaserver.3
++++ b/man/man3/xpaserver.3
+@@ -131,7 +131,7 @@
+ .IX Title "xpaserver 3"
+ .TH xpaserver 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAServer: The XPA Server\-side Programming Interface\fR
++XPAServer \- The XPA Server\-side Programming Interface
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ A description of the \s-1XPA\s0 server-side programming interface.
+@@ -207,7 +207,7 @@ in the software module that defines or accesses an \s-1XPA\s0 access point, and
+ then will link against the libxpa.a library:
  .PP
  .Vb 1
--\&  xpaset -p foo -remote 'host2:28571' + -proxy   # on host1
-+\&  xpaset \-p foo \-remote 'host2:28571' + \-proxy   # on host1
+-\&  gcc -o foo foo.c libxpa.a
++\&  gcc \-o foo foo.c libxpa.a
  .Ve
  .PP
- When this is done, host2 can use xpaset, xpaget, and xpainfo calls to
---- xpa-2.1.13.orig/man/man3/xpanew.3
-+++ xpa-2.1.13/man/man3/xpanew.3
-@@ -172,7 +172,7 @@ message by setting the \s-1XPA_VERSIONCH
- The help string is meant to be returned by a request from xpaget:
- .PP
+ \&\s-1XPA\s0 has been compiled using both C and \*(C+ compilers.
+--- a/man/man3/xpaset.3
++++ b/man/man3/xpaset.3
+@@ -131,7 +131,7 @@
+ .IX Title "xpaset 3"
+ .TH xpaset 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPASet: send data to one or more XPA servers\fR
++XPASet \- send data to one or more XPA servers
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
  .Vb 1
--\&  xpaget class:name -help
-+\&  xpaget class:name \-help
- .Ve
- .PP
- A send_callback and/or a receive_callback can be specified; at
---- xpa-2.1.13.orig/man/mann/xpaacl.n
-+++ xpa-2.1.13/man/mann/xpaacl.n
-@@ -212,13 +212,13 @@ Access to an individual \s-1XPA\s0 acces
+--- a/man/man3/xpasetfd.3
++++ b/man/man3/xpasetfd.3
+@@ -131,7 +131,7 @@
+ .IX Title "xpasetfd 3"
+ .TH xpasetfd 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPASetFd: send data from stdin to one or more XPA servers\fR
++XPASetFd \- send data from stdin to one or more XPA servers
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ .Vb 1
+--- a/man/mann/xpa.n
++++ b/man/mann/xpa.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpa n"
+-.TH xpa n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpa 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPA: Public Access to Data and Algorithms\fR
++XPA \- Public Access to Data and Algorithms
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ This document is the Table of Contents for \s-1XPA\s0.
+--- a/man/mann/xpaacl.n
++++ b/man/mann/xpaacl.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpaacl n"
+-.TH xpaacl n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpaacl 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAAcl: Access Control for XPA Messaging\fR
++XPAAcl \- Access Control for XPA Messaging\fR
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ \&\s-1XPA\s0 supports host-based access control for each \s-1XPA\s0 access point.  You
+@@ -212,13 +212,13 @@ Access to an individual \s-1XPA\s0 access point can be changed using the \-acl
  parameter for that access point.  For example:
  .PP
  .Vb 1
@@ -886,7 +713,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  will give beberly xpaget and xpaset access to the access point whose
-@@ -227,7 +227,7 @@ class is \s-1XPA\s0 and whose name is xp
+@@ -227,7 +227,7 @@ class is \s-1XPA\s0 and whose name is xpa1.
  Similarly, the current \s-1ACL\s0 for a given access point can be retrieved using:
  .PP
  .Vb 1
@@ -895,9 +722,21 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  Of course, you must have xpaget access to this \s-1XPA\s0 access point to
---- xpa-2.1.13.orig/man/mann/xpacode.n
-+++ xpa-2.1.13/man/mann/xpacode.n
-@@ -166,10 +166,10 @@ You then can use xpaset and xpaget to in
+--- a/man/mann/xpacode.n
++++ b/man/mann/xpacode.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpacode n"
+-.TH xpacode n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpacode 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPACode: Where to Find Example/Test Code\fR
++XPACode \- Where to Find Example/Test Code
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ The \s-1XPA\s0 source code directory contains two test programs,
+@@ -166,10 +166,10 @@ You then can use xpaset and xpaget to interact with these access points:
  etc. You also can use ctest to do the same thing, or to iterate:
  .PP
  .Vb 4
@@ -912,8 +751,20 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  More options are available: see the stest.c and ctest.c code itself, which
---- xpa-2.1.13.orig/man/mann/xpacommon.n
-+++ xpa-2.1.13/man/mann/xpacommon.n
+--- a/man/mann/xpacommon.n
++++ b/man/mann/xpacommon.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpacommon n"
+-.TH xpacommon n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpacommon 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPACommon: Getting Common Information About Access Points\fR
++XPACommon \- Getting Common Information About Access Points
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ There are various kinds of generic information you can retrieve about
 @@ -177,13 +177,13 @@ or
  in programs, e.g:
  .PP
@@ -931,7 +782,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  With the exception of \fB\-help\fR and \fB\-version\fR, reserved
-@@ -217,8 +217,8 @@ different machines are kept separate.  T
+@@ -217,8 +217,8 @@ different machines are kept separate.  The syntax for creating a
  clipboard is:
  .Sp
  .Vb 2
@@ -942,7 +793,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .Sp
  Use \*(L"add\*(R" to create a new clipboard or replace the contents of an existing
-@@ -227,7 +227,7 @@ one. Use \*(L"append\*(R" to append to a
+@@ -227,7 +227,7 @@ one. Use \*(L"append\*(R" to append to an existing clipboard.
  Information on a named clipboard is retrieved using:
  .Sp
  .Vb 1
@@ -951,7 +802,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .IP "\(bu" 4
  \&\fB\-exec\fR set: execute commands from buffer [options: none]
-@@ -261,7 +261,7 @@ instead of to the \s-1XPA\s0 name (since
+@@ -261,7 +261,7 @@ instead of to the \s-1XPA\s0 name (since the latter requires the xpans
  connection!):
  .Sp
  .Vb 1
@@ -960,9 +811,49 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .Sp
  See xpans for more information.
---- xpa-2.1.13.orig/man/mann/xpainet.n
-+++ xpa-2.1.13/man/mann/xpainet.n
-@@ -173,7 +173,7 @@ default the access control for the acces
+--- a/man/mann/xpaconvert.n
++++ b/man/mann/xpaconvert.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpaconvert n"
+-.TH xpaconvert n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpaconvert 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAConvert: Converting the XPA API to 2.0\fR
++XPAConvert \- Converting the XPA API to 2.0
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ This document describes tips for converting from xpa 1.0 (Xt\-based
+--- a/man/mann/xpaenv.n
++++ b/man/mann/xpaenv.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpaenv n"
+-.TH xpaenv n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpaenv 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAEnv: Environment Variables for XPA Messaging\fR
++XPAEnv \- Environment Variables for XPA Messaging
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ Describes the environment variables which can be used to tailor the overall
+--- a/man/mann/xpainet.n
++++ b/man/mann/xpainet.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpainet n"
+-.TH xpainet n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpainet 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAInet: XPA Communication Between Hosts\fR
++XPAInet \- XPA Communication Between Hosts
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ \&\s-1XPA\s0 uses standard inet sockets to support communication between two or
+@@ -173,7 +173,7 @@ default the access control for the access point named \*(L"xpa\*(R" is
  restricted to that machine:
  .PP
  .Vb 3
@@ -971,7 +862,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  \&  *:* 123.456.78.910 gisa
  \&  *:* localhost gisa
  .Ve
-@@ -184,13 +184,13 @@ or xpainfo operations.  For example, to
+@@ -184,13 +184,13 @@ or xpainfo operations.  For example, to allow the xpaget operation, the
  following command can be issued on the local machine:
  .PP
  .Vb 1
@@ -987,7 +878,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  \&  XPA:xpa 234.567.89.012 g
  \&  *:* 123.456.78.910 gisa
  \&  *:* localhost gisa
-@@ -201,7 +201,7 @@ establish communication with the local \
+@@ -201,7 +201,7 @@ establish communication with the local \s-1XPA\s0 service. This can be done
  on a call-by-call basis using the \fB\-i\fR switch on xpaset, xpaget, etc:
  .PP
  .Vb 6
@@ -996,7 +887,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  \&  class: XPA
  \&  name: xpa
  \&  method: 88877766:2778
-@@ -243,14 +243,14 @@ To register access of this local xpa on
+@@ -243,14 +243,14 @@ To register access of this local xpa on the remote machine, use
  the xpaset and the \fB\-remote\fR sub\-command:
  .PP
  .Vb 1
@@ -1013,7 +904,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  Once the remote registration command is executed, the remote client
-@@ -278,7 +278,7 @@ To unregister remote access from the loc
+@@ -278,7 +278,7 @@ To unregister remote access from the local machine, use the same
  command but with a '\-' argument:
  .PP
  .Vb 1
@@ -1022,7 +913,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  The benefit of using remote registration is that communication with
-@@ -307,7 +307,7 @@ server. To register remote proxy service
+@@ -307,7 +307,7 @@ server. To register remote proxy service, xpaset and the
  \&\fB\-proxy\fR argument added to the end of the command:
  .PP
  .Vb 1
@@ -1031,9 +922,105 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  Once a remote proxy registration command is executed, the remote
---- xpa-2.1.13.orig/man/mann/xpausers.n
-+++ xpa-2.1.13/man/mann/xpausers.n
-@@ -162,14 +162,14 @@ machine, use the \-u [user] option on xp
+--- a/man/mann/xpaintro.n
++++ b/man/mann/xpaintro.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpaintro n"
+-.TH xpaintro n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpaintro 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAIntro: Introduction to the XPA Messaging System\fR
++XPAIntro \- Introduction to the XPA Messaging System
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ A brief introduction to the \s-1XPA\s0 messaging system, which provides
+--- a/man/mann/xpamethod.n
++++ b/man/mann/xpamethod.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpamethod n"
+-.TH xpamethod n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpamethod 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAMethod: XPA Communication Methods\fR
++XPAMethod \- XPA Communication Methods
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ \&\s-1XPA\s0 supports both inet and unix (local) socket communication.
+--- a/man/mann/xpaname.n
++++ b/man/mann/xpaname.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpaname n"
+-.TH xpaname n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpaname 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAName: What does XPA stand for?\fR
++XPAName \- What does XPA stand for?
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ What does \s-1XPA\s0 stand for? Who knows anymore!
+ --- a/man/mann/xpaoom.n
++++ b/man/mann/xpaoom.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpaoom n"
+-.TH xpaoom n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpaoom 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXpaoom: What happens when XPA runs out of memory?\fR
++XPAoom \- What happens when XPA runs out of memory?
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ When \s-1XPA\s0 can't allocate memory, it exits. You can arrange to have it call
+--- a/man/mann/xpatcl.n
++++ b/man/mann/xpatcl.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpatcl n"
+-.TH xpatcl n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpatcl 3tcl "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPATcl: the XPA Interface to the Tcl/Tk Environment\fR
++XPATcl \- the XPA Interface to the Tcl/Tk Environment
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ Tcl/Tk programs can act as \s-1XPA\s0 clients and/or servers using the Tcl
+--- a/man/mann/xpatemplate.n
++++ b/man/mann/xpatemplate.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpatemplate n"
+-.TH xpatemplate n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpatemplate 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPATemplate: Access Point Names and Templates\fR
++XPATemplate \- Access Point Names and Templates
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ \&\s-1XPA\s0 access points are composed of two parts: a general class and a
+--- a/man/mann/xpausers.n
++++ b/man/mann/xpausers.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpausers n"
+-.TH xpausers n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpausers 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAUsers: Distinguishing Users\fR
++XPAUsers \- Distinguishing Users
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ \&\s-1XPA\s0 normally distinguishes between users on a given host, but it is possible
+@@ -162,14 +162,14 @@ machine, use the \-u [user] option on xpaset, xpaget, etc. For example,
  if eric executes:
  .PP
  .Vb 1
@@ -1050,44 +1037,17 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .Ve
  .PP
  Note that the \s-1XPA\s0 Environment Variable
---- xpa-2.1.13.orig/man/man3/xpaclient.3
-+++ xpa-2.1.13/man/man3/xpaclient.3
-@@ -209,7 +209,7 @@ in the software module that defines or a
- then will link against the libxpa.a library:
- .PP
- .Vb 1
--\&  gcc -o foo foo.c libxpa.a
-+\&  gcc \-o foo foo.c libxpa.a
- .Ve
- .PP
- \&\s-1XPA\s0 has been compiled using both C and \*(C+ compilers.
---- xpa-2.1.13.orig/man/man3/xpacmdadd.3
-+++ xpa-2.1.13/man/man3/xpacmdadd.3
-@@ -157,14 +157,14 @@ with the exceptions noted below.
- When help is requested for a command access point using:
- .PP
- .Vb 1
--\&  xpaget -h class:name
-+\&  xpaget \-h class:name
- .Ve
- .PP
- all of the command help strings are listed.  To get help for a given
- command, use:
- .PP
- .Vb 1
--\&  xpaget -h class:name cmd
-+\&  xpaget \-h class:name cmd
- .Ve
- .PP
- Also, the acl keyword in the send_mode and receive_mode strings is
---- xpa-2.1.13.orig/man/man3/xpaserver.3
-+++ xpa-2.1.13/man/man3/xpaserver.3
-@@ -207,7 +207,7 @@ in the software module that defines or a
- then will link against the libxpa.a library:
- .PP
- .Vb 1
--\&  gcc -o foo foo.c libxpa.a
-+\&  gcc \-o foo foo.c libxpa.a
- .Ve
- .PP
- \&\s-1XPA\s0 has been compiled using both C and \*(C+ compilers.
+--- a/man/mann/xpaxt.n
++++ b/man/mann/xpaxt.n
+@@ -129,9 +129,9 @@
+ .\" ========================================================================
+ .\"
+ .IX Title "xpaxt n"
+-.TH xpaxt n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpaxt 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
+ .SH "NAME"
+-\&\fBXPAXt: the XPA Interface to Xt (X Windows)\fR
++XPAXt \- the XPA Interface to Xt (X Windows)
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ Describes how \s-1XPA\s0 access points can be added to X Toolkit (Xt) programs.

-- 
Seamless communication between many kinds of Unix



More information about the debian-science-commits mailing list