From 36f055fad93735e0a8a93084f06e6251e97d14e8 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 16 Dec 2015 13:52:20 +0100
Subject: [PATCH] cli: document ip-tunnel connection type

---
 clients/cli/connections.c |  6 +++++-
 man/nmcli.1.in            | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index c24206edad..a1ec056c2c 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -429,13 +429,17 @@ usage_connection_add (void)
 	              "                  [pi yes|no]\n"
 	              "                  [vnet-hdr yes|no]\n"
 	              "                  [multi-queue yes|no]\n\n"
+	              "    ip-tunnel:    mode ipip,gre,sit,isatap,vti,ip6ip6,ipip6,ip6gre,vti6\n"
+	              "                  remote <remote endpoint IP>\n"
+	              "                  [local <local endpoint IP>]\n"
+	              "                  [dev <parent device (ifname or connection UUID)>]\n\n"
 	              "    macvlan:      dev <parent device (connection  UUID, ifname, or MAC)>\n"
 	              "                  mode vepa|bridge|private|passthru|source\n"
 	              "                  [tap yes|no]\n\n"
 	              "    vxlan:        id <VXLAN ID>\n"
 	              "                  remote <IP of multicast group or remote address>\n"
-	              "                  [dev <parent device (ifname or connection UUID)>]\n"
 	              "                  [local <source IP>]\n"
+	              "                  [dev <parent device (ifname or connection UUID)>]\n"
 	              "                  [source-port-min <0-65535>]\n"
 	              "                  [source-port-max <0-65535>]\n"
 	              "                  [destination-port <0-65535>]\n\n"
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index 57c4693328..f1a98dfb35 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -684,6 +684,18 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 .RE
 .RS
 .TP
+.B ip-tunnel:
+.IP "\fImode ipip,gre,sit,isatap,vti,ip6ip6,ipip6,ip6gre,vti6\fP" 42
+\(en tunnel mode
+.IP "\fIremote <remote endpoint IP>\fP" 42
+\(en IPv4 or IPv6 address of the remote tunnel endpoint
+.IP "\fI[local <local endpoint IP>]\fP" 42
+\(en IPv4 or IPv6 address of the local tunnel endpoint
+.IP "\fI[dev <parent device (ifname or connection UUID)>]\fP" 42
+\(en device to use for tunnel endpoint communication
+.RE
+.RS
+.TP
 .B macvlan:
 .IP "\fIdev <parent device (connection  UUID, ifname, or MAC)>\fP" 42
 \(en parent device this MACVLAN is on
@@ -699,6 +711,8 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 \(en VXLAN Network Identifer to use
 .IP "\fIremote <IP>\fP" 42
 \(en unicast destination IP address or multicast IP address to join
+.IP "\fI[dev <parent device (ifname or connection UUID)>]\fP" 42
+\(en device to use for tunnel endpoint communication
 .IP "\fI[local <IP>]\fP" 42
 \(en source IP address
 .IP "\fI[source-port-min <0-65535>]\fP" 42