|
 |
049c96 |
From be5c5dc145c7e7f4e8e8e3731c9cb9cc43cbb52c Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Wed, 1 Jun 2016 00:49:32 +0200
|
|
|
049c96 |
Subject: [PATCH] man: ip, ip-link: Fix ip option location
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1251186
|
|
|
049c96 |
Upstream Status: iproute2.git commit 134080cff35e3
|
|
|
049c96 |
Conflicts: Context changes in ip-link.8.in due to missing other
|
|
|
049c96 |
features.
|
|
|
049c96 |
|
|
|
049c96 |
commit 134080cff35e379cac81d47ec669d265c56d528d
|
|
|
049c96 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Date: Mon May 30 20:46:27 2016 +0200
|
|
|
049c96 |
|
|
|
049c96 |
man: ip, ip-link: Fix ip option location
|
|
|
049c96 |
|
|
|
049c96 |
This patch drops the redundant description of some of ip's options in
|
|
|
049c96 |
ip-link.8's description of the 'show' subcommand, preserving the
|
|
|
049c96 |
description of -iec (but appending it to the list in ip.8 with minor
|
|
|
049c96 |
fixes).
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-link.8.in | 20 --------------------
|
|
|
049c96 |
man/man8/ip.8 | 4 ++++
|
|
|
049c96 |
2 files changed, 4 insertions(+), 20 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index e8dccbd..744a8af 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -915,26 +915,6 @@ specifies what group of devices to show.
|
|
|
049c96 |
.B up
|
|
|
049c96 |
only display running interfaces.
|
|
|
049c96 |
|
|
|
049c96 |
-.TP
|
|
|
049c96 |
-The show command has additional formatting options:
|
|
|
049c96 |
-
|
|
|
049c96 |
-.RS
|
|
|
049c96 |
-.TP
|
|
|
049c96 |
-.BR "\-s" , " \-stats", " \-statistics"
|
|
|
049c96 |
-output more statistics about packet usage.
|
|
|
049c96 |
-
|
|
|
049c96 |
-.TP
|
|
|
049c96 |
-.BR "\-d", " \-details"
|
|
|
049c96 |
-output more detailed information.
|
|
|
049c96 |
-
|
|
|
049c96 |
-.TP
|
|
|
049c96 |
-.BR "\-h", " \-human", " \-human-readable"
|
|
|
049c96 |
-output statistics with human readable values number followed by suffix
|
|
|
049c96 |
-
|
|
|
049c96 |
-.TP
|
|
|
049c96 |
-.BR "\-iec"
|
|
|
049c96 |
-print human readable rates in IEC units (ie. 1K = 1024).
|
|
|
049c96 |
-.RE
|
|
|
049c96 |
|
|
|
049c96 |
.SS ip link help - display help
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip.8 b/man/man8/ip.8
|
|
|
049c96 |
index a95264d..b1c0bc0 100644
|
|
|
049c96 |
--- a/man/man8/ip.8
|
|
|
049c96 |
+++ b/man/man8/ip.8
|
|
|
049c96 |
@@ -191,6 +191,10 @@ but use shorter format.
|
|
|
049c96 |
.BR "\-rc" , " \-rcvbuf" <SIZE>
|
|
|
049c96 |
Set the netlink socket receive buffer size, defaults to 1MB.
|
|
|
049c96 |
|
|
|
049c96 |
+.TP
|
|
|
049c96 |
+.BR "\-iec"
|
|
|
049c96 |
+print human readable rates in IEC units (e.g. 1Ki = 1024).
|
|
|
049c96 |
+
|
|
|
049c96 |
.SH IP - COMMAND SYNTAX
|
|
|
049c96 |
|
|
|
049c96 |
.SS
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|