"bug" #1013: from Stephen Fisher

add the X --display command line parameter to the documentation

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18889 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/doc/wireshark.pod b/doc/wireshark.pod
index 55c9f349a6e0d80c992aa9efb262c65e0c5696ba..a8472e0210d7a964861f45ca54971c2af1ec6f3b 100644 (file)
--- a/doc/wireshark.pod
+++ b/doc/wireshark.pod
@@ -11,6 +11,7 @@ S<[ B<-b> E<lt>capture ring buffer optionE<gt> ] ...>
 S<[ B<-B> E<lt>capture buffer size (Win32 only)E<gt> ] >
 S<[ B<-c> E<lt>capture packet countE<gt> ]>
 S<[ B<-D> ]>
+S<[ B<--display=>E<lt>X display to useE<gt> ] >
 S<[ B<-f> E<lt>capture filterE<gt> ]>
 S<[ B<-g> E<lt>packet numberE<gt> ]>
 S<[ B<-h> ]>
@@ -245,6 +246,12 @@ network capture must be run from an account with special privileges (for
 example, as root), then, if B<Wireshark> is run with the B<-D> flag and
 is not run from such an account, it will not list any interfaces.
 
+=item --display=E<lt>X display to useE<gt>
+
+Specifies the X display to use.  A hostname and screen (otherhost:0.0)
+or just a screen (:0.0) can be specified.  This option is not available
+under Windows.
+
 =item -f  E<lt>capture filterE<gt>
 
 Set the capture filter expression.

diff --git a/gtk/main.c b/gtk/main.c
index 8430a6a7c9a929b549d59986cbd3237fe8d3463a..40d6d2bee3ffaf0d1e351255cdabcd89b8316ed0 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1234,6 +1234,9 @@ print_usage(gboolean print_ver) {
   fprintf(output, "  -h                       display this help and exit\n");
   fprintf(output, "  -v                       display version info and exit\n");
   fprintf(output, "  -o <name>:<value> ...    override preference or recent setting\n");
+#ifndef _WIN32
+  fprintf(output, "  --display=DISPLAY        X display to use\n");
+#endif
 
 #ifdef _WIN32
   destroy_console();