[SCM] Seamless communication between many kinds of Unix branch, master, updated. edcf51c73dddd14838f0b57666677f8a354c04bd

Ole Streicher debian at liska.ath.cx
Mon Feb 6 09:24:23 UTC 2012


The following commit has been merged in the master branch:
commit edcf51c73dddd14838f0b57666677f8a354c04bd
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Feb 6 10:23:30 2012 +0100

    Programmatically patch manpages instead of individual debian/patches

diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 3ce6cc1..39fd8ef 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -29,58 +29,16 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  		M="$(MAN_INSTALL_DIR)/man$$E"; \
  		if [ ! -d $$M ] ; then \
  		    echo "Making directory $$M"; \
---- 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"
--\&\fBxpaaccess: see if template matches registered XPA access points\fR
-+xpaaccess \- see if template matches registered XPA access points
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- xpaaccess [\-c] [\-h] [\-i nsinet] [\-m method] [\-n] [\-t sval,lval] [\-u users] \-v <template> [type]
- .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
-@@ -196,4 +196,4 @@ control (only for servers using version 2.1 and above) and also
- returns the real status of xpans.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
+@@ -313,6 +321,9 @@ install-man:
+ 		fi; \
+ 		echo "Installing $$B" ; \
+ 		$(INSTALL_DATA) $$i $$M/$$B; \
++		sed -i "s/\([-\[ \"]\)\(-[A-Za-z0-9]\)/\1\\\\\2/g" $$M/$$B ; \
++		sed -i "s/^\\\&\\\fB\(.*\):\(.*\)\\\fR/\1 \- \2/g" $$M/$$B ; \
++		sed -i "s/xpa(n)/xpa(7)/g" $$M/$$B ; \
+ 	    done;)
+ 
+ install-share:
 --- a/man/man1/xpachanges.1
 +++ b/man/man1/xpachanges.1
 @@ -128,10 +128,10 @@
@@ -97,333 +55,6 @@ 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
-@@ -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,10 +172,10 @@ 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.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
--\&\fBxpaget: retrieve data from one or more XPA servers\fR
-+xpaget - retrieve data from one or more XPA servers
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- xpaget [\-h] [\-i nsinet] [\-m method] [\-s] [\-t sval,lval] [\-u users] <template|host:port> [paramlist]
- .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"
-@@ -162,4 +162,4 @@ A set of qualifying parameters can be appended.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
--\&\fBxpainfo: send short message to one or more XPA servers\fR
-+xpainfo \- send short message to one or more XPA servers
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- xpainfo [\-h] [\-i nsinet] [\-m method] [\-n] [\-s] [\-t sval,lval] [\-u users] <template|host:port> [paramlist]
- .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"
-@@ -161,4 +161,4 @@ A set of qualifying parameters can be appended.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBxpamb: the XPA Message Bus\fR
-+xpamb - the XPA Message Bus
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- The xpamb program can act as a \*(L"classical\*(R" message bus interface
-@@ -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
-@@ -323,4 +323,4 @@ is equivalent to:
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
--\&\fBxpans: the XPA Name Server\fR
-+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 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
-@@ -329,4 +329,4 @@ http://hea\-www.harvard.edu/saord/ds9 for more details). As always, please
- contact us if you have problems or questions.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
--\&\fBxpaset: send data to one or more XPA servers\fR
-+xpaset - send data to one or more XPA servers
- .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]
- .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
-@@ -215,4 +215,4 @@ sent in this way.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/man3/xpaaccess.3
 +++ b/man/man3/xpaaccess.3
 @@ -131,8 +131,7 @@
