diff options
| -rw-r--r-- | docbook/Makefile.common | 17 | ||||
| -rw-r--r-- | docbook/user-guide.xml | 1 | ||||
| -rw-r--r-- | docbook/wsug_graphics/ws-capture-interfaces-win32.png | bin | 0 -> 21994 bytes | |||
| -rw-r--r-- | docbook/wsug_graphics/ws-capture-interfaces.png | bin | 21994 -> 34828 bytes | |||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_capture.xml | 19 |
5 files changed, 31 insertions, 6 deletions
diff --git a/docbook/Makefile.common b/docbook/Makefile.common index 596a461c9f..1adb9cb60e 100644 --- a/docbook/Makefile.common +++ b/docbook/Makefile.common @@ -28,6 +28,7 @@ WSUG_GRAPHICS = \ wsug_graphics/ws-bytes-pane.png \ wsug_graphics/ws-capture-info.png \ wsug_graphics/ws-capture-interfaces.png \ + wsug_graphics/ws-capture-interfaces-win32.png \ wsug_graphics/ws-capture-menu.png \ wsug_graphics/ws-capture-options.png \ wsug_graphics/ws-capture-preferences.png \ @@ -42,6 +43,10 @@ WSUG_GRAPHICS = \ wsug_graphics/ws-edit-color-rule-dialog.png \ wsug_graphics/ws-edit-menu.png \ wsug_graphics/ws-enabled-protocols.png \ + wsug_graphics/ws-expert-colored-tree.png \ + wsug_graphics/ws-expert-column.png \ + wsug_graphics/ws-expert-infos.png \ + wsug_graphics/ws-export-objects.png \ wsug_graphics/ws-export-pdml.png \ wsug_graphics/ws-export-plain.png \ wsug_graphics/ws-export-ps.png \ @@ -58,15 +63,18 @@ WSUG_GRAPHICS = \ wsug_graphics/ws-goto-packet.png \ wsug_graphics/ws-gui-colors-preferences.png \ wsug_graphics/ws-gui-columns-preferences.png \ + wsug_graphics/ws-gui-config-profiles.png \ wsug_graphics/ws-gui-font-preferences.png \ wsug_graphics/ws-gui-layout-preferences.png \ wsug_graphics/ws-gui-preferences.png \ wsug_graphics/ws-help-menu.png \ wsug_graphics/ws-list-pane.png \ + wsug_graphics/ws-logo.png \ wsug_graphics/ws-main-toolbar.png \ + wsug_graphics/ws-main.png \ wsug_graphics/ws-menu.png \ - wsug_graphics/ws-merge-gtk20.png \ - wsug_graphics/ws-merge-gtk24.png \ + wsug_graphics/ws-merge-gtk20.png \ + wsug_graphics/ws-merge-gtk24.png \ wsug_graphics/ws-merge-win32.png \ wsug_graphics/ws-nameresolution-preferences.png \ wsug_graphics/ws-open-gtk20.png \ @@ -90,6 +98,7 @@ WSUG_GRAPHICS = \ wsug_graphics/ws-stats-srt-dcerpc-filter.png \ wsug_graphics/ws-stats-srt-dcerpc.png \ wsug_graphics/ws-stats-summary.png \ + wsug_graphics/ws-stats-wlan-traffic.png \ wsug_graphics/ws-statusbar-empty.png \ wsug_graphics/ws-statusbar-loaded.png \ wsug_graphics/ws-statusbar-selected.png \ @@ -130,9 +139,7 @@ WSUG_GRAPHICS = \ wsug_graphics/toolbar/stock_top_24.png \ wsug_graphics/toolbar/stock_zoom_1_24.png \ wsug_graphics/toolbar/stock_zoom_in_24.png \ - wsug_graphics/toolbar/stock_zoom_out_24.png \ - wsug_graphics/ws-logo.png \ - wsug_graphics/ws-main.png + wsug_graphics/toolbar/stock_zoom_out_24.png WSDG_FILES = \ wsdg_src/WSDG_chapter_build_intro.xml \ diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml index d386186e36..d8cc810a17 100644 --- a/docbook/user-guide.xml +++ b/docbook/user-guide.xml @@ -196,6 +196,7 @@ FILE SECTION <!ENTITY WiresharkFilterAddExpression SYSTEM "./wsug_graphics/ws-filter-add-expression.png" NDATA PNG> <!ENTITY WiresharkFilters2 SYSTEM "./wsug_graphics/ws-filters-2.png" NDATA PNG> <!ENTITY WiresharkCaptureInterfacesDialog SYSTEM "./wsug_graphics/ws-capture-interfaces.png" NDATA PNG> + <!ENTITY WiresharkCaptureInterfacesDialogWin32 SYSTEM "./wsug_graphics/ws-capture-interfaces-win32.png" NDATA PNG> <!ENTITY WiresharkCaptureOptionsDialog SYSTEM "./wsug_graphics/ws-capture-options.png" NDATA PNG> <!ENTITY WiresharkCaptureInfoDialog SYSTEM "./wsug_graphics/ws-capture-info.png" NDATA PNG> <!ENTITY WiresharkTimeReference SYSTEM "./wsug_graphics/ws-time-reference.png" NDATA PNG> diff --git a/docbook/wsug_graphics/ws-capture-interfaces-win32.png b/docbook/wsug_graphics/ws-capture-interfaces-win32.png Binary files differnew file mode 100644 index 0000000000..61dade10ca --- /dev/null +++ b/docbook/wsug_graphics/ws-capture-interfaces-win32.png diff --git a/docbook/wsug_graphics/ws-capture-interfaces.png b/docbook/wsug_graphics/ws-capture-interfaces.png Binary files differindex 61dade10ca..bee87d1e9a 100644 --- a/docbook/wsug_graphics/ws-capture-interfaces.png +++ b/docbook/wsug_graphics/ws-capture-interfaces.png diff --git a/docbook/wsug_src/WSUG_chapter_capture.xml b/docbook/wsug_src/WSUG_chapter_capture.xml index c9e0e98417..4b23b07b51 100644 --- a/docbook/wsug_src/WSUG_chapter_capture.xml +++ b/docbook/wsug_src/WSUG_chapter_capture.xml @@ -102,6 +102,7 @@ You can get an overview of the available local interfaces using the "<inlinegraphic entityref="WiresharkToolbarCaptureInterfaces" format="PNG"/> Capture Interfaces" dialog box, see + <xref linkend="ChCapCaptureInterfacesDialogWin32"/> or <xref linkend="ChCapCaptureInterfacesDialog"/>. You can start a capture from this dialog box, using (one of) the "Capture" button(s). </para> @@ -143,6 +144,7 @@ wireshark -i eth0 -k <para> When you select "Interfaces..." from the Capture menu, Wireshark pops up the "Capture Interfaces" dialog box as shown in + <xref linkend="ChCapCaptureInterfacesDialogWin32"/> or <xref linkend="ChCapCaptureInterfacesDialog"/>. <warning><title>Warning!</title> <para> @@ -158,12 +160,27 @@ wireshark -i eth0 -k cannot detect the remote interfaces available, there could be more capture interfaces available than listed. </para> + <para> + Also note that this dialog box will not show interfaces marked as hidden + in the "Interface Options" preferences dialog. + </para> </note> + <figure id="ChCapCaptureInterfacesDialogWin32"> + <title>The "Capture Interfaces" dialog box on Win32</title> + <graphic entityref="WiresharkCaptureInterfacesDialogWin32" format="PNG"/> + </figure> <figure id="ChCapCaptureInterfacesDialog"> - <title>The "Capture Interfaces" dialog box</title> + <title>The "Capture Interfaces" dialog box on other than Win32</title> <graphic entityref="WiresharkCaptureInterfacesDialog" format="PNG"/> </figure> <variablelist> + <varlistentry><term><command>Device (not on Win32)</command></term> + <listitem> + <para> + The interface device name. + </para> + </listitem> + </varlistentry> <varlistentry><term><command>Description</command></term> <listitem> <para> |
