e38f15
diff -up mtr-0.85/mtr.8.docs mtr-0.85/mtr.8
e38f15
--- mtr-0.85/mtr.8.docs	2013-04-29 20:22:05.000000000 +0200
e38f15
+++ mtr-0.85/mtr.8	2013-10-04 15:26:58.852865628 +0200
e38f15
@@ -8,7 +8,7 @@ mtr \- a network diagnostic tool
e38f15
 .SH SYNOPSIS
e38f15
 .B mtr 
e38f15
 [\c
e38f15
-.B \-hvrctglspeniuTP46\c
e38f15
+.B \-BfhvrctglxspQemniuTP46\c
e38f15
 ]
e38f15
 [\c
e38f15
 .B \-\-help\c
e38f15
@@ -34,6 +34,9 @@ mtr \- a network diagnostic tool
e38f15
 [\c
e38f15
 .B \-\-raw\c
e38f15
 ]
e38f15
+[
e38f15
+.B \-\-xml\c
e38f15
+]
e38f15
 [\c
e38f15
 .B \-\-mpls\c
e38f15
 ]
e38f15
@@ -53,12 +56,27 @@ mtr \- a network diagnostic tool
e38f15
 .B \-\-interval\ SECONDS\c
e38f15
 ]
e38f15
 [\c
e38f15
+.B \-\-max-ttl\ NUM\c
e38f15
+]
e38f15
+[\c
e38f15
+.B \-\-first-ttl\ NUM\c
e38f15
+]
e38f15
+[\c
e38f15
+.B \-\-bitpattern\ NUM\c
e38f15
+]
e38f15
+[\c
e38f15
+.B \-\-tos\ NUM\c
e38f15
+]
e38f15
+[\c
e38f15
 .B \-\-psize\ BYTES | -s BYTES\c
e38f15
 ]
e38f15
 [\c
e38f15
 .B \-\-tcp\c
e38f15
 ]
e38f15
 [\c
e38f15
+.B \-\-udp\c
e38f15
+]
e38f15
+[\c
e38f15
 .B \-\-port\ PORT\c
e38f15
 ]
e38f15
 [\c
e38f15
@@ -270,13 +288,23 @@ to spit out a format that is suitable fo
e38f15
 .TP
e38f15
 .B \-\-raw
e38f15
 .br
e38f15
-Use this option to tell 
e38f15
-.B mtr 
e38f15
+Use this option to tell
e38f15
+.B mtr
e38f15
 to use the raw output format. This format is better suited for
e38f15
 archival of the measurement results. It could be parsed to 
e38f15
 be presented into any of the other display methods. 
e38f15
 
e38f15
 .TP
e38f15
+.B \-x
e38f15
+.TP
e38f15
+.B \-\-xml
e38f15
+.br
e38f15
+Use this option to tell
e38f15
+.B mtr
e38f15
+to use the xml output format. This format is better suited for
e38f15
+automated processing of the measurement results.
e38f15
+
e38f15
+.TP
e38f15
 .B \-a\ IP.ADD.RE.SS
e38f15
 .TP
e38f15
 .B \-\-address\ IP.ADD.RE.SS
e38f15
@@ -295,7 +323,39 @@ Use this option to specify the positive
e38f15
 ECHO requests.  The default value for this parameter is one second.
e38f15
 
e38f15
 .TP
e38f15
+.B \-m\ NUM
e38f15
+.TP
e38f15
+.B \-\-max-ttl\ NUM
e38f15
+.br
e38f15
+Specifies the maximum number of hops (max time-to-live value) traceroute will
e38f15
+probe. Default is 30.
e38f15
+
e38f15
+.TP
e38f15
+.B \-f\ NUM
e38f15
+.TP
e38f15
+.B \-\-first-ttl\ NUM
e38f15
+.br
e38f15
+Specifies with what TTL to start. Defaults to 1.
e38f15
+
e38f15
+.TP
e38f15
+.B \-B\ NUM
e38f15
+.TP
e38f15
+.B \-\-bitpattern\ NUM
e38f15
+.br
e38f15
+Specifies bit pattern to use in payload. Should be within range 0 - 255.
e38f15
+
e38f15
+.TP
e38f15
+.B \-Q\ NUM
e38f15
+.TP
e38f15
+.B \-\-tos\ NUM
e38f15
+.br
e38f15
+Specifies value for type of service field in IP header. Should be within range 0
e38f15
+- 255.
e38f15
+
e38f15
+.TP
e38f15
 .B \-u
e38f15
+.TP
e38f15
+.B \-\-udp
e38f15
 .br
e38f15
 Use UDP datagrams instead of ICMP ECHO.
e38f15
 
e38f15
diff -up mtr-0.85/mtr.c.docs mtr-0.85/mtr.c
e38f15
--- mtr-0.85/mtr.c.docs	2013-10-04 15:26:58.852865628 +0200
e38f15
+++ mtr-0.85/mtr.c	2013-10-04 15:30:42.934859098 +0200
e38f15
@@ -567,16 +567,17 @@ int main(int argc, char **argv)
e38f15
   }
e38f15
 
e38f15
   if (PrintHelp) {
e38f15
-    printf("usage: %s [-hvrwctglspniuT46] [--help] [--version] [--report]\n"
e38f15
+    printf("usage: %s [-BfhvrwctglxspQomniuT46] [--help] [--version] [--report]\n"
e38f15
 	   "\t\t[--report-wide] [--report-cycles=COUNT] [--curses] [--gtk]\n"
e38f15
-           "\t\t[--csv|-C] [--raw] [--split] [--mpls] [--no-dns] [--show-ips]\n"
e38f15
+           "\t\t[--csv|-C] [--raw] [--xml] [--split] [--mpls] [--no-dns] [--show-ips]\n"
e38f15
            "\t\t[--address interface] [--filename=FILE|-F]\n" /* BL */
e38f15
 #ifndef NO_IPINFO
e38f15
            "\t\t[--ipinfo=item_no|-y item_no]\n"
e38f15
            "\t\t[--aslookup|-z]\n"
e38f15
 #endif
e38f15
-           "\t\t[--psize=bytes/-s bytes]\n"            /* ok */
e38f15
-           "\t\t[--report-wide|-w] [-u|-T] [--port=PORT] [--timeout=SECONDS]\n"            /* rew */
e38f15
+           "\t\t[--psize=bytes/-s bytes] [--order fields]\n"            /* ok */
e38f15
+           "\t\t[--report-wide|-w] [--inet] [--inet6] [--max-ttl=NUM] [--first-ttl=NUM]\n"
e38f15
+           "\t\t[--bitpattern=NUM] [--tos=NUM] [--udp] [--tcp] [--port=PORT] [--timeout=SECONDS]\n"   /* rew */
e38f15
 	   "\t\t[--interval=SECONDS] HOSTNAME\n", argv[0]);
e38f15
     exit(0);
e38f15
   }