@@ -436,236 +67,6 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
-@@ -233,4 +232,4 @@ in order to return the data anyway.  It is here for completion (and perhaps
- for future usefulness).
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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
-@@ -151,4 +151,4 @@ program didn't free some memory it could have\*(R". Calling the
- and make valgrind happy.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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.
-@@ -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.
-@@ -222,4 +222,4 @@ is used to specify the access point name (e.g., \*(L"ds9*\*(R"), then
- communication will take place with all servers matching that template.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAClose: close a persistent XPA client handle\fR
-+XPAClose \- close a persistent XPA client handle
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -159,4 +159,4 @@ to all \s-1XPA\s0 servers that were opened using this handle.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPACmdAdd: add a command to an XPA command public access point\fR
-+XPACmdAdd \- add a command to an XPA command public access point
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -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
-@@ -174,4 +174,4 @@ strings for each command in a command access point. (The acl for
- send_mode need not be the same as the acl for receive_mode, though).
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPACmdDel: remove a command from an XPA command public access point\fR
-+XPACmdDel \- remove a command from an XPA command public access point
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -147,4 +147,4 @@ This routine removes a command from the list of available commands in
- a given \s-1XPA\s0.  That command will no longer be available for processing.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPACmdNew: create a new XPA public access point for commands\fR
-+XPACmdNew \- create a new XPA public access point for commands
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -196,4 +196,4 @@ specified.  Each sub-command is subsequently defined using the
- \&\fIXPACmdAdd()\fR routine.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAFree: remove an XPA public access point\fR
-+XPAFree \- remove an XPA public access point
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -153,4 +153,4 @@ loads a new image for display and destroys it when the image is
- unloaded.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAGet: retrieve data from one or more XPA servers\fR
-+XPAGet \- retrieve data from one or more XPA servers
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -246,4 +246,4 @@ processed by the client.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAGetFd: retrieve data from one or more XPA servers and write to files\fR
-+XPAGetFd \- retrieve data from one or more XPA servers and write to files
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -235,4 +235,4 @@ for future usefulness).
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAInfo: send short message to one or more XPA servers\fR
-+XPAInfo \- send short message to one or more XPA servers
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -213,4 +213,4 @@ one or both will time out.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAInfoNew: define an XPA info public access point\fR
-+XPAInfoNew \- define an XPA info public access point
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -195,4 +195,4 @@ the \fIXPAInfo()\fR routine that cause the info_callback to execute do not
- wait for the callback to complete before returning.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/man3/xpamacros.3
 +++ b/man/man3/xpamacros.3
 @@ -131,7 +131,7 @@
@@ -677,107 +78,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .Vb 1
-@@ -180,4 +180,4 @@ of the data (i.e., byte swapping is dependent on the size of the data
- element being converted).
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAMainLoop: optional main loop for XPA\fR
-+XPAMainLoop \- optional main loop for XPA
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -214,4 +214,4 @@ or
- respectively before entering the loop.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPANew: create a new XPA access point\fR
-+XPANew \- create a new XPA access point
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -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
-@@ -344,4 +344,4 @@ The callback routine should return 0 if no error occurs, or \-1 to
- signal an error.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPANSLookup: lookup registered XPA access points\fR
-+XPANSLookup \- lookup registered XPA access points
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -234,4 +234,4 @@ and name entries are set to the character \*(L"?\*(R", since the class and
- name of the access point are not known. 
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAOpen: allocate a persistent client handle\fR
-+XPAOpen \- allocate a persistent client handle
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -174,4 +174,4 @@ The connected servers will remain connected when the next call to
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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"
- .SH "NAME"
--\&\fBXPAPoll: execute existing XPA requests\fR
-+XPAPoll \- execute existing XPA requests
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 1
-@@ -163,4 +163,4 @@ will be processed.  Otherwise, up to maxreq requests will be processed.
- to process one request).
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- a/man/man3/xparace.3
+-- a/man/man3/xparace.3
 +++ b/man/man3/xparace.3
 @@ -131,7 +131,7 @@
  .IX Title "xparace 3"
@@ -788,75 +89,9 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  Potential \s-1XPA\s0 race conditions and how to avoid them.
-@@ -189,4 +189,4 @@ the server. This UDP-like behavior will avoid the server deadlock when
- sending short XPAInfo messages.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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
--\&  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.
-@@ -223,4 +223,4 @@ in this way, an \s-1XPA\s0 server program enters its usual event loop (or
- uses the standard \s-1XPA\s0 event loop).
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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
-@@ -238,4 +238,4 @@ processed by the client.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
---- 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
-@@ -216,4 +216,4 @@ relevant to the client.
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpa.n
 +++ b/man/mann/xpa.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -865,11 +100,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpa 7"
 +.TH xpa 7 "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
+ \&\fBXPA: Public Access to Data and Algorithms\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document is the Table of Contents for \s-1XPA\s0.
 @@ -170,22 +170,22 @@ the command line via a suite of high-level programs.
  Choose from the following topics:
  .IP "\(bu" 4
