|
 |
049c96 |
From b8c5594d2702d7df9dd291b6e06253ad5f4fc17e Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Mon, 7 Mar 2016 20:46:03 +0100
|
|
|
049c96 |
Subject: [PATCH] man: ip-*.8: drop any reference to generic ip options
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1251186
|
|
|
049c96 |
Upstream Status: iproute2.git commit e895ae0b31864
|
|
|
049c96 |
Conflicts: Missing support for -brief option.
|
|
|
049c96 |
|
|
|
049c96 |
commit e895ae0b31864df9f7dc16254d6dd2084f7bd523
|
|
|
049c96 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Date: Wed Mar 2 19:20:08 2016 +0100
|
|
|
049c96 |
|
|
|
049c96 |
man: ip-*.8: drop any reference to generic ip options
|
|
|
049c96 |
|
|
|
049c96 |
Listing generic 'ip' options in subcommand man pages is redundant and
|
|
|
049c96 |
error-prone, as they won't be kept in sync anyway. Since many other man
|
|
|
049c96 |
pages don't list them either, drop references to them in the remaining
|
|
|
049c96 |
ones.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-addrlabel.8 | 14 +-------------
|
|
|
049c96 |
man/man8/ip-link.8.in | 14 +-------------
|
|
|
049c96 |
man/man8/ip-monitor.8 | 4 +---
|
|
|
049c96 |
man/man8/ip-mroute.8 | 2 +-
|
|
|
049c96 |
4 files changed, 4 insertions(+), 30 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-addrlabel.8 b/man/man8/ip-addrlabel.8
|
|
|
049c96 |
index 51ef572..233d606 100644
|
|
|
049c96 |
--- a/man/man8/ip-addrlabel.8
|
|
|
049c96 |
+++ b/man/man8/ip-addrlabel.8
|
|
|
049c96 |
@@ -6,21 +6,9 @@ ip-addrlabel \- protocol address label management
|
|
|
049c96 |
.ad l
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.B ip
|
|
|
049c96 |
-.RI "[ " OPTIONS " ]"
|
|
|
049c96 |
-.B addrlabel
|
|
|
049c96 |
+.B ip addrlabel
|
|
|
049c96 |
.RI " { " COMMAND " | "
|
|
|
049c96 |
.BR help " }"
|
|
|
049c96 |
-.sp
|
|
|
049c96 |
-
|
|
|
049c96 |
-.ti -8
|
|
|
049c96 |
-.IR OPTIONS " := { "
|
|
|
049c96 |
-\fB\-V\fR[\fIersion\fR] |
|
|
|
049c96 |
-\fB\-s\fR[\fItatistics\fR] |
|
|
|
049c96 |
-\fB\-r\fR[\fIesolve\fR] |
|
|
|
049c96 |
-\fB\-f\fR[\fIamily\fR] {
|
|
|
049c96 |
-.BR inet " | " inet6 " | " ipx " | " dnet " | " link " } | "
|
|
|
049c96 |
-\fB\-o\fR[\fIneline\fR] }
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.BR "ip addrlabel" " { " add " | " del " } " prefix
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index 6ce2cc8..62fc340 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -6,24 +6,12 @@ ip-link \- network device configuration
|
|
|
049c96 |
.ad l
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.B ip
|
|
|
049c96 |
-.RI "[ " OPTIONS " ]"
|
|
|
049c96 |
-.B link
|
|
|
049c96 |
+.B ip link
|
|
|
049c96 |
.RI " { " COMMAND " | "
|
|
|
049c96 |
.BR help " }"
|
|
|
049c96 |
.sp
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.IR OPTIONS " := { "
|
|
|
049c96 |
-\fB\-V\fR[\fIersion\fR] |
|
|
|
049c96 |
-\fB\-h\fR[\fIuman-readable\fR] |
|
|
|
049c96 |
-\fB\-s\fR[\fItatistics\fR] |
|
|
|
049c96 |
-\fB\-r\fR[\fIesolve\fR] |
|
|
|
049c96 |
-\fB\-f\fR[\fIamily\fR] {
|
|
|
049c96 |
-.BR inet " | " inet6 " | " ipx " | " dnet " | " link " } | "
|
|
|
049c96 |
-\fB\-o\fR[\fIneline\fR] }
|
|
|
049c96 |
-
|
|
|
049c96 |
-.ti -8
|
|
|
049c96 |
.BI "ip link add"
|
|
|
049c96 |
.RB "[ " link
|
|
|
049c96 |
.IR DEVICE " ]"
|
|
|
049c96 |
diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8
|
|
|
049c96 |
index 2d4fd4f..5d99a09 100644
|
|
|
049c96 |
--- a/man/man8/ip-monitor.8
|
|
|
049c96 |
+++ b/man/man8/ip-monitor.8
|
|
|
049c96 |
@@ -6,9 +6,7 @@ ip-monitor, rtmon \- state monitoring
|
|
|
049c96 |
.ad l
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.BR "ip " " [ "
|
|
|
049c96 |
-.IR ip-OPTIONS " ]"
|
|
|
049c96 |
-.BR "monitor" " [ " all " |"
|
|
|
049c96 |
+.BR "ip monitor" " [ " all " |"
|
|
|
049c96 |
.IR OBJECT-LIST " ] ["
|
|
|
049c96 |
.BI file " FILENAME "
|
|
|
049c96 |
] [
|
|
|
049c96 |
diff --git a/man/man8/ip-mroute.8 b/man/man8/ip-mroute.8
|
|
|
049c96 |
index e89b6b2..b64e30d 100644
|
|
|
049c96 |
--- a/man/man8/ip-mroute.8
|
|
|
049c96 |
+++ b/man/man8/ip-mroute.8
|
|
|
049c96 |
@@ -6,7 +6,7 @@ ip-mroute \- multicast routing cache management
|
|
|
049c96 |
.ad l
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.BR "ip " " [ ip-OPTIONS ] " "mroute show" " [ [ "
|
|
|
049c96 |
+.BR "ip mroute show" " [ [ "
|
|
|
049c96 |
.BR " to " " ] "
|
|
|
049c96 |
.IR PREFIX " ] [ "
|
|
|
049c96 |
.B from
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|