Description: Manpage spelling & line wrap fixes
Bug-Debian: http://bugs.debian.org/602081
Forwarded: yes
Author: Francesco Poli <invernomuto@paranoici.org>
Author: Martin Buck <mbuck@debian.org>
---
--- a/calc.man
+++ b/calc.man
@@ -437,7 +437,7 @@
 
 .TP
 .B \-\-
-The double dash indicates to calc that no more option follow.
+The double dash indicates to calc that no more options follow.
 Thus calc will ignore a later argument on the command line
 even if it starts with a dash.
 This is useful when entering negative values on the command line as in:
@@ -479,7 +479,7 @@
 arguments but instead make them available
 as strings to the argv() builtin function.
 
-Sufficiently simple commands with no no characters like
+Sufficiently simple commands with no characters like
 parentheses, brackets, semicolons, '*', which have special
 interpretations in UNIX shells may be entered, possibly with
 spaces, until the terminating newline.
@@ -627,8 +627,8 @@
 .sp 1
 .in +5n
 .nf
-./myfile
-./myfile.cal
+\&./myfile
+\&./myfile.cal
 ${LIBDIR}/myfile
 ${LIBDIR}/myfile.cal
 ${CUSTOMCALDIR}/myfile
@@ -702,7 +702,7 @@
 .BR "shell script mode" .
 Note that
 .B \-f
-must at the end of the initial ``#!'' line.
+must be at the end of the initial ``#!'' line.
 Any other optional
 .B "other_flags"
 must come before
@@ -843,7 +843,7 @@
 .PP
 The scope of a variable may be global, local to a file, or local to a
 procedure.
-Values may be grouped together in a matrix, or into a
+Values may be grouped together in a matrix, or into
 a list that permits stack and queue style operations.
 .PP
 For more information use the following
@@ -1196,7 +1196,7 @@
 .SH "CALC WEB SITE"
 \&
 .br
-Landon Noll maintains the the
+Landon Noll maintains the
 .B calc
 web site is located at:
 .sp
--- a/Makefile
+++ b/Makefile
@@ -2078,6 +2078,8 @@
 #
 ###
 
+# Note: The :\(...-sed pattern below allows word wrapping at the separators
+# of long path names (typically CALCPATH and CALCRC).
 calc.1: calc.man ${MAKE_FILE}
 	${RM} -f $@
 	${Q} echo forming calc.1 from calc.man
@@ -2089,8 +2091,9 @@
 	        -e 's,$${CUSTOMCALDIR},${CUSTOMCALDIR},g' \
 	        -e 's,$${CUSTOMINCDIR},${CUSTOMINCDIR},g' \
 	        -e 's,$${CUSTOMHELPDIR},${CUSTOMHELPDIR},g' \
-	        -e 's,$${CALCRC},${CALCRC},g' < calc.man > calc.1
-	${Q} echo calc.man formed
+	        -e 's,$${CALCRC},${CALCRC},g' \
+	        -e 's,:\([/.~]\),:\\:\1,g' < calc.man > calc.1
+	${Q} echo calc.1 formed
 
 calc.usage: calc.1 ${MAKE_FILE}
 	${RM} -f $@
