add 'vti'/'vti6' tunnel modes to ip-tunnel manual page

* "vti" and "vti6" tunnel modes added to ip-tunnel.8 manual page
* Added "hoplimit" terminology for IPv6
* Corrected usage line
* Minor language fix
This commit is contained in:
Konstantin Shemyak 2015-08-29 21:36:32 +03:00 committed by Stephen Hemminger
parent 5d295bb8e1
commit 6eca32ec6f
1 changed files with 12 additions and 12 deletions

View File

@ -6,14 +6,12 @@ ip-tunnel - tunnel configuration
.ad l .ad l
.in +8 .in +8
.ti -8 .ti -8
.B ip .B ip tunnel help
.RI "[ " OPTIONS " ]"
.B tunnel
.RI " { " COMMAND " | "
.BR help " }"
.sp .sp
.ti -8 .ti -8
.BR "ip tunnel" " { " add " | " change " | " del " | " show " | " prl " }" .BR "ip "
.RI "[ " OPTIONS " ]"
.BR "tunnel" " { " add " | " change " | " del " | " show " | " prl " }"
.RI "[ " NAME " ]" .RI "[ " NAME " ]"
.br .br
.RB "[ " mode .RB "[ " mode
@ -29,7 +27,7 @@ ip-tunnel - tunnel configuration
.br .br
.RB "[ " encaplimit .RB "[ " encaplimit
.IR ELIM " ]" .IR ELIM " ]"
.RB "[ " ttl .RB "[ " ttl "|" hoplimit
.IR TTL " ]" .IR TTL " ]"
.br .br
.RB "[ " tos .RB "[ " tos
@ -50,7 +48,7 @@ ip-tunnel - tunnel configuration
.ti -8 .ti -8
.IR MODE " := " .IR MODE " := "
.RB " { " ipip " | " gre " | " sit " | " isatap " | " ip6ip6 " | " ipip6 " | " ip6gre " | " any " }" .RB " { " ipip " | " gre " | " sit " | " isatap " | " vti " | " ip6ip6 " | " ipip6 " | " ip6gre " | " vti6 " | " any " }"
.ti -8 .ti -8
.IR ADDR " := { " IP_ADDRESS " |" .IR ADDR " := { " IP_ADDRESS " |"
@ -107,10 +105,10 @@ select the tunnel device name.
set the tunnel mode. Available modes depend on the encapsulating address family. set the tunnel mode. Available modes depend on the encapsulating address family.
.br .br
Modes for IPv4 encapsulation available: Modes for IPv4 encapsulation available:
.BR ipip ", " sit ", " isatap " and " gre "." .BR ipip ", " sit ", " isatap ", " vti ", and " gre "."
.br .br
Modes for IPv6 encapsulation available: Modes for IPv6 encapsulation available:
.BR ip6ip6 ", " ipip6 ", " ip6gre ", and " any "." .BR ip6ip6 ", " ipip6 ", " ip6gre ", " vti6 ", and " any "."
.TP .TP
.BI remote " ADDRESS" .BI remote " ADDRESS"
@ -123,7 +121,9 @@ It must be an address on another interface of this host.
.TP .TP
.BI ttl " N" .BI ttl " N"
set a fixed TTL .TP
.BI hoplimit " N"
set a fixed TTL (IPv4) or hoplimit (IPv6)
.I N .I N
on tunneled packets. on tunneled packets.
.I N .I N
@ -218,7 +218,7 @@ The
.B seq .B seq
flag is equivalent to the combination flag is equivalent to the combination
.BR "iseq oseq" . .BR "iseq oseq" .
.B It isn't work. Don't use it. .B It doesn't work. Don't use it.
.TP .TP
.BI encaplim " ELIM" .BI encaplim " ELIM"