From 0da8a3dbd3786268d72ea96fe21340b5f9a9cd47 Mon Sep 17 00:00:00 2001
From: Jaap Keuter <jaap.keuter@xs4all.nl>
Date: Wed, 5 Dec 2018 16:43:45 +0100
Subject: [PATCH] Doc: add mentioning of ip link to get interfaces

With the introduction of the ip command (from iproute2) on modern
Linux systems it becomes common to see this tool available,
gradually replacing tools like netstat and ifconfig.

Change-Id: I1fb309e741c07c93271b61a35c4833d36bcc5cb8
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30924
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 doc/dumpcap.pod                                  | 2 +-
 doc/tshark.pod                                   | 2 +-
 doc/wireshark.pod.template                       | 2 +-
 docbook/wsug_src/WSUG_chapter_customize.asciidoc | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/dumpcap.pod b/doc/dumpcap.pod
index 664c75c0cf..7bf5c4a5d4 100644
--- a/doc/dumpcap.pod
+++ b/doc/dumpcap.pod
@@ -224,7 +224,7 @@ capture.
 Network interface names should match one of the names listed in
 "B<dumpcap -D>" (described above); a number, as reported by
 "B<dumpcap -D>", can also be used.  If you're using UNIX, "B<netstat
--i>" or "B<ifconfig -a>" might also work to list interface names,
+-i>", "B<ifconfig -a>" or "B<ip link>" might also work to list interface names,
 although not all versions of UNIX support the B<-a> option to B<ifconfig>.
 
 If no interface is specified, B<Dumpcap> searches the list of
diff --git a/doc/tshark.pod b/doc/tshark.pod
index 4ec88e21f9..5b69b4ed71 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -576,7 +576,7 @@ capture.
 Network interface names should match one of the names listed in
 "B<tshark -D>" (described above); a number, as reported by
 "B<tshark -D>", can also be used.  If you're using UNIX, "B<netstat
--i>" or "B<ifconfig -a>" might also work to list interface names,
+-i>", "B<ifconfig -a>" or "B<ip link>" might also work to list interface names,
 although not all versions of UNIX support the B<-a> option to B<ifconfig>.
 
 If no interface is specified, B<TShark> searches the list of
diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
index bb9064e1fb..900ef41a7a 100644
--- a/doc/wireshark.pod.template
+++ b/doc/wireshark.pod.template
@@ -407,7 +407,7 @@ capture.
 Network interface names should match one of the names listed in
 "B<wireshark -D>" (described above); a number, as reported by
 "B<wireshark -D>", can also be used.  If you're using UNIX, "B<netstat
--i>" or "B<ifconfig -a>" might also work to list interface names,
+-i>", "B<ifconfig -a>" or "B<ip link>" might also work to list interface names,
 although not all versions of UNIX support the B<-a> flag to B<ifconfig>.
 
 If no interface is specified, B<Wireshark> searches the list of
diff --git a/docbook/wsug_src/WSUG_chapter_customize.asciidoc b/docbook/wsug_src/WSUG_chapter_customize.asciidoc
index a7411c46fa..257afe3ab5 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_customize.asciidoc
@@ -223,7 +223,7 @@ Set the name of the network interface or pipe to use for live packet capture.
 +
 Network interface names should match one of the names listed in `wireshark -D`
 (described above). A number, as reported by `wireshark -D`, can also be used. If
-you’re using UNIX, `netstat -i` or `ifconfig -a` might also work to list
+you’re using UNIX, `netstat -i`, `ifconfig -a` or `ip link` might also work to list
 interface names, although not all versions of UNIX support the `-a` flag to
 `ifconfig`.
 +