|
 |
049c96 |
From 369be35cccd7c3cfba8bd76f06b98936a0ec6ffb Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Mon, 7 Mar 2016 20:44:25 +0100
|
|
|
049c96 |
Subject: [PATCH] man: ip-tunnel.8: Document missing 6rd action
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1251186
|
|
|
049c96 |
Upstream Status: iproute2.git commit 5d8cb0900e9fd
|
|
|
049c96 |
|
|
|
049c96 |
commit 5d8cb0900e9fd927a81a91c79434cbf847463078
|
|
|
049c96 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Date: Wed Mar 2 19:20:04 2016 +0100
|
|
|
049c96 |
|
|
|
049c96 |
man: ip-tunnel.8: Document missing 6rd action
|
|
|
049c96 |
|
|
|
049c96 |
Also drop the non-terminal 'TIME' description as it is not referenced
|
|
|
049c96 |
anywhere.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-tunnel.8 | 11 +++++++----
|
|
|
049c96 |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-tunnel.8 b/man/man8/ip-tunnel.8
|
|
|
049c96 |
index 8b746cb..4938c74 100644
|
|
|
049c96 |
--- a/man/man8/ip-tunnel.8
|
|
|
049c96 |
+++ b/man/man8/ip-tunnel.8
|
|
|
049c96 |
@@ -11,7 +11,7 @@ ip-tunnel - tunnel configuration
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.BR "ip "
|
|
|
049c96 |
.RI "[ " OPTIONS " ]"
|
|
|
049c96 |
-.BR "tunnel" " { " add " | " change " | " del " | " show " | " prl " }"
|
|
|
049c96 |
+.BR "tunnel" " { " add " | " change " | " del " | " show " | " prl " | " 6rd " }"
|
|
|
049c96 |
.RI "[ " NAME " ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
.RB "[ " mode
|
|
|
049c96 |
@@ -42,6 +42,12 @@ ip-tunnel - tunnel configuration
|
|
|
049c96 |
.B prl-delete
|
|
|
049c96 |
.IR ADDR " ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
+.RB "[ " 6rd-prefix
|
|
|
049c96 |
+.IR ADDR " ] ["
|
|
|
049c96 |
+.B 6rd-relay_prefix
|
|
|
049c96 |
+.IR ADDR " ] [
|
|
|
049c96 |
+.BR 6rd-reset " ]"
|
|
|
049c96 |
+.br
|
|
|
049c96 |
.RB "[ [" no "]" pmtudisc " ]"
|
|
|
049c96 |
.RB "[ " dev
|
|
|
049c96 |
.IR PHYS_DEV " ]"
|
|
|
049c96 |
@@ -75,9 +81,6 @@ ip-tunnel - tunnel configuration
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.IR KEY " := { " DOTTED_QUAD " | " NUMBER " }"
|
|
|
049c96 |
|
|
|
049c96 |
-.ti -8
|
|
|
049c96 |
-.IR TIME " := " NUMBER "[s|ms]"
|
|
|
049c96 |
-
|
|
|
049c96 |
.SH DESCRIPTION
|
|
|
049c96 |
.B tunnel
|
|
|
049c96 |
objects are tunnels, encapsulating packets in IP packets and then
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|