@@ -927,7 +159,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .RE
 --- a/man/mann/xpaacl.n
 +++ b/man/mann/xpaacl.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -936,45 +168,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpaacl 7"
 +.TH xpaacl 7 "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
+ \&\fBXPAAcl: 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
--\&  xpaset -p xpa1 -acl "somehost -"
-+\&  xpaset \-p xpa1 -\acl "somehost -"
- .Ve
- .PP
- will turn off all access control for somehost to the xpa1 access point, while:
- .PP
- .Vb 1
--\&  xpaset -p XPA:xpa1 -acl "beberly gs"
-+\&  xpaset \-p XPA:xpa1 \-acl "beberly gs"
- .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 xpa1.
- Similarly, the current \s-1ACL\s0 for a given access point can be retrieved using:
- .PP
- .Vb 1
--\&  xpaget xpa1 -acl
-+\&  xpaget xpa1 \-acl
- .Ve
- .PP
- Of course, you must have xpaget access to this \s-1XPA\s0 access point to
-@@ -249,4 +249,4 @@ and will consider more stringent security (e.g., private key) in the
- future if the community requires such support.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpacode.n
 +++ b/man/mann/xpacode.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -983,35 +181,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpacode 7"
 +.TH xpacode 7 "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
+ \&\fBXPACode: Where to Find Example/Test Code\fR
  .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
--\&  ctest -s -l 100 xpa        # send to xpa 100 times
--\&  ctest -s -l 100 "xpa*"     # send to xpa and xpa1 100 times
--\&  ctest -g -l 100 xpa        # receive from xpa 100 times
--\&  ctest -g -l 100 "xpa*"     # receive from xpa and xpa1 100 times
-+\&  ctest \-s \-l 100 xpa        # send to xpa 100 times
-+\&  ctest \-s \-l 100 "xpa*"     # send to xpa and xpa1 100 times
-+\&  ctest \-g \-l 100 xpa        # receive from xpa 100 times
-+\&  ctest \-g \-l 100 "xpa*"     # receive from xpa and xpa1 100 times
- .Ve
- .PP
- More options are available: see the stest.c and ctest.c code itself, which
-@@ -179,4 +179,4 @@ The file test.tcl in the \s-1XPA\s0 source directory gives examples for using th
- XPATclInterface.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpacommon.n
 +++ b/man/mann/xpacommon.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1020,66 +194,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpacommon 7"
 +.TH xpacommon 7 "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
+ \&\fBXPACommon: Getting Common Information About Access Points\fR
  .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
- .Vb 3
--\&  xpaget ds9 -acl
--\&  xpaget ds9 -help
-+\&  xpaget ds9 \-acl
-+\&  xpaget ds9 \-help
- \&  xpaget ds9 env FOO
- .Ve
- .PP
- .Vb 1
--\&  xpaset -p ds9 env FOO foofoo
-+\&  xpaset \-p ds9 env FOO foofoo
- .Ve
- .PP
- With the exception of \fB\-help\fR and \fB\-version\fR, reserved
-@@ -217,8 +217,8 @@ different machines are kept separate.  The syntax for creating a
- clipboard is:
- .Sp
- .Vb 2
--\&  [data] | xpaset [server] -clipboard add|append [clipboard_name]
--\&  xpaset -p [server] -clipboard delete [clipboard_name]
-+\&  [data] | xpaset [server] \-clipboard add|append [clipboard_name]
-+\&  xpaset \-p [server] \-clipboard delete [clipboard_name]
- .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 an existing clipboard.
- Information on a named clipboard is retrieved using:
- .Sp
- .Vb 1
--\&  xpaget [server] -clipboard [clipboard_name]
-+\&  xpaget [server] \-clipboard [clipboard_name]
- .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 the latter requires the xpans
- connection!):
- .Sp
- .Vb 1
--\&  xpaset -p 838e2f67:1268 -nsconnect
-+\&  xpaset \-p 838e2f67:1268 \-nsconnect
- .Ve
- .Sp
- See xpans for more information.
-@@ -302,4 +302,4 @@ as the first argument. Note again that these will only be available on the
- machine where the \s-1XPA\s0 service is running.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpaconvert.n
 +++ b/man/mann/xpaconvert.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1088,20 +207,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpaconvert 7"
 +.TH xpaconvert 7 "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
