Description: Change manpages to use dashes '-' instead of '\(hy' to fix search
 on UTF-8 terminals.
Bug-Debian: http://bugs.debian.org/251652
Author: Nicolas François <nicolas.francois@centraliens.net>

--- a/man/man4/twconfig.4
+++ b/man/man4/twconfig.4
@@ -51,7 +51,7 @@
 During installation, a signed \fITripwire\fP configuration file \fItw.cfg\fP will be created in the \fI/etc/tripwire\fP directory, and a plain text copy of this configuration file \fItwcfg.txt\fP will be created in the same directory.
 .PP
 The configuration file is modified using the
-.B twadmin\ \(hy\(hycreate\(hycfgfile
+.B twadmin\ \-\-create\-cfgfile
 command.  With this command, the user can designate
 an existing plain text file as the current configuration file.
 Using the current site key and passphrase, the new configuration file
@@ -89,7 +89,7 @@
 .Fi
 .PP
 Variable names are case-sensitive, and may contain all alphanumeric
-characters, underscores, the characters "+\(hy@:", and the period.
+characters, underscores, the characters "+\-@:", and the period.
 Two variables are predefined in the configuration file, and may
 not be changed.  \f(CWHOSTNAME\fP is the
 unqualified hostname that \fITripwire\fP is running on, and
@@ -104,9 +104,9 @@
 .if n .in 0
 POLFILE         Default = /etc/tripwire/tw.pol
 DBFILE          Default = /var/lib/tripwire/$(HOSTNAME).twd
-REPORTFILE      Default = /var/lib/tripwire/report/$(HOSTNAME)-$(DATE).twr
+REPORTFILE      Default = /var/lib/tripwire/report/$(HOSTNAME)\-$(DATE).twr
 SITEKEYFILE     Default = /etc/tripwire/site.key
-LOCALKEYFILE    Default = /etc/tripwire/$(HOSTNAME)-local.key
+LOCALKEYFILE    Default = /etc/tripwire/$(HOSTNAME)\-local.key
 .Fi
 .if n .in +\n(Tiu 
 .SS Other Variables
@@ -161,7 +161,7 @@
 the rules for all directory inodes:
 .ft CW
 .ps \n(.s-1
-\(hysnacmblCMSH
+\-snacmblCMSH
 .ps \n(.s+1
 .ft R
 .br
@@ -205,12 +205,12 @@
 Initial value:  \fItrue\fP
 .IP \f(CWREPORTLEVEL\fP
 Specifies the default level of report produced by the \fBtwprint
-\(hy\(hyprint\(hyreport\fP mode. Valid values for this option are 0 to
+\-\-print\-report\fP mode. Valid values for this option are 0 to
 4. The report
-level specified by this option can be overridden with the (\fB\(hyt\fP\ or\ \fB\(hy\(hyreport\(hylevel\fP) option on the command line. If
+level specified by this option can be overridden with the (\fB\-t\fP\ or\ \fB\-\-report\-level\fP) option on the command line. If
 this variable is not included in the configuration file, the default
 report level is 3.  Note that only reports printed using the
-\fBtwprint\ \(hy\(hyprint\(hyreport\fP mode are affected by this
+\fBtwprint\ \-\-print\-report\fP mode are affected by this
 parameter; reports displayed by other modes and other commands
 are not affected.
 .br
@@ -264,16 +264,16 @@
 a small possibility that a
 .I Tripwire
 report would contain such a line, the mail program specified must be
-able to ignore lines that consist of a single period (the \fB-oi\fP
+able to ignore lines that consist of a single period (the \fB\-oi\fP
 option to sendmail produces this behavior).
 .br
-Initial value:  \fI/usr/lib/sendmail -oi -t\fP
+Initial value:  \fI/usr/lib/sendmail \-oi \-t\fP
 .IP \f(CWEMAILREPORTLEVEL\fP
 Specifies the default level of report produced by the \fBtripwire
-\(hy\(hycheck\fP mode email report.  Valid values for this option are 0
+\-\-check\fP mode email report.  Valid values for this option are 0
 to 4. The
 report level specified by this option can be overridden with the
-(\fB\(hyt\fP\ or\ \fB\(hy\(hyemail\(hyreport\(hylevel\fP) option on the
+(\fB\-t\fP\ or\ \fB\-\-email\-report\-level\fP) option on the
 command\(hyline. If this variable is not included in the configuration
 file, the default report level is 3.
 .br
--- a/man/man4/twpolicy.4
+++ b/man/man4/twpolicy.4
@@ -59,16 +59,16 @@
 as a reference during policy file creation.
 .PP
 A new policy file is first created using the
-\fBtwadmin\ \(hy\(hycreate\(hypolfile\fP
+\fBtwadmin\ \-\-create\-polfile\fP
 command.  With this command, the
 user can designate an existing plain text file as the current policy
 file.  Using the current site key and passphrase, the new configuration
 file is encoded, signed and saved.
 .PP
 Once the initial policy file has been generated, any changes should be
-made with the \fBtripwire\ \(hy\(hyupdate\(hypolicy\fP command, rather
+made with the \fBtripwire\ \-\-update\-policy\fP command, rather
 than by simply overwriting the policy file with the
-\fBtwadmin\ \(hy\(hycreate\(hypolfile\fP command.  This is an important
+\fBtwadmin\ \-\-create\-polfile\fP command.  This is an important
 .ie n distinction\(hy\(hywhen
 .el distinction\(emwhen
 a new policy file is created, the \fITripwire\fP
@@ -86,7 +86,7 @@
 .PP
 .Nf
 # This is a comment.
-/bin  ->  $(ReadOnly);  # A comment can go here, too.
+/bin  \->  $(ReadOnly);  # A comment can go here, too.
 .Fi
 .\"
 .SS Rules
@@ -103,14 +103,14 @@
 The format for a normal rule is:
 .br
 .in +\n(Nip 
-\fIobject_name\fP    ->    \fIproperty_mask\fP;	
+\fIobject_name\fP    \->    \fIproperty_mask\fP;
 .in
 .PP
 where the \fIobject_name\fP is the fully qualified pathname for a
 directory or file, and \fIproperty_mask\fP
 specifies what properties of an object to examine or ignore.
-The '\(hy>' token separates the pathname and the property mask.
-Whitespace must separate the object name and '\(hy>' token.
+The '\->' token separates the pathname and the property mask.
+Whitespace must separate the object name and '\->' token.
 A semicolon must terminate the rule.  If the
 pathname specified is a directory, the directory and all of its
 descendants will be scanned with the indicated property mask.  If the
@@ -119,16 +119,16 @@
 .PP
 .Nf
 # Defines Tripwire behavior for entire /bin directory tree.
-/bin   ->   $(ReadOnly);
+/bin   \->   $(ReadOnly);
 
 # Defines Tripwire behavior for a single file.  In this case,
 # Tripwire watches for all properties of hostname.hme0.
-/etc/hostname.hme0    ->    $(IgnoreNone) -ar;
+/etc/hostname.hme0    \->    $(IgnoreNone) \-ar;
 
 # Scan the entire /etc directory tree using mask1, except the
 # file /etc/passwd, which should be scanned using mask2.
-/etc        ->  $(mask1);
-/etc/passwd ->  $(mask2);
+/etc        \->  $(mask1);
+/etc/passwd \->  $(mask2);
 .Fi
 .PP
 Only one rule may be associated with any given object.  If any object
@@ -137,8 +137,8 @@
 .PP
 .Nf
 # This is an example of an illegal construct.
-/usr/bin   ->   $(mask3);
-/usr/bin   ->   $(mask4);
+/usr/bin   \->   $(mask3);
+/usr/bin   \->   $(mask4);
 .Fi
 .PP   
 .\"
@@ -171,9 +171,9 @@
 Each rule in the policy file must have a property mask.  Examples:
 .PP
 .Nf
-/etc        ->    $(IgnoreAll);     #valid property mask.
-/etc        ->    +p-p;             #valid property mask.
-/etc        ->    ;                 #invalid property mask.
+/etc        \->    $(IgnoreAll);     #valid property mask.
+/etc        \->    +p\-p;             #valid property mask.
+/etc        \->    ;                 #invalid property mask.
 .Fi
 .PP
 Characters in a property mask without a preceding plus or minus sign
@@ -186,7 +186,7 @@
 # All three of the following are equivalent.
 +p+n
 pn
-pn-g
+pn\-g
 .Fi
 .PP
 Characters used in property masks, with descriptions:
@@ -230,7 +230,7 @@
 !/etc/init.d;   
 # The directory /etc/init.d will not be scanned.
 
-/etc   ->   $(ReadOnly);
+/etc   \->   $(ReadOnly);
 !/etc/rc.d;
 !/etc/mnttab;
 # Scan all of /etc, but do not scan two particular  
@@ -245,11 +245,11 @@
 using the following syntax:
 .br
 .in +\n(Nip
-\fIobject_name\fP -> \fIproperty_mask\fP (\fIrule attribute\fP = \fIvalue\fP);
+\fIobject_name\fP \-> \fIproperty_mask\fP (\fIrule attribute\fP = \fIvalue\fP);
 .in
 For example:
 .Nf
-/usr/lib -> $(ReadOnly) (emailto = admin@foo.com, severity = 80);
+/usr/lib \-> $(ReadOnly) (emailto = admin@foo.com, severity = 80);
 #This rule will notify the admin if any violations of the 
 #rule occur and designate the severity as 80.
 .Fi
@@ -270,13 +270,13 @@
 .Nf
 (emailto = admin@foo.com, severity = 80)
 {
-     /usr/lib  ->  $(ReadOnly);
+     /usr/lib  \->  $(ReadOnly);
 }
 .Fi
 is equivalent to the attribute example above.
 .PP
 The following four rule attributes are supported by \fITripwire\fP:
-./"
+.\"
 .IP \f(CWrulename\fP 15
 The \f(CWrulename\fP attribute is used to associate a rule or set
 of rules with a specific name.  In a report file, this name will be
@@ -288,13 +288,13 @@
 .br
 Example:
 .Nf
-/etc -> +ug (rulename=watchme);
+/etc \-> +ug (rulename=watchme);
 .Fi
-./"
+.\"
 .IP \f(CWemailto\fP 15
 The \f(CWemailto\fP attribute associates one or more email addresses
 with a rule or group of rules.  When an integrity check is run with the
-.B \(hy\(hyemail\(hyreport
+.B \-\-email\-report
 option and a rule is violated, a report of that violation will be sent
 to the specified email address(es), using the report format specified
 by the
@@ -304,17 +304,17 @@
 .br
 Example:
 .Nf
-/etc -> +ug (emailto=admin@domain.com);
+/etc \-> +ug (emailto=admin@domain.com);
 .Fi
 .IP
 To specify multiple email addresses, include them as a quoted,
 semicolon-delimited list.
 .Nf
 .if n .in -\n(Nip
-/etc -> +ug (emailto="admin@foo.com;admin2@foo.com");
+/etc \-> +ug (emailto="admin@foo.com;admin2@foo.com");
 .if n .in +\n(Nip
 .Fi
-./"
+.\"
 .IP \f(CWseverity\fP 15
 The \f(CWseverity\fP attribute associates a numeric severity level with
 a rule.  When \fITripwire\fP is run in Integrity Checking mode, it is
@@ -324,14 +324,14 @@
 .br
 Example:
 .Nf
-/etc -> +ug (severity=50);
+/etc \-> +ug (severity=50);
 .Fi
-./"
+.\"
 .IP \f(CWrecurse\fP 15
 The \f(CWrecurse\fP attribute specifies how a rule will scan
 directories. Valid values for \f(CWrecurse\fP are \fItrue\fR,
-\fIfalse\fR, or a number from -1 to 1,000,000. If \fR\f(CWrecurse\fP is set
-to \fItrue\fR (or\ \(hy1), tripwire will recursively scan the entire
+\fIfalse\fR, or a number from \-1 to 1,000,000. If \fR\f(CWrecurse\fP is set
+to \fItrue\fR (or \-1), tripwire will recursively scan the entire
 contents of the directory (both files and subdirectories). When
 \fR\f(CWrecurse\fP is set to \fIfalse\fR (or\ 0), and the rule refers to a
 directory, \fITripwire\fP will scan the inode of the directory but none
@@ -350,9 +350,9 @@
 .br
 Example:
 .Nf
-/etc -> +ug (recurse=2);
+/etc \-> +ug (recurse=2);
 .Fi
-./"
+.\"
 .SS Directives
 \fITripwire\fP supports a small number of directives that allow
 conditional interpretation of the policy file and certain diagnostic
@@ -403,13 +403,13 @@
 .PP
 .Nf
 @@ifhost spock || kirk
-   /bin   ->   $(ReadOnly);
+   /bin   \->   $(ReadOnly);
 @@endif
 
 @@ifhost chekov || uhura
-   /usr/bin   ->   +pinug;
+   /usr/bin   \->   +pinug;
 @@else
-   /usr/bin   ->   +pinugsmC;
+   /usr/bin   \->   +pinugsmC;
 @@endif
 .Fi
 .PP
@@ -458,9 +458,9 @@
 param1 = +SMCH;         	# Set variable param1.
 dir1   = /etc/inet;     	# Set variable dir1.
 DIR1   = /etc/init.d;   	# Variables are case sensitive.
-$(dir1)   -> +tbamc;    	# Left hand substitution.
-/etc/inet -> $(param1); 	# Right hand substitution.
-$(DIR1)   -> $(param1); 	# Double substitution.
+$(dir1)   \-> +tbamc;    	# Left hand substitution.
+/etc/inet \-> $(param1); 	# Right hand substitution.
+$(DIR1)   \-> $(param1); 	# Double substitution.
 .Fi
 .PP
 A number of variables are predefined by \fITripwire\fP and may not be
@@ -474,7 +474,7 @@
 Value:
 .ft CW
 .ps \n(.s-1
-\+pinugtsdbmCM\(hyrlacSH
+\+pinugtsdbmCM\-rlacSH
 .ps \n(.s+1
 .ft
 .IP Dynamic 15
@@ -484,7 +484,7 @@
 Value:
 .ft CW
 .ps \n(.s-1
-+pinugtd\(hysrlbamcCMSH
++pinugtd\-srlbamcCMSH
 .ps \n(.s+1
 .ft
 .IP Growing 15
@@ -493,7 +493,7 @@
 Value:
 .ft CW
 .ps \n(.s-1
-\+pinugtdl\(hysrbamcCMSH 
+\+pinugtdl\-srbamcCMSH
 .ps \n(.s+1
 .ft
 .IP Device 15 
@@ -503,7 +503,7 @@
 Value:
 .ft CW
 .ps \n(.s-1
-\+pugsdr\(hyintlbamcCMSH
+\+pugsdr\-intlbamcCMSH
 .ps \n(.s+1
 .ft R
 .IP IgnoreAll 15
@@ -513,16 +513,16 @@
 Value:
 .ft CW
 .ps \n(.s-1
-\(hypinugtsdrlbamcCMSH
+\-pinugtsdrlbamcCMSH
 .ps \n(.s+1
 .ft
 .IP IgnoreNone 15
-IgnoreNone turns on all properties and provides a convenient starting point for defining your own property masks.  (For\ example,\ \f(CWmymask\ =\ $(IgnoreNone)\ -ar;\fP)
+IgnoreNone turns on all properties and provides a convenient starting point for defining your own property masks.  (For\ example,\ \f(CWmymask\ =\ $(IgnoreNone)\ \-ar;\fP)
 .br
 Value:
 .ft CW
 .ps \n(.s-1
-\+pinugtsdrbamcCMSH\(hyl
+\+pinugtsdrbamcCMSH\-l
 .ps \n(.s+1             
 .ft
 .SH VERSION INFORMATION
--- a/man/man5/twfiles.5
+++ b/man/man5/twfiles.5
@@ -58,7 +58,7 @@
 \fBtwprint\fR(8) man pages for more information on creating and
 maintaining database files.
 .\"
-.Ms "Report Files" "\fPdefault:\fP \fI/var/lib/tripwire/report/$(HOSTNAME)\(hy$(DATE).twr\fP"
+.Ms "Report Files" "\fPdefault:\fP \fI/var/lib/tripwire/report/$(HOSTNAME)\-$(DATE).twr\fP"
 Once the above three files have been created, \fITripwire\fR can run an
 integrity check and search for any differences between the current
 system and the data stored in the "baseline" \fITripwire\fR database.
@@ -69,7 +69,7 @@
 \fBtripwire\fR(8) and \fBtwprint\fR(8) man pages for information on
 creating and printing report files.
 .\"
-.Ms "Key Files" "\fPdefaults:\fP \fI/etc/tripwire/site.key\fP \fPand\fP \fI/etc/tripwire/$(HOSTNAME)\(hylocal.key\fP"
+.Ms "Key Files" "\fPdefaults:\fP \fI/etc/tripwire/site.key\fP \fPand\fP \fI/etc/tripwire/$(HOSTNAME)\-local.key\fP"
 It is critical that \fITripwire\fR files be protected from unauthorized
 .ie n access\(hy\(hyan
 .el access\(eman
--- a/man/man8/siggen.8
+++ b/man/man8/siggen.8
@@ -8,17 +8,17 @@
 .SH SYNOPSIS
 .B siggen
 [
-.BR -t | --terse
+.BR \-t | \-\-terse
 ] [
-.BR -h | --hexadecimal
+.BR \-h | \-\-hexadecimal
 ] [
-.BR -a | --all
+.BR \-a | \-\-all
 ] [
-.BR -C | --CRC32
+.BR \-C | \-\-CRC32
 ] [
-.BR -S | --SHA
+.BR \-S | \-\-SHA
 ] [
-.BR -h | --HAVAL
+.BR \-h | \-\-HAVAL
 ]
 .IR file1 ,,,
 .SH DESCRIPTION
@@ -27,29 +27,29 @@
 for the specified files.
 .SH OPTIONS
 .TP
-.BI \(hyt ", " --terse
+.BI \-t ", " \-\-terse
 Terse mode.
 Prints requested hashes for a given file on one line, delimited
 by spaces, with no extraneous information.
 .TP
-.BI \(hyh ", " --hexadecimal
+.BI \-h ", " \-\-hexadecimal
 Display results in hexadecimal rather than base64 notation.
 .TP
-.BI \(hya ", " --all
+.BI \-a ", " \-\-all
 Display all hash function values (default).
 .TP
-.BI \(hyC ", " --CRC32
+.BI \-C ", " \-\-CRC32
 Display CRC-32, POSIX 1003.2 compliant 32-bit Cyclic Redundancy 
 Check.
 .TP
-.BI \(hyM ", " --MD5
+.BI \-M ", " \-\-MD5
 Display MD5, the RSA Data Security, Inc. Message Digest Algorithm.
 .TP
-.BI \(hyS ", " --SHA
+.BI \-S ", " \-\-SHA
 Display SHA, \fITripwire\fP's implementation of the
 NIST Secure Hash Standard, SHS (NIST FIPS 180).
 .TP
-.BI \(hyH ", " --HAVAL
+.BI \-H ", " \-\-HAVAL
 Display Haval value, a 128-bit hash code.
 .TP
 .IR file1 " [ " "file2... " ]
--- a/man/man8/tripwire.8
+++ b/man/man8/tripwire.8
@@ -41,29 +41,29 @@
 tripwire \- a file integrity checker for \s-1UNIX-like\s0 systems
 .SH SYNOPSIS
 .B tripwire
-.RB "{ " "-m i" " | " "--init" " } "  
+.RB "{ " "\-m i" " | " "\-\-init" " } "
 .RI "[ " options... " ]"
 .br 
 .B tripwire
-.RB "{ " "-m c" " | " "--check" " } "
+.RB "{ " "\-m c" " | " "\-\-check" " } "
 .RI "[ " options... " ] "
 .if n .br
 .if n .ti +.5i
 .RI "[ " "object1" " [ " "object2..." " ]]"
 .br
 .B tripwire
-.RB "{ " "-m u" " | " "--update" " } "
+.RB "{ " "\-m u" " | " "\-\-update" " } "
 .RI "[ " options... " ]"
 .br
 .B tripwire
-.RB "{ " "-m p" " | " "--update-policy" " } "
+.RB "{ " "\-m p" " | " "\-\-update\-policy" " } "
 .RI "[ " options... " ]"
 .if n .br
 .if n .ti +.5i
 .I policyfile.txt
 .br
 .B tripwire
-.RB "{ " "-m t" " | " "--test" " } "
+.RB "{ " "\-m t" " | " "\-\-test" " } "
 .RI "[ " options... " ]"
 .\"
 .SH DESCRIPTION
@@ -112,8 +112,8 @@
 the problem by replacing the current file with the correct file (e.g.,
 an intruder replaced \fI/bin/login\fP), or update the database to
 reflect the new file (e.g., a fellow system administrator installed a
-new version of \fI/usr/local/bin/emacs\fP).  The (\fB\(hyI\fP or
-\fB\(hy\(hyinteractive\fP) option launches an editor that allows the
+new version of \fI/usr/local/bin/emacs\fP).  The (\fB\-I\fP or
+\fB\-\-interactive\fP) option launches an editor that allows the
 user to update the database quickly.  The Database Update mode of
 \fBtripwire\fP can also be used.
 .\"
@@ -137,7 +137,7 @@
 \fBtripwire\fP will update the database.
 Options to control this operation include the
 .hy 0
-(\fB\(hyZ\fP\ or\ \fB\(hy\(hysecure\(hymode\fP) and (\fB\(hya\fP\ or\ \fB\(hy\(hyaccept\(hyall\fP) flags.
+(\fB\-Z\fP\ or\ \fB\-\-secure\-mode\fP) and (\fB\-a\fP\ or\ \fB\-\-accept\-all\fP) flags.
 .hy 1
 .\"
 .\" *****************************************
@@ -150,7 +150,7 @@
 to the new policy rules.  Any changes in the database since the last
 integrity check will be detected and reported.  How these violations
 are interpreted depends on the security mode specified with the
-(\fB\(hyZ\fP or \fB\(hy\(hysecure\(hymode\fP) option.
+(\fB\-Z\fP or \fB\-\-secure\-mode\fP) option.
 In \fBhigh\fP security mode (the default), \fITripwire\fR will print a list of
 violations and exit without making changes to the database.  In
 \fBlow\fP security mode, the violations are still
@@ -196,54 +196,54 @@
 .TS
 ;
 lbw(1.2i) lb.
--m i	--init
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--p \fIpolfile\fP	--polfile \fIpolfile\fP
--d \fIdatabase\fP	--dbfile \fIdatabase\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--P \fIpassphrase\fP	--local-passphrase \fIpassphrase\fP
--e	--no-encryption
+\-m i	\-\-init
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-p \fIpolfile\fP	\-\-polfile \fIpolfile\fP
+\-d \fIdatabase\fP	\-\-dbfile \fIdatabase\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-L \fIlocalkey\fP	\-\-local\-keyfile \fIlocalkey\fP
+\-P \fIpassphrase\fP	\-\-local\-passphrase \fIpassphrase\fP
+\-e	\-\-no\-encryption
 .TE
 .RE
 .TP
-.BR "\(hym i" ", " --init
+.BR "\-m i" ", " \-\-init
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Use the specified configuration file.
 .TP
-.BI \(hyp " polfile\fR, " --polfile " polfile"
+.BI \-p " polfile\fR, " \-\-polfile " polfile"
 Use the specified policy file.
 .TP
-.BI \(hyd " database\fR, " --dbfile " database"
+.BI \-d " database\fR, " \-\-dbfile " database"
 Write to the specified database file.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Use the specified site key file to read the configuration and policy
 files.
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local\-keyfile " localkey"
 Use the specified local key file to write the new database file.
-Mutually exclusive with (\fB\(hye\fR).
+Mutually exclusive with (\fB\-e\fR).
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " \-\-local\-passphrase " passphrase"
 Specifies passphrase to be used with local key to sign the new database.
-Mutually exclusive with (\fB\(hye\fR).
+Mutually exclusive with (\fB\-e\fR).
 .TP
-.BR \(hye ", " --no-encryption
+.BR \-e ", " \-\-no\-encryption
 Do not sign the database being stored.  
 The database file will still be compressed and will not be
 human-readable.
-Mutually exclusive with (\fB\(hyL\fR) and (\fB\(hyP\fR).
+Mutually exclusive with (\fB\-L\fR) and (\fB\-P\fR).
 .\"
 .\" *****************************************
 .Hr
@@ -253,84 +253,84 @@
 .TS
 ;
 lbw(1.2i) lb.
--m c	--check
--I	--interactive
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--p \fIpolfile\fP	--polfile \fIpolfile\fP
--d \fIdatabase\fP	--dbfile \fIdatabase\fP
--r \fIreport\fP	--twrfile \fIreport\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--P \fIpassphrase\fP	--local-passphrase \fIpassphrase\fP
--n	--no-tty-output
--V \fIeditor\fP	--visual \fIeditor\fP
--E	--signed-report
--i \fIlist\fP	--ignore \fIlist\fP
--l \fR{ \fIlevel\fR | \fIname\fR }\fP	--severity \fR{ \fIlevel\fR | \fIname\fR }\fP
--R \fIrule\fP	--rule-name \fIrule\fP
--x \fIsection\fP	--section \fIsection\fP
--M	--email-report
--t \fR{ 0|1|2|3|4 }\fP	--email-report-level \fR{ 0|1|2|3|4 }\fP
--h	--hexadecimal
+\-m c	\-\-check
+\-I	\-\-interactive
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-p \fIpolfile\fP	\-\-polfile \fIpolfile\fP
+\-d \fIdatabase\fP	\-\-dbfile \fIdatabase\fP
+\-r \fIreport\fP	\-\-twrfile \fIreport\fP
+\-S \fIsitekey\fP	\-\-site-keyfile \fIsitekey\fP
+\-L \fIlocalkey\fP	\-\-local-keyfile \fIlocalkey\fP
+\-P \fIpassphrase\fP	\-\-local-passphrase \fIpassphrase\fP
+\-n	\-\-no-tty-output
+\-V \fIeditor\fP	\-\-visual \fIeditor\fP
+\-E	\-\-signed-report
+\-i \fIlist\fP	\-\-ignore \fIlist\fP
+\-l \fR{ \fIlevel\fR | \fIname\fR }\fP	\-\-severity \fR{ \fIlevel\fR | \fIname\fR }\fP
+\-R \fIrule\fP	\-\-rule-name \fIrule\fP
+\-x \fIsection\fP	\-\-section \fIsection\fP
+\-M	\-\-email-report
+\-t \fR{ 0|1|2|3|4 }\fP	\-\-email-report-level \fR{ 0|1|2|3|4 }\fP
+\-h	\-\-hexadecimal
 .TE
 .RI "[ " object1 " [ " object2... " ]]"
 .RE
 .TP
-.BR "\(hym c" ", " --check
+.BR "\-m c" ", " \-\-check
 Mode selector.
 .TP
-.BR \(hyI ", " --interactive
+.BR \-I ", " \-\-interactive
 At the end of integrity checking, the resulting report is opened
 in an editor where database updates can be easily specified using
 the ballot boxes included in the report.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile
 Use the specified configuration file.
 .TP
-.BI \(hyp " polfile\fR, " --polfile " polfile
+.BI \-p " polfile\fR, " \-\-polfile " polfile
 Use the specified policy file.
 .TP
-.BI \(hyd " database\fR, " --dbfile " database"
+.BI \-d " database\fR, " \-\-dbfile " database"
 Use the specified database file.
 .TP
-.BI \(hyr " report\fR, " --twrfile " report"
+.BI \-r " report\fR, " \-\-twrfile " report"
 Write the specified report file.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site-keyfile " sitekey"
 Use the specified site key file to read the configuration
 and policy files.
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local-keyfile " localkey"
 Use the specified local key file to read the database
-file and, if (\fB\(hyE\fR) is specified, to write the report file.
+file and, if (\fB\-E\fR) is specified, to write the report file.
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " \-\-local-passphrase " passphrase"
 Specifies passphrase to be used with local key to
-sign the database when (\fB\(hyI\fR) is used, and to
-sign the report when (\fB\(hyE\fR) is used.
-Valid only with (\fB\(hyI\fR) or (\fB\(hyE\fR).
+sign the database when (\fB\-I\fR) is used, and to
+sign the report when (\fB\-E\fR) is used.
+Valid only with (\fB\-I\fR) or (\fB\-E\fR).
 .TP
-.BR \(hyn ", " --no-tty-output
+.BR \-n ", " \-\-no-tty-output
 Suppress the report from being printed at the console.
 .TP
-.BI \(hyV " editor\fR, " --visual " editor
+.BI \-V " editor\fR, " \-\-visual " editor
 Use the specified editor to edit the update ballot boxes.
-Meaningful only with (\fB\(hyI\fP).
+Meaningful only with (\fB\-I\fP).
 .TP
-.BR \(hyE ", " --signed-report
+.BR \-E ", " \-\-signed-report
 Specifies that the \fITripwire\fR report will be signed.  If
 no passphrase is specified on the command line, \fBtripwire\fR
 will prompt for the local passphrase.
 .TP
-.BI \(hyi " list\fR, " --ignore " list
+.BI \-i " list\fR, " \-\-ignore " list
 Do not compute or compare the properties specified in \fIlist\fR.  Any
 of the letter codes (abcdgimnprstulCHMS) specified in propertymasks can
 be excluded.
@@ -338,7 +338,7 @@
 The format to be used for \fIlist\fP is a double-quoted, comma-delimited list
 of properties (e.g.\ \fI\-\-ignore\ "p,c,m"\fP).
 .TP
-\fB\(hyl \fR{ \fIlevel \fR| \fIname \fR}, \fB--severity \fR{ \fIlevel \fR| \fIname \fR}
+\fB\-l \fR{ \fIlevel \fR| \fIname \fR}, \fB\-\-severity \fR{ \fIlevel \fR| \fIname \fR}
 Check only policy rules with severity greater than or equal to
 the given level.  The level may be specified as a number or as a name.
 Severity names are defined as follows:
@@ -348,35 +348,35 @@
 	Medium	66
 	High	100
 .fi
-Mutually exclusive with (\fB\(hyR\fP).
+Mutually exclusive with (\fB\-R\fP).
 .DT
 .TP
-.BI \(hyR " rule\fR, " --rule-name " rule
+.BI \-R " rule\fR, " \-\-rule-name " rule
 Check only the specified policy rule.  Mutually exclusive with
-(\fB\(hyl\fP).
+(\fB\-R\fP).
 .TP
-.BI \(hyx " section\fR, " --section " section
+.BI \-x " section\fR, " \-\-section " section
 Only check the rules in the specified section of the policy file.  For
 \fITripwire 2.4\fR, \fR\f(CWFS\fP is the only meaningful
 argument for this flag.
 .TP
-.BR \(hyM ", " --email-report
+.BR \-M ", " \-\-email-report
 Specifies that reports be emailed to the recipient(s) designated in the
 policy file.
 .TP
-.BI \(hyt " level\fR, " --email-report-level " level
+.BI \-t " level\fR, " \-\-email-report-level " level
 Specifies the detail level of email reports, overriding the
 EMAILREPORTLEVEL variable in the configuration file. \fIlevel\fR must
 be a number from 0\ to\ 4.
-Valid only with (\fB\(hyM\fP).
+Valid only with (\fB\-M\fP).
 .TP
-.BR \(hyh ", " --hexadecimal
+.BR \-h ", " \-\-hexadecimal
 Display hash values as hexadecimal in email reports
 .TP 
 .RI "[ " object1 " [ " object2... " ]]"
 List of files and directories that should be integrity checked.
 Default is all files.  If files are specified for checking, the
-\fB--severity\fR and \fB--rule-name\fR options will be ignored.
+\fB\-\-severity\fR and \fB\-\-rule-name\fR options will be ignored.
 .\"
 .\" *****************************************
 .Hr
@@ -386,64 +386,64 @@
 .TS
 ;
 lbw(1.2i) lb.
--m u	--update
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--p \fIpolfile\fP	--polfile \fIpolfile\fP
--d \fIdatabase\fP	--dbfile \fIdatabase\fP
--r \fIreport\fP	--twrfile \fIreport\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--P \fIpassphrase\fP	--local-passphrase \fIpassphrase\fP
--V \fIeditor\fP	--visual \fIeditor\fP
--a	--accept-all
--Z \fR{ low | high }\fP	--secure-mode \fR{ low | high }\fP
+\-m u	\-\-update
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-p \fIpolfile\fP	\-\-polfile \fIpolfile\fP
+\-d \fIdatabase\fP	\-\-dbfile \fIdatabase\fP
+\-r \fIreport\fP	\-\-twrfile \fIreport\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-L \fIlocalkey\fP	\-\-local\-keyfile \fIlocalkey\fP
+\-P \fIpassphrase\fP	\-\-local\-passphrase \fIpassphrase\fP
+\-V \fIeditor\fP	\-\-visual \fIeditor\fP
+\-a	\-\-accept\-all
+\-Z \fR{ low | high }\fP	\-\-secure\-mode \fR{ low | high }\fP
 .TE
 .RE
 .TP
-.BR "\(hym u" ", " --update
+.BR "\-m u" ", " \-\-update
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile
 Use the specified configuration file.
 .TP
-.BI \(hyp " polfile\fR, " --polfile " polfile
+.BI \-p " polfile\fR, " \-\-polfile " polfile
 Use the specified policy file.
 .TP
-.BI \(hyd " database\fR, " --dbfile " database"
+.BI \-d " database\fR, " \-\-dbfile " database"
 Update the specified database file.
 .TP
-.BI \(hyr " report\fR, " --twrfile " report"
+.BI \-r " report\fR, " \-\-twrfile " report"
 Read the specified report file.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Use the specified site key file to read the configuration
 and policy files.
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local\-keyfile " localkey"
 Use the specified local key file to read the database
 file and report file, and to re-write the database file.
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " \-\-local\-passphrase " passphrase"
 Specifies passphrase to be used with local key to
 sign the database.
 .TP
-.BI \(hyV " editor\fR, " --visual " editor"
+.BI \-V " editor\fR, " \-\-visual " editor"
 Use the specified editor to edit the update ballot boxes.  Mutually
-exclusive with (\fB\(hya\fP).
+exclusive with (\fB\-a\fP).
 .TP
-.BR \(hya ", " --accept-all
+.BR \-a ", " \-\-accept\-all
 Specifies that all the entries in the report file are updated
-without prompting.  Mutually exclusive with (\fB\(hyV\fP).
+without prompting.  Mutually exclusive with (\fB\-V\fP).
 .TP
-\fB\(hyZ \fR{ low | high \fR}, \fB--secure-mode \fR{ low | high \fR}
+\fB\-Z \fR{ low | high \fR}, \fB\-\-secure\-mode \fR{ low | high \fR}
 Specifies the security level, which affects how certain conditions are
 handled when inconsistent information is found between the report file
 and the current database:
@@ -464,56 +464,56 @@
 .TS
 ;
 lbw(1.2i) lb.
--m p	--update-policy
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--p \fIpolfile\fP	--polfile \fIpolfile\fP
--d \fIdatabase\fP	--dbfile \fIdatabase\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--P \fIpassphrase\fP	--local-passphrase \fIpassphrase\fP
--Q \fIpassphrase\fP	--site-passphrase \fIpassphrase\fP
--Z \fR{ low | high }\fP	--secure-mode \fR{ low | high }\fP
+\-m p	\-\-update\-policy
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-p \fIpolfile\fP	\-\-polfile \fIpolfile\fP
+\-d \fIdatabase\fP	\-\-dbfile \fIdatabase\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-L \fIlocalkey\fP	\-\-local\-keyfile \fIlocalkey\fP
+\-P \fIpassphrase\fP	\-\-local\-passphrase \fIpassphrase\fP
+\-Q \fIpassphrase\fP	\-\-site\-passphrase \fIpassphrase\fP
+\-Z \fR{ low | high }\fP	\-\-secure\-mode \fR{ low | high }\fP
 .TE
 .I policyfile.txt
 .RE
 .TP
-.BR "\(hym p" ", " --update-policy
+.BR "\-m p" ", " \-\-update\-policy
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile
 Use the specified configuration file.
 .TP
-.BI \(hyp " polfile\fR, " --polfile " polfile
+.BI \-p " polfile\fR, " \-\-polfile " polfile
 Write the specified policy file.
 .TP
-.BI \(hyd " database\fR, " --dbfile " database"
+.BI \-d " database\fR, " \-\-dbfile " database"
 Use the specified database file.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Use the specified site key file to read the configuration
 file, and read and write the policy file.
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local\-keyfile " localkey"
 Use the specified local key file to read and write the database
 file.
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " \-\-local\-passphrase " passphrase"
 Specifies passphrase to be used with local key to
 sign the database.
 .TP
-.BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase"
+.BI \-Q " passphrase\fR, " \-\-site\-passphrase " passphrase"
 Specifies passphrase to be used with site key to sign
 the new policy file.
 .TP
-\fB\(hyZ \fR{ low | high \fR}, \fB--secure-mode \fR{ low | high \fR}
+\fB\-Z \fR{ low | high \fR}, \fB\-\-secure\-mode \fR{ low | high \fR}
 Specifies the security level, which affects how certain conditions are
 handled when the existing filesystem does not match the database
 information.  Since the database produced at the end of a policy update
@@ -542,15 +542,15 @@
 .TS
 ;
 lbw(1.2i) lb.
--m t	--test
--e \fIuser@domain.com\fP	--email \fIuser@domain.com\fP
+\-m t	\-\-test
+\-e \fIuser@domain.com\fP	\-\-email \fIuser@domain.com\fP
 .TE
 .RE
 .TP
-.BR "\(hym t" ", " --test
+.BR "\-m t" ", " \-\-test
 Mode selector.
 .TP
-.BI \(hye " user@domain.com\fR, " --email " user@domain.com"
+.BI \-e " user@domain.com\fR, " \-\-email " user@domain.com"
 Use the specified email address.  This parameter must
 be supplied when test mode is used. Only one address
 may be specified.
--- a/man/man8/twadmin.8
+++ b/man/man8/twadmin.8
@@ -22,50 +22,50 @@
 twadmin \- Tripwire administrative and utility tool
 .SH SYNOPSIS
 .B twadmin
-.RB "{ " "-m F" " | " "--create-cfgfile" " } "
+.RB "{ " "\-m F" " | " "\-\-create\-cfgfile" " } "
 .I " options... "
 .if n .br
 .if n .ti +.5i
 .I "configfile.txt"
 .br
 .B twadmin
-.RB "{ " "-m f" " | " "--print-cfgfile" " } "
+.RB "{ " "\-m f" " | " "\-\-print\-cfgfile" " } "
 .RI "[ " options... " ]"
 .br
 .B twadmin
-.RB "{ " "-m P" " | " "--create-polfile" " } "
+.RB "{ " "\-m P" " | " "\-\-create\-polfile" " } "
 .RI "[ " options... " ] "
 .if n .br
 .if n .ti +.5i
 .I "policyfile.txt"
 .br
 .B twadmin
-.RB "{ " "-m p" " | " "--print-polfile" " } "
+.RB "{ " "\-m p" " | " "\-\-print\-polfile" " } "
 .RI "[ " options... " ]"
 .br
 .B twadmin
-.RB "{ " "-m R" " | " "--remove-encryption" " } "
+.RB "{ " "\-m R" " | " "\-\-remove\-encryption" " } "
 .RI "[ " options... " ] "
 .if n .br
 .if n .ti +.5i
 .IR file1 " [ " file2... " ]"
 .br
 .B twadmin
-.RB "{ " "-m E" " | " "--encrypt" " } "
+.RB "{ " "\-m E" " | " "\-\-encrypt" " } "
 .RI "[ " options... " ] "
 .if n .br
 .if n .ti +.5i
 .IR file1 " [ " file2... " ]"
 .br
 .B twadmin
-.RB "{ " "-m e" " | " "--examine" " } "
+.RB "{ " "\-m e" " | " "\-\-examine" " } "
 .RI "[ " options... " ] "
 .if n .br
 .if n .ti +.5i
 .IR file1 " [ " file2... " ]"
 .br
 .B twadmin
-.RB "{ " "-m G" " | " "--generate-keys" " } "
+.RB "{ " "\-m G" " | " "\-\-generate\-keys" " } "
 .I options...
 .br
 .B twadmin
@@ -81,7 +81,7 @@
 \fITripwire\fR files, and provides a means to generate and change
 local and site keys.
 .\" *****************************************
-.SS Creating a configuration file (--create-cfgfile)
+.SS Creating a configuration file (\-\-create\-cfgfile)
 This command mode designates an existing text file as the new
 configuration file for \fITripwire\fR.
 The plain text configuration
@@ -89,23 +89,23 @@
 Using the site key, the new configuration file
 is encoded and saved.
 .\" *****************************************
-.SS Printing a configuration file (--print-cfgfile)
+.SS Printing a configuration file (\-\-print\-cfgfile)
 This command mode prints the specified encoded and signed
 configuration file in clear-text form to standard output.  
 .\" *****************************************
-.SS Replacing a policy file (--create-polfile)
+.SS Replacing a policy file (\-\-create\-polfile)
 This command mode designates an existing text file as the new
 policy file for \fITripwire\fR.
 The plain text policy file must be specified on the 
 command line.
 Using the site key, the new policy file is encoded and saved.  
 .\" *****************************************
-.SS Printing a policy file (--print-polfile)
+.SS Printing a policy file (\-\-print\-polfile)
 This command mode prints the
 specified encoded and signed policy file
 in clear-text form to standard output.  
 .\" *****************************************
-.SS Removing encryption from a file (--remove-encryption)
+.SS Removing encryption from a file (\-\-remove\-encryption)
 This command mode allows the user to remove signing from signed
 configuration, policy, database, or report files.  Multiple
 files may be specified on the command line. The
@@ -114,7 +114,7 @@
 cryptographic signing removed, these files will be in a binary encoded
 (non-human-readable) form.
 .\" *****************************************
-.SS Encrypting a file (--encrypt)
+.SS Encrypting a file (\-\-encrypt)
 This command mode allows the user to sign
 configuration, policy, database files, or reports.
 Multiple files may be specified on the command line.
@@ -124,14 +124,14 @@
 files can be included on the command line.
 .\" *****************************************
 .hy 0
-.SS "Examining the signing status of a file (\(hy\(hyexamine)"
+.SS "Examining the signing status of a file (\-\-examine)"
 .hy 1
 This command allows the user to examine the listed files
 and print a report of their signing status.  This report
 displays the filename, file type, whether or not a file is
 signed, and what key (if any) is used to sign it.  
 .\" *****************************************
-.SS Generating keys (--generate-keys)
+.SS Generating keys (\-\-generate\-keys)
 This command mode generates site and/or local key files with
 names specified by the user.
 .\" *****************************************
@@ -148,45 +148,45 @@
 .TS
 ;
 lbw(1.2i) lb.
--m F	--create-cfgfile
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--Q \fIpassphrase\fP	--site-passphrase \fIpassphrase\fP
--e	--no-encryption
+\-m F	\-\-create\-cfgfile
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-Q \fIpassphrase\fP	\-\-site\-passphrase \fIpassphrase\fP
+\-e	\-\-no\-encryption
 .TE
 .I configfile.txt
 .RE
 .TP
-.BR "\(hym F" ", " "--create-cfgfile"
+.BR "\-m F" ", " "\-\-create\-cfgfile"
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Specify the destination of the encoded (and optionally signed)
 configuration file.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Use the specified site key file to encode and sign the new
 configuration file.
-Exactly one of (\fB\(hyS\fR) or (\fB\(hye\fP) must be specified.
+Exactly one of (\fB\-S\fR) or (\fB\-e\fP) must be specified.
 .TP
-.BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase"
+.BI \-Q " passphrase\fR, " \-\-site\-passphrase " passphrase"
 Specifies passphrase to be used with site key for
 configuration file encoding and signing.
-Valid only in conjunction with (\fB\(hyS\fR).
+Valid only in conjunction with (\fB\-S\fR).
 .TP
-.BR \(hye ", " --no-encryption
+.BR \-e ", " \-\-no\-encryption
 Do not sign the configuration file being stored.
 The configuration
 file will still be compressed, and will not be human-readable.
-Mutually exclusive with (\fB\(hyQ\fR) and (\fB\(hyS\fR).
+Mutually exclusive with (\fB\-Q\fR) and (\fB\-S\fR).
 .TP
 .I configfile.txt
 Specifies the text configuration file that will become
@@ -199,23 +199,23 @@
 .TS
 ;
 lbw(1.2i) lb.
--m f	--print-cfgfile
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
+\-m f	\-\-print\-cfgfile
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
 .TE
 .RE
 .TP
-.BR "\(hym f" ", " "--print-cfgfile"
+.BR "\-m f" ", " "\-\-print\-cfgfile"
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Print the specified configuration file.
 .\" *****************************************
 .Hr
@@ -225,45 +225,45 @@
 .TS
 ;
 lbw(1.2i) lb.
--m P	--create-polfile
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--p \fIpolfile\fP	--polfile \fIpolfile\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--Q \fIpassphrase\fP	--site-passphrase \fIpassphrase\fP
--e	--no-encryption
+\-m P	\-\-create\-polfile
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-p \fIpolfile\fP	\-\-polfile \fIpolfile\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-Q \fIpassphrase\fP	\-\-site\-passphrase \fIpassphrase\fP
+\-e	\-\-no\-encryption
 .TE
 .I policyfile.txt
 .RE
 .TP
-.BR "\(hym P" ", " --create-polfile
+.BR "\-m P" ", " \-\-create\-polfile
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode. Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode. Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Use the specified configuration file.
 .TP
-.BI \(hyp " polfile\fR, " --polfile " polfile"
+.BI \-p " polfile\fR, " \-\-polfile " polfile"
 Specify the destination of the encoded (and optionally signed) policy
 file.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
-Use the specified site key file.  Mutually exclusive with (\fB\(hye\fR).  
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
+Use the specified site key file.  Mutually exclusive with (\fB\-e\fR).
 .TP
-.BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase"
+.BI \-Q " passphrase\fR, " \-\-site\-passphrase " passphrase"
 Specifies passphrase to be used with site key for policy signing.
-Mutually exclusive with (\fB\(hye\fR).
+Mutually exclusive with (\fB\-e\fR).
 .TP
-.BR \(hye ", " --no-encryption
+.BR \-e ", " \-\-no\-encryption
 Do not sign the policy file being stored.  The policy
 file will still be compressed, and will not be human-readable.
-Mutually exclusive with (\fB\(hyQ\fR) and (\fB\(hyS\fR).
+Mutually exclusive with (\fB\-Q\fR) and (\fB\-S\fR).
 .TP
 .I policyfile.txt
 Specifies the text policy file that will become the new 
@@ -276,31 +276,31 @@
 .TS
 ;
 lbw(1.2i) lb.
--m p	--print-polfile
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--p \fIpolfile\fP	--polfile \fIpolfile\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
+\-m p	\-\-print\-polfile
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-p \fIpolfile\fP	\-\-polfile \fIpolfile\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
 .TE
 .RE
 .TP
-.BR "\(hym p" ", " --print-polfile
+.BR "\-m p" ", " \-\-print\-polfile
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP 
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Use the specified configuration file.
 .TP
-.BI \(hyp " polfile\fR, " --polfile " polfile"
+.BI \-p " polfile\fR, " \-\-polfile " polfile"
 Print the specified policy file.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Use the specified site key file.
 .\" *****************************************
 .Hr
@@ -310,42 +310,42 @@
 .TS
 ;
 lbw(1.2i) lb.
--m R	--remove-encryption
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--P \fIpassphrase\fP	--local-passphrase \fIpassphrase\fP
--Q \fIpassphrase\fP	--site-passphrase \fIpassphrase\fP
+\-m R	\-\-remove\-encryption
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-L \fIlocalkey\fP	\-\-local\-keyfile \fIlocalkey\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-P \fIpassphrase\fP	\-\-local\-passphrase \fIpassphrase\fP
+\-Q \fIpassphrase\fP	\-\-site\-passphrase \fIpassphrase\fP
 .TE
 .IR "file1" " [ " "file2..." " ]"
 .RE
 .TP
-.BR "\(hym R" ", " --remove-encryption
+.BR "\-m R" ", " \-\-remove\-encryption
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Use the specified configuration file.
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local\-keyfile " localkey"
 Specify the local keyfile to use to verify database files and reports.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Specify the site keyfile to use to verify configuration
 and policy files.
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " \-\-local\-passphrase " passphrase"
 Specify the passphrase to use when verifying with the
 old local keyfile.
 .TP
-.BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase"
+.BI \-Q " passphrase\fR, " \-\-site\-passphrase " passphrase"
 Specify the passphrase to use when verifying with the
 old site keyfile.
 .TP
@@ -359,43 +359,43 @@
 .TS
 ;
 lbw(1.2i) lb.
--m E	--encrypt
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--P \fIpassphrase\fP	--local-passphrase \fIpassphrase\fP
--Q \fIpassphrase\fP	--site-passphrase \fIpassphrase\fP
+\-m E	\-\-encrypt
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-L \fIlocalkey\fP	\-\-local\-keyfile \fIlocalkey\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-P \fIpassphrase\fP	\-\-local\-passphrase \fIpassphrase\fP
+\-Q \fIpassphrase\fP	\-\-site\-passphrase \fIpassphrase\fP
 .TE
 .IR "file1" " [ " "file2..." " ]"
 .RE
 .TP
-.BR "\(hym E" ", " --encrypt
+.BR "\-m E" ", " \-\-encrypt
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Use the specified configuration file.
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local\-keyfile " localkey"
 Specify the local keyfile to use to sign database
 files and reports.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Specify the site keyfile to use to sign configuration
 and policy files.
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " \-\-local\-passphrase " passphrase"
 Specify the passphrase to use when signing with the 
 local keyfile.
 .TP
-.BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase"
+.BI \-Q " passphrase\fR, " \-\-site\-passphrase " passphrase"
 Specify the passphrase to use when signing with the 
 site keyfile.
 .TP
@@ -409,32 +409,32 @@
 .TS
 ;
 lbw(1.2i) lb.
--m e	--examine
--v	--verbose
--s	--silent\fR,\fP --quiet
--c \fIcfgfile\fP	--cfgfile \fIcfgfile\fP
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
+\-m e	\-\-examine
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-c \fIcfgfile\fP	\-\-cfgfile \fIcfgfile\fP
+\-L \fIlocalkey\fP	\-\-local\-keyfile \fIlocalkey\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
 .TE
 .IR file1 " [ " file2... " ]"
 .RE
 .TP
-.BR "\(hym e" ", " --examine
+.BR "\-m e" ", " \-\-examine
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyc " cfgfile\fR, " --cfgfile " cfgfile"
+.BI \-c " cfgfile\fR, " \-\-cfgfile " cfgfile"
 Use the specified configuration file.
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local\-keyfile " localkey"
 Specifies the key to use as a local key.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Specifies the key to use as a site key.
 .TP
 .IR file1 " [ " file2... " ]"
@@ -447,38 +447,38 @@
 .TS
 ;
 lbw(1.2i) lb.
--m G	--generate-keys
--v	--verbose
--s	--silent\fR,\fP --quiet
--L \fIlocalkey\fP	--local-keyfile \fIlocalkey\fP
--S \fIsitekey\fP	--site-keyfile \fIsitekey\fP
--P \fIpassphrase\fP	--local-passphrase \fIpassphrase\fP
--Q \fIpassphrase\fP	--site-passphrase \fIpassphrase\fP
+\-m G	\-\-generate\-keys
+\-v	\-\-verbose
+\-s	\-\-silent\fR,\fP \-\-quiet
+\-L \fIlocalkey\fP	\-\-local\-keyfile \fIlocalkey\fP
+\-S \fIsitekey\fP	\-\-site\-keyfile \fIsitekey\fP
+\-P \fIpassphrase\fP	\-\-local\-passphrase \fIpassphrase\fP
+\-Q \fIpassphrase\fP	\-\-site\-passphrase \fIpassphrase\fP
 .TE
 .RE
 .TP
-.BR "\(hym G" ", " --generate-keys
+.BR "\-m G" ", " \-\-generate\-keys
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " \-\-verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " \-\-silent ", " \-\-quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " \-\-local\-keyfile " localkey"
 Generate the local key into the specified file.  At least one of
-(\fB\(hyL\fR) or (\fB\(hyS\fR) must be specified.
+(\fB\-L\fR) or (\fB\-S\fR) must be specified.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " \-\-site\-keyfile " sitekey"
 Generate the site key into the specified file.  At least one of
-(\fB\(hyS\fR) or (\fB\(hyL\fR) must be specified.
+(\fB\-S\fR) or (\fB\-L\fR) must be specified.
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " \-\-local\-passphrase " passphrase"
 Specify local passphrase to be used when generating
 the local key.
 .TP
-.BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase"
+.BI \-Q " passphrase\fR, " \-\-site\-passphrase " passphrase"
 Specify site passphrase to be used when generating
 the site key.
 .TP
@@ -505,28 +505,28 @@
 .TE
 .RE
 .TP
-.BR "\(hym C" ", " --change-passphrases
+.BR "\-m C" ", " --change-passphrases
 Mode selector.
 .TP
-.BR \(hyv ", " --verbose
-Verbose output mode.  Mutually exclusive with (\fB\(hys\fR).
+.BR \-v ", " --verbose
+Verbose output mode.  Mutually exclusive with (\fB\-s\fR).
 .TP
-.BR \(hys ", " --silent ", " --quiet
-Silent output mode.  Mutually exclusive with (\fB\(hyv\fR).   
+.BR \-s ", " --silent ", " --quiet
+Silent output mode.  Mutually exclusive with (\fB\-v\fR).
 .TP
-.BI \(hyL " localkey\fR, " --local-keyfile " localkey"
+.BI \-L " localkey\fR, " --local-keyfile " localkey"
 Change passphrase used to encrypt the private key in the specified localkey
-file.  At least one of (\fB\(hyL\fR) or (\fB\(hyS\fR) must be specified.
+file.  At least one of (\fB\-L\fR) or (\fB\-S\fR) must be specified.
 .TP
-.BI \(hyS " sitekey\fR, " --site-keyfile " sitekey"
+.BI \-S " sitekey\fR, " --site-keyfile " sitekey"
 Change passphrase used to encrypt the private key in the specified sitekey
-file.  At least one of (\fB\(hyL\fR) or (\fB\(hyS\fR) must be specified.
+file.  At least one of (\fB\-L\fR) or (\fB\-S\fR) must be specified.
 .TP
-.BI \(hyP " passphrase\fR, " --local-passphrase " passphrase"
+.BI \-P " passphrase\fR, " --local-passphrase " passphrase"
 Specify passphrase used to encrypt the private key in the specified localkey
 file.
 .TP
-.BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase"
+.BI \-Q " passphrase\fR, " --site-passphrase " passphrase"
 Specify passphrase used to encrypt the private key in the specified sitekey
 file.
 .TP
--- a/man/man8/twintro.8
+++ b/man/man8/twintro.8
@@ -79,13 +79,13 @@
 .RE
 .PP
 Using the  
-.B \(hy\(hyhelp
+.B \-\-help
 flag with any \fITripwire\fP command
-(e.g.\ \fBtripwire\ \(hy\(hyhelp\fP) will print a short summary of the
+(e.g.\ \fBtripwire\ \-\-help\fP) will print a short summary of the
 command modes for that command.  If a mode selector is also specified
-(e.g.\ \fBtripwire\ \(hy\(hycheck\ \(hy\(hyhelp\fP), a mode\(hyspecific
+(e.g.\ \fBtripwire\ \-\-check\ \-\-help\fP), a mode\-specific
 usage message will be displayed.  Using the \fBall\fP argument with the
-\fB--help\fP flag (e.g.\ \fBtripwire\ \(hy\(hyhelp\ all\fP) will print
+\fB\-\-help\fP flag (e.g.\ \fBtripwire\ \-\-help\ all\fP) will print
 detailed usage messages for all modes of the specified command.
 .SH VERSION INFORMATION
 This man page describes
--- a/man/man8/twprint.8
+++ b/man/man8/twprint.8
@@ -8,14 +8,14 @@
 twprint \- Tripwire database and report printer
 .SH SYNOPSIS
 .B twprint
-.RB "{ " "-m r" " | " "--print-report" " } "
+.RB "{ " "\-m r" " | " "\-\-print\-report" " } "
 .RI "[ " options... " ]"
 .if n .br
 .if n .ti +.5i
 .RI " [ " "object1" " [ " "object2..." " ]]"
 .br
 .B twprint
-.RB "{ " "-m d" " | " "--print-dbfile" " } "
+.RB "{ " "\-m d" " | " "\-\-print\-dbfile" " } "
 .RI "[ " options... " ]"
 .if n .br
 .if n .ti +.5i
@@ -33,8 +33,8 @@
 variable in the configuration file will be used.  By default,
 this value includes the date and time to the nearest second.  Because
 this value is constantly changing, \fBtwprint\fR may not be able to
-find the correct report file. For this reason, the (\fB\(hyr\fR or
-\fB--twrfile\fR) flag should be used with the desired report name to
+find the correct report file. For this reason, the (\fB\-r\fR or
+\fB\-\-twrfile\fR) flag should be used with the desired report name to
 print a specific report.
 .SS Database Printing mode
 .PP