364356
--- tftp-hpa-5.2/tftp/main.c	2013-04-19 09:34:09.737410319 +0200
364356
+++ tftp-hpa-5.2/tftp/main.c	2013-04-19 09:42:53.559946374 +0200
364356
@@ -195,9 +195,11 @@
364356
 {
364356
     fprintf(stderr,
364356
 #ifdef HAVE_IPV6
364356
-            "Usage: %s [-4][-6][-v][-l][-m mode] [host [port]] [-c command]\n",
364356
+            "Usage: %s [-4][-6][-v][-V][-l][-m mode] [-R port:port] "
364356
+			"[host [port]] [-c command]\n",
364356
 #else
364356
-            "Usage: %s [-v][-l][-m mode] [host [port]] [-c command]\n",
364356
+            "Usage: %s [-v][-V][-l][-m mode] [-R port:port] "
364356
+			"[host [port]] [-c command]\n",
364356
 #endif
364356
             program);
364356
     exit(errcode);
364356
--- tftp-hpa-5.2/tftpd/tftpd.8.in	2012-11-20 09:43:46.000000000 +0100
364356
+++ tftp-hpa-5.2/tftpd/tftpd.8.in	2013-04-19 09:44:37.399057279 +0200
364356
@@ -155,7 +155,7 @@
364356
 .B utimeout
364356
 option is negotiated.  The default is 1000000 (1 second.)
364356
 .TP
364356
-\fB\-\-mapfile\fP \fIremap-file\fP, \fB\-m\fP \fIremap-file\fP
364356
+\fB\-\-map\-file\fP \fIremap-file\fP, \fB\-m\fP \fIremap-file\fP
364356
 Specify the use of filename remapping.  The
364356
 .I remap-file
364356
 is a file containing the remapping rules.  See the section on filename
68076c
@@ -243,7 +243,7 @@ option, but crash with an error if they
68076c
 accepted by the server.
68076c
 .SH "FILENAME REMAPPING"
68076c
 The
68076c
-.B \-\-mapfile
68076c
+.B \-\-map\-file
68076c
 option specifies a file which contains filename remapping rules.  Each
68076c
 non-comment line (comments begin with hash marks,
68076c
 .BR # )
68076c
@@ -395,7 +395,7 @@ flag is used to set up a chroot() enviro
68076c
 once a connection has been set up.
68076c
 .PP
68076c
 Finally, the filename remapping
68076c
-.RB ( \-\-mapfile
68076c
+.RB ( \-\-map\-file
68076c
 flag) support can be used to provide a limited amount of additional
68076c
 access control.
68076c
 .SH "CONFORMING TO"