+ \&\fBXPAConvert: Converting the XPA API to 2.0\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This document describes tips for converting from xpa 1.0 (Xt\-based
-@@ -267,4 +267,4 @@ is changed to:
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpaenv.n
 +++ b/man/mann/xpaenv.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1110,20 +220,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpaenv 7"
 +.TH xpaenv 7 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
--\&\fBXPAEnv: Environment Variables for XPA Messaging\fR
-+XPAEnv \- Environment Variables for XPA Messaging
+ \&\fBXPAEnv: Environment Variables for XPA Messaging\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes the environment variables which can be used to tailor the overall
-@@ -474,4 +474,4 @@ xpans programs. This sort of mismatch usually will not work due to
- protocol changes.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpainet.n
 +++ b/man/mann/xpainet.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1132,89 +233,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpainet 7"
 +.TH xpainet 7 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
--\&\fBXPAInet: XPA Communication Between Hosts\fR
-+XPAInet \- XPA Communication Between Hosts
+ \&\fBXPAInet: XPA Communication Between Hosts\fR
  .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
--\&  [sh]$ xpaget xpa -acl
-+\&  [sh]$ xpaget xpa \-acl
- \&  *:* 123.456.78.910 gisa
- \&  *:* localhost gisa
- .Ve
-@@ -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
--\&  [sh]$ xpaset -p xpa -acl "remote_machine g"
-+\&  [sh]$ xpaset \-p xpa \-acl "remote_machine g"
- .Ve
- .PP
- This results in the following access permissions on the local machine:
- .PP
- .Vb 4
--\&  [sh]$ xpaget xpa -acl
-+\&  [sh]$ xpaget xpa \-acl
- \&  XPA:xpa 234.567.89.012 g
- \&  *:* 123.456.78.910 gisa
- \&  *:* localhost gisa
-@@ -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
--\&  [sh]$ xpaget -i "local_machine:12345" xpa
-+\&  [sh]$ xpaget \-i "local_machine:12345" xpa
- \&  class: XPA
- \&  name: xpa
- \&  method: 88877766:2778
-@@ -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
--\&  [sh]$ ./xpaset -p xpa -remote 'remote_machine:$port' +
-+\&  [sh]$ ./xpaset \-p xpa \-remote 'remote_machine:$port' +
- .Ve
- .PP
- To register the local xpa access point on the remote machine with xpaget
- access only, execute:
- .PP
- .Vb 1
--\&  [sh]$ ./xpaset -p xpa -remote 'remote_machine:$port' g
-+\&  [sh]$ ./xpaset \-p xpa \-remote 'remote_machine:$port' g
- .Ve
- .PP
- Once the remote registration command is executed, the remote client
-@@ -278,7 +278,7 @@ To unregister remote access from the local machine, use the same
- command but with a '\-' argument:
- .PP
- .Vb 1
--\&  [sh]$ xpaset -p xpa -remote 'remote_machine:$port' -
-+\&  [sh]$ xpaset \-p xpa \-remote 'remote_machine:$port'  \-
- .Ve
- .PP
- The benefit of using remote registration is that communication with
-@@ -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
--\&  [sh]$ ./xpaset -p xpa -remote 'remote_machine:$port' g -proxy
-+\&  [sh]$ ./xpaset \-p xpa \-remote 'remote_machine:$port' g \-proxy
- .Ve
- .PP
- Once a remote proxy registration command is executed, the remote
-@@ -394,4 +394,4 @@ register that \s-1XPA\s0 service with a remote machine.  We hope to implement
- support for \s-1SOCKS\s0 proxy in a future release.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpaintro.n
 +++ b/man/mann/xpaintro.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1223,20 +246,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpaintro 7"
 +.TH xpaintro 7 "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
+ \&\fBXPAIntro: Introduction to the XPA Messaging System\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- A brief introduction to the \s-1XPA\s0 messaging system, which provides
-@@ -248,4 +248,4 @@ Please note that \s-1XPA\s0 currently is not thread\-safe. All \s-1XPA\s0 calls
- in the same thread.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpamethod.n
 +++ b/man/mann/xpamethod.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1245,20 +259,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpamethod 7"
 +.TH xpamethod 7 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
--\&\fBXPAMethod: XPA Communication Methods\fR
-+XPAMethod \- XPA Communication Methods
+ \&\fBXPAMethod: XPA Communication Methods\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- \&\s-1XPA\s0 supports both inet and unix (local) socket communication.
-@@ -198,4 +198,4 @@ method. You can use these alternate methods if other hosts do not need
- access to the \s-1XPA\s0 server.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpaname.n
 +++ b/man/mann/xpaname.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1267,20 +272,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpaname 7"
 +.TH xpaname 7 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
--\&\fBXPAName: What does XPA stand for?\fR
-+XPAName \- What does XPA stand for?
+ \&\fBXPAName: What does XPA stand for?\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- What does \s-1XPA\s0 stand for? Who knows anymore!
-@@ -156,4 +156,4 @@ the largest single-piece glass reflector on the North American
- continent. And now \s-1MMT\s0 stands for ... \s-1MMT\s0!
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpaoom.n
 +++ b/man/mann/xpaoom.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1289,20 +285,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpaoom 7"
 +.TH xpaoom 7 "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?
+ \&\fBXpaoom: What happens when XPA runs out of memory?\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- When \s-1XPA\s0 can't allocate memory, it exits. You can arrange to have it call
-@@ -164,4 +164,4 @@ passed to \fIsetjmp()\fR. For example:
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpatcl.n
 +++ b/man/mann/xpatcl.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1311,20 +298,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpa 3tcl"
 +.TH xpa 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
+ \&\fBXPATcl: the XPA Interface to the Tcl/Tk Environment\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Tcl/Tk programs can act as \s-1XPA\s0 clients and/or servers using the Tcl
-@@ -360,4 +360,4 @@ calling sequence for xpaaccess. You can use a version test such as:
- .Ve
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpatemplate.n
 +++ b/man/mann/xpatemplate.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1333,20 +311,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpatemplate 7"
 +.TH xpatemplate 7 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
--\&\fBXPATemplate: Access Point Names and Templates\fR
-+XPATemplate \- Access Point Names and Templates
+ \&\fBXPATemplate: Access Point Names and Templates\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- \&\s-1XPA\s0 access points are composed of two parts: a general class and a
-@@ -236,4 +236,4 @@ This feature can be useful in distinguishing between multiple
- instances of a program that all have the same class:name designation.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpausers.n
 +++ b/man/mann/xpausers.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1355,37 +324,11 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpausers 7"
 +.TH xpausers 7 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
--\&\fBXPAUsers: Distinguishing Users\fR
-+XPAUsers \- Distinguishing Users
+ \&\fBXPAUsers: Distinguishing Users\fR
  .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
--\&  xpaget -u john xpa1
-+\&  xpaget \-u john xpa1
- .Ve
- .PP
- he will access John's xpa1 access point.Use \*(L"*\*(R" to access all users
- on a given machine:
- .PP
- .Vb 1
--\&  xpaget -u "*" xpa1
-+\&  xpaget \-u "*" xpa1
- .Ve
- .PP
- Note that the \s-1XPA\s0 Environment Variable
-@@ -184,4 +184,4 @@ will cause access points from both \*(L"eric\*(R" and \*(L"john\*(R" to be proce
- by default.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages
 --- a/man/mann/xpaxt.n
 +++ b/man/mann/xpaxt.n
-@@ -128,10 +128,10 @@
+@@ -128,8 +128,8 @@
  .rm #[ #] #H #V #F C
  .\" ========================================================================
  .\"
@@ -1394,14 +337,5 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
 +.IX Title "xpaxt 7"
 +.TH xpaxt 7 "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)
+ \&\fBXPAXt: the XPA Interface to Xt (X Windows)\fR
  .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- Describes how \s-1XPA\s0 access points can be added to X Toolkit (Xt) programs.
-@@ -159,4 +159,4 @@ to add new access points from within a callback, after the program has
- entered the \fIXtAppMainLoop()\fR even loop.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--See xpa(n) for a list of \s-1XPA\s0 help pages
-+See xpa(7) for a list of \s-1XPA\s0 help pages

-- 
Seamless communication between many kinds of Unix



More information about the debian-science-commits mailing list