From c90fb4c40ec4fb78e4d1b2a40c9c5af36225603c Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Tue, 19 Feb 2008 04:49:11 +0000
Subject: [PATCH] man page macro and hyphen fixes

Fix various unescaped hyphens, lines starting with . that shouldn't be
macros, undefined strings, and misspelled macros in the man pages.
Found via man --warnings on a current Debian unstable system.

ticket: new
component: krb5-doc
Version_Reported: 1.6.3
Target_Version: 1.6.4
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20228 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/bsd/v4rcp.M            | 2 +-
 src/appl/gssftp/ftp/ftp.M       | 2 +-
 src/appl/telnet/telnet/telnet.1 | 8 ++++----
 src/clients/kpasswd/kpasswd.M   | 3 +--
 src/gen-manpages/k5login.M      | 2 +-
 src/kadmin/cli/kadmin.M         | 8 ++++----
 src/slave/kpropd.M              | 2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/appl/bsd/v4rcp.M b/src/appl/bsd/v4rcp.M
index 771709fd5..97721a801 100644
--- a/src/appl/bsd/v4rcp.M
+++ b/src/appl/bsd/v4rcp.M
@@ -1,5 +1,5 @@
 .\" appl/bsd/v4rcp.M
-.TH RCP 1 \*h
+.TH V4RCP 1
 .SH NAME
 v4rcp \- back end for Kerberos V4 rcp
 .SH SYNOPSIS
diff --git a/src/appl/gssftp/ftp/ftp.M b/src/appl/gssftp/ftp/ftp.M
index 9c890cfb1..ce168813f 100644
--- a/src/appl/gssftp/ftp/ftp.M
+++ b/src/appl/gssftp/ftp/ftp.M
@@ -537,7 +537,7 @@ $1.$2 and the remote file name "mydata.data", $1 would have the value
 "mydata", and $2 would have the value "data".  The
 .I outpattern
 determines the resulting mapped filename.  The sequences `$1', `$2',
-...., `$9' are replaced by any value resulting from the
+\&..., `$9' are replaced by any value resulting from the
 .I inpattern
 template.  The sequence `$0' is replace by the original filename.
 Additionally, the sequence `[\fIseq1\fP, \fIseq2\fP]' is replaced by
diff --git a/src/appl/telnet/telnet/telnet.1 b/src/appl/telnet/telnet/telnet.1
index e354c2a12..0ed00378b 100644
--- a/src/appl/telnet/telnet/telnet.1
+++ b/src/appl/telnet/telnet/telnet.1
@@ -625,7 +625,7 @@ Sends the
 .TP
 .B escape
 Sends the current
-.b telnet
+.B telnet
 escape character (initially ``^''.
 .TP
 .B ga
@@ -761,7 +761,7 @@ character.
 If
 .B telnet
 is in
-.b localchars
+.B localchars
 mode (see
 .B toggle localchars
 below),
@@ -1296,9 +1296,9 @@ is omitted, then an interactive subshell is invoked.
 .TP
 \fB\&?\fP \fIcommand\fP
 Get help.  With no arguments,
-.b telnet
+.B telnet
 prints a help summary.  If a command is specified,
-.b telnet
+.B telnet
 will print the help information for just that command.
 .SH ENVIRONMENT
 .B Telnet
diff --git a/src/clients/kpasswd/kpasswd.M b/src/clients/kpasswd/kpasswd.M
index d3cacbbaa..ea71f383b 100644
--- a/src/clients/kpasswd/kpasswd.M
+++ b/src/clients/kpasswd/kpasswd.M
@@ -21,8 +21,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.\.so man1/header.doc
-.TH KPASSWD 1 \*h
+.TH KPASSWD 1
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .SH SYNOPSIS
diff --git a/src/gen-manpages/k5login.M b/src/gen-manpages/k5login.M
index d6b30ae57..1c9f18c4b 100644
--- a/src/gen-manpages/k5login.M
+++ b/src/gen-manpages/k5login.M
@@ -1,6 +1,6 @@
 .TH .K5LOGIN 5
 .SH NAME
-.k5login \- Kerberos V5 acl file for host access.
+\&.k5login \- Kerberos V5 acl file for host access.
 .SH DESCRIPTION
 The
 .B .k5login
diff --git a/src/kadmin/cli/kadmin.M b/src/kadmin/cli/kadmin.M
index 7739bbbbe..76dee5c48 100644
--- a/src/kadmin/cli/kadmin.M
+++ b/src/kadmin/cli/kadmin.M
@@ -206,12 +206,12 @@ Specifying "ago" in a duration may result in unexpected behavior.
 creates the principal
 .IR newprinc ,
 prompting twice for a password.  If no policy is specified with the
--policy option, and the policy named "default" exists, then that
+\-policy option, and the policy named "default" exists, then that
 policy is assigned to the principal; note that the assignment of the
 policy "default" only occurs automatically when a principal is first
 created, so the policy "default" must already exist for the assignment
 to occur.  This assignment of "default" can be suppressed with the
--clearpolicy option.  This command requires the 
+\-clearpolicy option.  This command requires the 
 .I add
 privilege.  This command has the aliases
 .B addprinc
@@ -411,7 +411,7 @@ Re-enter password for principal tlyu/admin@BLEEP.COM:
 Principal "tlyu/admin@BLEEP.COM" created.
 kadmin:
 
-kadmin: addprinc -x dn=cn=mwm_user,o=org mwm_user
+kadmin: addprinc \-x dn=cn=mwm_user,o=org mwm_user
 WARNING: no policy specified for "mwm_user@BLEEP.COM";
 defaulting to no policy.
 Enter password for principal mwm_user@BLEEP.COM: 
@@ -639,7 +639,7 @@ sets the number of past keys kept for a principal. This option is not supported
 .nf
 .TP
 EXAMPLES:
-kadmin: add_policy -maxlife "2 days" -minlength 5 guests
+kadmin: add_policy \-maxlife "2 days" \-minlength 5 guests
 kadmin:
 .TP
 ERRORS:
diff --git a/src/slave/kpropd.M b/src/slave/kpropd.M
index 1d53b101b..41791f263 100644
--- a/src/slave/kpropd.M
+++ b/src/slave/kpropd.M
@@ -122,7 +122,7 @@ mode.
 .TP
 .B \-a
 allows the user to specify the path to the
-.KR kpropd.acl
+kpropd.acl
 file; by default the path used is KPROPD_ACL_FILE
 (normally /usr/local/var/krb5kdc/kpropd.acl).
 .SH FILES
-- 
2.26.2