aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docbook/Makefile158
-rw-r--r--docbook/developer-guide.xml6
-rw-r--r--docbook/user-guide.xml153
-rw-r--r--docbook/wsdg_graphics/ethereal-capture-sync.diabin2849 -> 0 bytes
-rw-r--r--docbook/wsdg_graphics/ethereal-capture-sync.pngbin30006 -> 0 bytes
-rw-r--r--docbook/wsdg_graphics/ethereal-function-blocks.diabin2387 -> 0 bytes
-rw-r--r--docbook/wsdg_graphics/ethereal-function-blocks.pngbin13195 -> 0 bytes
-rw-r--r--docbook/wsdg_graphics/ws-capture-sync.diabin0 -> 2943 bytes
-rw-r--r--docbook/wsdg_graphics/ws-capture-sync.pngbin0 -> 11009 bytes
-rw-r--r--docbook/wsdg_graphics/ws-capture_internals.dia (renamed from docbook/wsdg_graphics/ethereal-capture_internals.dia)bin2149 -> 2149 bytes
-rw-r--r--docbook/wsdg_graphics/ws-capture_internals.png (renamed from docbook/wsdg_graphics/ethereal-capture_internals.png)bin10274 -> 10274 bytes
-rw-r--r--docbook/wsdg_graphics/ws-function-blocks.diabin0 -> 2433 bytes
-rw-r--r--docbook/wsdg_graphics/ws-function-blocks.pngbin0 -> 7899 bytes
-rw-r--r--docbook/wsdg_graphics/ws-logo.png (renamed from docbook/wsdg_graphics/wireshark-logo.png)bin4538 -> 4538 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-3pane.pngbin42297 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-analyze-menu.pngbin41011 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-bytes-pane-popup-menu.pngbin41123 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-capture-info.pngbin13620 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-capture-interfaces.pngbin13250 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-capture-menu.pngbin53218 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-capture-options.pngbin34406 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-capture-preferences.pngbin18737 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-choose-color-rule.pngbin24150 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-coloring-rules-dialog.pngbin29419 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-decode-as-show.pngbin9849 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-decode-as.pngbin17837 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-details-pane-popup-menu.pngbin44386 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-display-filter-tcp.pngbin43993 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-edit-color-rule-dialog.pngbin11799 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-edit-menu.pngbin50838 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-empty.pngbin30780 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-enabled-protocols.pngbin23801 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-error-file-exists.pngbin9545 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-error-open.pngbin9721 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-file-menu.pngbin50597 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-file-set-dialog.pngbin24093 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-filter-add-expression.pngbin18242 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-filters-2.pngbin18471 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-filters.pngbin18823 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-find-packet.pngbin15251 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-follow-stream.pngbin20535 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-go-menu.pngbin47822 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-goto-packet.pngbin8729 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-gui-colors-preferences.pngbin27271 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-gui-columns-preferences.pngbin22568 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-gui-font-preferences.pngbin22112 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-gui-layout-preferences.pngbin19954 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-gui-preferences.pngbin27348 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-help-menu.pngbin44689 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-nameresolution-preferences.pngbin16281 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-packet-pane-popup-menu.pngbin50362 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-packet-selected.pngbin42952 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-packet-sep-win.pngbin16315 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-print.pngbin21437 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-printing-preferences.pngbin17274 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-statistics-menu.pngbin50952 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-stats-conversations.pngbin20452 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-stats-endpoints.pngbin18514 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-stats-hierarchy.pngbin21248 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-stats-iographs.pngbin26403 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-stats-srt-dcerpc-filter.pngbin12492 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-stats-srt-dcerpc.pngbin14468 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-stats-summary.pngbin14651 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-time-reference.pngbin54713 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ethereal-view-menu.pngbin44061 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/toolbar/stock_apply_20.pngbin0 -> 452 bytes
-rw-r--r--docbook/wsug_graphics/toolbar/stock_clear_24.pngbin0 -> 791 bytes
-rw-r--r--docbook/wsug_graphics/wireshark-main.pngbin50535 -> 0 bytes
-rw-r--r--docbook/wsug_graphics/ws-analyze-menu.pngbin0 -> 52256 bytes
-rw-r--r--docbook/wsug_graphics/ws-bytes-pane-popup-menu.pngbin0 -> 50731 bytes
-rw-r--r--docbook/wsug_graphics/ws-bytes-pane-tabs.png (renamed from docbook/wsug_graphics/ethereal-bytes-pane-tabs.png)bin4755 -> 4755 bytes
-rw-r--r--docbook/wsug_graphics/ws-bytes-pane.png (renamed from docbook/wsug_graphics/ethereal-bytes-pane.png)bin1418 -> 1418 bytes
-rw-r--r--docbook/wsug_graphics/ws-capture-info.pngbin0 -> 15715 bytes
-rw-r--r--docbook/wsug_graphics/ws-capture-interfaces.pngbin0 -> 21994 bytes
-rw-r--r--docbook/wsug_graphics/ws-capture-menu.pngbin0 -> 55844 bytes
-rw-r--r--docbook/wsug_graphics/ws-capture-options.pngbin0 -> 32946 bytes
-rw-r--r--docbook/wsug_graphics/ws-capture-preferences.pngbin0 -> 20495 bytes
-rw-r--r--docbook/wsug_graphics/ws-choose-color-rule.pngbin0 -> 24226 bytes
-rw-r--r--docbook/wsug_graphics/ws-coloring-fields.pngbin0 -> 78412 bytes
-rw-r--r--docbook/wsug_graphics/ws-coloring-rules-dialog.pngbin0 -> 29989 bytes
-rw-r--r--docbook/wsug_graphics/ws-decode-as-show.pngbin0 -> 12520 bytes
-rw-r--r--docbook/wsug_graphics/ws-decode-as.pngbin0 -> 19381 bytes
-rw-r--r--docbook/wsug_graphics/ws-details-pane-popup-menu.pngbin0 -> 53525 bytes
-rw-r--r--docbook/wsug_graphics/ws-details-pane.png (renamed from docbook/wsug_graphics/ethereal-details-pane.png)bin3130 -> 3130 bytes
-rw-r--r--docbook/wsug_graphics/ws-display-filter-tcp.pngbin0 -> 52181 bytes
-rw-r--r--docbook/wsug_graphics/ws-edit-color-rule-dialog.pngbin0 -> 12135 bytes
-rw-r--r--docbook/wsug_graphics/ws-edit-menu.pngbin0 -> 52318 bytes
-rw-r--r--docbook/wsug_graphics/ws-enabled-protocols.pngbin0 -> 25914 bytes
-rw-r--r--docbook/wsug_graphics/ws-export-pdml.png (renamed from docbook/wsug_graphics/ethereal-export-pdml.png)bin15797 -> 15797 bytes
-rw-r--r--docbook/wsug_graphics/ws-export-plain.png (renamed from docbook/wsug_graphics/ethereal-export-plain.png)bin19771 -> 19771 bytes
-rw-r--r--docbook/wsug_graphics/ws-export-ps.png (renamed from docbook/wsug_graphics/ethereal-export-ps.png)bin20782 -> 20782 bytes
-rw-r--r--docbook/wsug_graphics/ws-export-psml.png (renamed from docbook/wsug_graphics/ethereal-export-psml.png)bin15939 -> 15939 bytes
-rw-r--r--docbook/wsug_graphics/ws-export-selected.png (renamed from docbook/wsug_graphics/ethereal-export-selected.png)bin12686 -> 12686 bytes
-rw-r--r--docbook/wsug_graphics/ws-file-menu.pngbin0 -> 53076 bytes
-rw-r--r--docbook/wsug_graphics/ws-file-set-dialog.pngbin0 -> 30727 bytes
-rw-r--r--docbook/wsug_graphics/ws-filter-add-expression.pngbin0 -> 18424 bytes
-rw-r--r--docbook/wsug_graphics/ws-filter-toolbar.png (renamed from docbook/wsug_graphics/ethereal-filter-toolbar.png)bin3038 -> 3038 bytes
-rw-r--r--docbook/wsug_graphics/ws-filters.pngbin0 -> 19128 bytes
-rw-r--r--docbook/wsug_graphics/ws-find-packet.pngbin0 -> 16940 bytes
-rw-r--r--docbook/wsug_graphics/ws-follow-stream.pngbin0 -> 22976 bytes
-rw-r--r--docbook/wsug_graphics/ws-go-menu.pngbin0 -> 53210 bytes
-rw-r--r--docbook/wsug_graphics/ws-goto-packet.pngbin0 -> 10409 bytes
-rw-r--r--docbook/wsug_graphics/ws-gui-colors-preferences.pngbin0 -> 29170 bytes
-rw-r--r--docbook/wsug_graphics/ws-gui-columns-preferences.pngbin0 -> 24983 bytes
-rw-r--r--docbook/wsug_graphics/ws-gui-font-preferences.pngbin0 -> 23218 bytes
-rw-r--r--docbook/wsug_graphics/ws-gui-layout-preferences.pngbin0 -> 26868 bytes
-rw-r--r--docbook/wsug_graphics/ws-gui-preferences.pngbin0 -> 23286 bytes
-rw-r--r--docbook/wsug_graphics/ws-help-menu.pngbin0 -> 55769 bytes
-rw-r--r--docbook/wsug_graphics/ws-list-pane.png (renamed from docbook/wsug_graphics/ethereal-list-pane.png)bin17835 -> 17835 bytes
-rw-r--r--docbook/wsug_graphics/ws-logo.png (renamed from docbook/wsug_graphics/wireshark-logo.png)bin4538 -> 4538 bytes
-rw-r--r--docbook/wsug_graphics/ws-main-toolbar.png (renamed from docbook/wsug_graphics/ethereal-main-toolbar.png)bin15378 -> 15378 bytes
-rw-r--r--docbook/wsug_graphics/ws-main.pngbin0 -> 54584 bytes
-rw-r--r--docbook/wsug_graphics/ws-menu.png (renamed from docbook/wsug_graphics/ethereal-menu.png)bin751 -> 751 bytes
-rw-r--r--docbook/wsug_graphics/ws-merge.png (renamed from docbook/wsug_graphics/ethereal-merge.png)bin51299 -> 51299 bytes
-rw-r--r--docbook/wsug_graphics/ws-nameresolution-preferences.pngbin0 -> 17994 bytes
-rw-r--r--docbook/wsug_graphics/ws-open.png (renamed from docbook/wsug_graphics/ethereal-open.png)bin80621 -> 80621 bytes
-rw-r--r--docbook/wsug_graphics/ws-packet-format.png (renamed from docbook/wsug_graphics/ethereal-packet-format.png)bin3524 -> 3524 bytes
-rw-r--r--docbook/wsug_graphics/ws-packet-pane-popup-menu.pngbin0 -> 57142 bytes
-rw-r--r--docbook/wsug_graphics/ws-packet-range.png (renamed from docbook/wsug_graphics/ethereal-packet-range.png)bin5960 -> 5960 bytes
-rw-r--r--docbook/wsug_graphics/ws-packet-selected.pngbin0 -> 55139 bytes
-rw-r--r--docbook/wsug_graphics/ws-packet-sep-win.pngbin0 -> 20200 bytes
-rw-r--r--docbook/wsug_graphics/ws-print.pngbin0 -> 23051 bytes
-rw-r--r--docbook/wsug_graphics/ws-printing-preferences.pngbin0 -> 19138 bytes
-rw-r--r--docbook/wsug_graphics/ws-save-as.png (renamed from docbook/wsug_graphics/ethereal-save-as.png)bin18426 -> 18426 bytes
-rw-r--r--docbook/wsug_graphics/ws-statistics-menu.pngbin0 -> 62560 bytes
-rw-r--r--docbook/wsug_graphics/ws-stats-conversations.pngbin0 -> 22088 bytes
-rw-r--r--docbook/wsug_graphics/ws-stats-endpoints.pngbin0 -> 20431 bytes
-rw-r--r--docbook/wsug_graphics/ws-stats-hierarchy.pngbin0 -> 20951 bytes
-rw-r--r--docbook/wsug_graphics/ws-stats-iographs.pngbin0 -> 27938 bytes
-rw-r--r--docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.pngbin0 -> 12473 bytes
-rw-r--r--docbook/wsug_graphics/ws-stats-srt-dcerpc.pngbin0 -> 13019 bytes
-rw-r--r--docbook/wsug_graphics/ws-stats-summary.pngbin0 -> 16584 bytes
-rw-r--r--docbook/wsug_graphics/ws-statusbar-empty.png (renamed from docbook/wsug_graphics/ethereal-statusbar-empty.png)bin775 -> 775 bytes
-rw-r--r--docbook/wsug_graphics/ws-statusbar-loaded.png (renamed from docbook/wsug_graphics/ethereal-statusbar-loaded.png)bin843 -> 843 bytes
-rw-r--r--docbook/wsug_graphics/ws-statusbar-selected.png (renamed from docbook/wsug_graphics/ethereal-statusbar-selected.png)bin883 -> 883 bytes
-rw-r--r--docbook/wsug_graphics/ws-time-reference.pngbin0 -> 54912 bytes
-rw-r--r--docbook/wsug_graphics/ws-view-menu.pngbin0 -> 53853 bytes
-rw-r--r--docbook/wsug_src/WSUG_chapter_capture.xml11
-rw-r--r--docbook/wsug_src/WSUG_chapter_customize.xml7
-rw-r--r--docbook/wsug_src/WSUG_chapter_use.xml175
-rw-r--r--docbook/wsug_src/WSUG_chapter_work.xml84
141 files changed, 370 insertions, 224 deletions
diff --git a/docbook/Makefile b/docbook/Makefile
index 6b480f80ac..364b17e26c 100644
--- a/docbook/Makefile
+++ b/docbook/Makefile
@@ -70,77 +70,73 @@ WSUG_FILES = \
wsug_src/WSUG_preface.xml
WSUG_GRAPHICS = \
- wsug_graphics/ethereal-3pane.png \
- wsug_graphics/ethereal-analyze-menu.png \
- wsug_graphics/ethereal-bytes-pane-popup-menu.png \
- wsug_graphics/ethereal-bytes-pane-tabs.png \
- wsug_graphics/ethereal-bytes-pane.png \
- wsug_graphics/ethereal-capture-info.png \
- wsug_graphics/ethereal-capture-interfaces.png \
- wsug_graphics/ethereal-capture-menu.png \
- wsug_graphics/ethereal-capture-options.png \
- wsug_graphics/ethereal-capture-preferences.png \
- wsug_graphics/ethereal-choose-color-rule.png \
- wsug_graphics/ethereal-coloring-rules-dialog.png \
- wsug_graphics/ethereal-decode-as-show.png \
- wsug_graphics/ethereal-decode-as.png \
- wsug_graphics/ethereal-details-pane-popup-menu.png \
- wsug_graphics/ethereal-details-pane.png \
- wsug_graphics/ethereal-display-filter-tcp.png \
- wsug_graphics/ethereal-edit-color-rule-dialog.png \
- wsug_graphics/ethereal-edit-menu.png \
- wsug_graphics/ethereal-empty.png \
- wsug_graphics/ethereal-enabled-protocols.png \
- wsug_graphics/ethereal-error-file-exists.png \
- wsug_graphics/ethereal-error-open.png \
- wsug_graphics/ethereal-export-pdml.png \
- wsug_graphics/ethereal-export-plain.png \
- wsug_graphics/ethereal-export-ps.png \
- wsug_graphics/ethereal-export-psml.png \
- wsug_graphics/ethereal-export-selected.png \
- wsug_graphics/ethereal-file-menu.png \
- wsug_graphics/ethereal-file-set-dialog.png \
- wsug_graphics/ethereal-filter-add-expression.png \
- wsug_graphics/ethereal-filter-toolbar.png \
- wsug_graphics/ethereal-filters-2.png \
- wsug_graphics/ethereal-filters.png \
- wsug_graphics/ethereal-find-packet.png \
- wsug_graphics/ethereal-follow-stream.png \
- wsug_graphics/ethereal-go-menu.png \
- wsug_graphics/ethereal-goto-packet.png \
- wsug_graphics/ethereal-gui-colors-preferences.png \
- wsug_graphics/ethereal-gui-columns-preferences.png \
- wsug_graphics/ethereal-gui-font-preferences.png \
- wsug_graphics/ethereal-gui-layout-preferences.png \
- wsug_graphics/ethereal-gui-preferences.png \
- wsug_graphics/ethereal-help-menu.png \
- wsug_graphics/ethereal-list-pane.png \
- wsug_graphics/ethereal-main-toolbar.png \
- wsug_graphics/ethereal-menu.png \
- wsug_graphics/ethereal-merge.png \
- wsug_graphics/ethereal-nameresolution-preferences.png \
- wsug_graphics/ethereal-open.png \
- wsug_graphics/ethereal-packet-format.png \
- wsug_graphics/ethereal-packet-pane-popup-menu.png \
- wsug_graphics/ethereal-packet-range.png \
- wsug_graphics/ethereal-packet-selected.png \
- wsug_graphics/ethereal-packet-sep-win.png \
- wsug_graphics/ethereal-print.png \
- wsug_graphics/ethereal-printing-preferences.png \
- wsug_graphics/ethereal-save-as.png \
- wsug_graphics/ethereal-statistics-menu.png \
- wsug_graphics/ethereal-stats-conversations.png \
- wsug_graphics/ethereal-stats-endpoints.png \
- wsug_graphics/ethereal-stats-hierarchy.png \
- wsug_graphics/ethereal-stats-iographs.png \
- wsug_graphics/ethereal-stats-srt-dcerpc-filter.png \
- wsug_graphics/ethereal-stats-srt-dcerpc.png \
- wsug_graphics/ethereal-stats-summary.png \
- wsug_graphics/ethereal-statusbar-empty.png \
- wsug_graphics/ethereal-statusbar-loaded.png \
- wsug_graphics/ethereal-statusbar-selected.png \
- wsug_graphics/ethereal-time-reference.png \
- wsug_graphics/ethereal-view-menu.png \
+ wsug_graphics/ws-analyze-menu.png \
+ wsug_graphics/ws-bytes-pane-popup-menu.png \
+ wsug_graphics/ws-bytes-pane-tabs.png \
+ wsug_graphics/ws-bytes-pane.png \
+ wsug_graphics/ws-capture-info.png \
+ wsug_graphics/ws-capture-interfaces.png \
+ wsug_graphics/ws-capture-menu.png \
+ wsug_graphics/ws-capture-options.png \
+ wsug_graphics/ws-capture-preferences.png \
+ wsug_graphics/ws-choose-color-rule.png \
+ wsug_graphics/ws-coloring-fields.png \
+ wsug_graphics/ws-coloring-rules-dialog.png \
+ wsug_graphics/ws-decode-as-show.png \
+ wsug_graphics/ws-decode-as.png \
+ wsug_graphics/ws-details-pane-popup-menu.png \
+ wsug_graphics/ws-details-pane.png \
+ wsug_graphics/ws-display-filter-tcp.png \
+ wsug_graphics/ws-edit-color-rule-dialog.png \
+ wsug_graphics/ws-edit-menu.png \
+ wsug_graphics/ws-enabled-protocols.png \
+ wsug_graphics/ws-export-pdml.png \
+ wsug_graphics/ws-export-plain.png \
+ wsug_graphics/ws-export-ps.png \
+ wsug_graphics/ws-export-psml.png \
+ wsug_graphics/ws-export-selected.png \
+ wsug_graphics/ws-file-menu.png \
+ wsug_graphics/ws-file-set-dialog.png \
+ wsug_graphics/ws-filter-add-expression.png \
+ wsug_graphics/ws-filter-toolbar.png \
+ wsug_graphics/ws-filters.png \
+ wsug_graphics/ws-find-packet.png \
+ wsug_graphics/ws-follow-stream.png \
+ wsug_graphics/ws-go-menu.png \
+ wsug_graphics/ws-goto-packet.png \
+ wsug_graphics/ws-gui-colors-preferences.png \
+ wsug_graphics/ws-gui-columns-preferences.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-main-toolbar.png \
+ wsug_graphics/ws-menu.png \
+ wsug_graphics/ws-merge.png \
+ wsug_graphics/ws-nameresolution-preferences.png \
+ wsug_graphics/ws-open.png \
+ wsug_graphics/ws-packet-format.png \
+ wsug_graphics/ws-packet-pane-popup-menu.png \
+ wsug_graphics/ws-packet-range.png \
+ wsug_graphics/ws-packet-selected.png \
+ wsug_graphics/ws-packet-sep-win.png \
+ wsug_graphics/ws-print.png \
+ wsug_graphics/ws-printing-preferences.png \
+ wsug_graphics/ws-save-as.png \
+ wsug_graphics/ws-statistics-menu.png \
+ wsug_graphics/ws-stats-conversations.png \
+ wsug_graphics/ws-stats-endpoints.png \
+ wsug_graphics/ws-stats-hierarchy.png \
+ wsug_graphics/ws-stats-iographs.png \
+ wsug_graphics/ws-stats-srt-dcerpc-filter.png \
+ wsug_graphics/ws-stats-srt-dcerpc.png \
+ wsug_graphics/ws-stats-summary.png \
+ wsug_graphics/ws-statusbar-empty.png \
+ wsug_graphics/ws-statusbar-loaded.png \
+ wsug_graphics/ws-statusbar-selected.png \
+ wsug_graphics/ws-time-reference.png \
+ wsug_graphics/ws-view-menu.png \
wsug_graphics/note.png \
wsug_graphics/tip.png \
wsug_graphics/warning.png \
@@ -155,7 +151,9 @@ WSUG_GRAPHICS = \
wsug_graphics/toolbar/display_filter_24.png \
wsug_graphics/toolbar/resize_columns_24.png \
wsug_graphics/toolbar/stock_add_24.png \
+ wsug_graphics/toolbar/stock_apply_20.png \
wsug_graphics/toolbar/stock_bottom_24.png \
+ wsug_graphics/toolbar/stock_clear_24.png \
wsug_graphics/toolbar/stock_close_24.png \
wsug_graphics/toolbar/stock_colorselector_24.png \
wsug_graphics/toolbar/stock_help_24.png \
@@ -175,8 +173,8 @@ WSUG_GRAPHICS = \
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/wireshark-logo.png \
- wsug_graphics/wireshark-main.png
+ wsug_graphics/ws-logo.png \
+ wsug_graphics/ws-main.png
WSDG_FILES = \
wsdg_src/WSDG_chapter_build_intro.xml \
@@ -192,13 +190,13 @@ WSDG_FILES = \
wsdg_src/WSDG_preface.xml
WSDG_GRAPHICS = \
- wsdg_graphics/ethereal-capture-sync.dia \
- wsdg_graphics/ethereal-capture-sync.png \
- wsdg_graphics/ethereal-capture_internals.dia \
- wsdg_graphics/ethereal-capture_internals.png \
- wsdg_graphics/ethereal-function-blocks.dia \
- wsdg_graphics/ethereal-function-blocks.png \
- wsdg_graphics/wireshark-logo.png \
+ wsdg_graphics/ws-capture-sync.dia \
+ wsdg_graphics/ws-capture-sync.png \
+ wsdg_graphics/ws-capture_internals.dia \
+ wsdg_graphics/ws-capture_internals.png \
+ wsdg_graphics/ws-function-blocks.dia \
+ wsdg_graphics/ws-function-blocks.png \
+ wsdg_graphics/ws-logo.png \
wsdg_graphics/note.png \
wsdg_graphics/tip.png \
wsdg_graphics/warning.png
diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml
index aadc062186..e9cc4da7a4 100644
--- a/docbook/developer-guide.xml
+++ b/docbook/developer-guide.xml
@@ -45,7 +45,7 @@ DOCUMENT SECTION
<!--
Wireshark Info
-->
- <!ENTITY WiresharkCurrentVersion "0.99.0">
+ <!ENTITY WiresharkCurrentVersion "0.99.3">
<!ENTITY WiresharkWebSite "http://www.wireshark.org">
<!ENTITY WiresharkDownloadPage "&WiresharkWebSite;/download/">
<!ENTITY WiresharkAuthorsPage "http://anonsvn.wireshark.org/wireshark/trunk/AUTHORS">
@@ -68,8 +68,8 @@ FILE SECTION
<!-- These refer to graphics files and figures contained in the document -->
- <!ENTITY WiresharkLogo SYSTEM "./wsdg_graphics/wireshark-logo.png" NDATA PNG>
- <!ENTITY WiresharkFunctionBlocks SYSTEM "./wsdg_graphics/ethereal-function-blocks.png" NDATA PNG>
+ <!ENTITY WiresharkLogo SYSTEM "./wsdg_graphics/ws-logo.png" NDATA PNG>
+ <!ENTITY WiresharkFunctionBlocks SYSTEM "./wsdg_graphics/ws-function-blocks.png" NDATA PNG>
<!-- These are the actual files that make up the document -->
diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index 2d06cf98b9..453eb0c073 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -73,7 +73,7 @@ DOCUMENT SECTION
<!--
Wireshark Info
-->
- <!ENTITY WiresharkCurrentVersion "0.99.0">
+ <!ENTITY WiresharkCurrentVersion "0.99.3">
<!ENTITY WiresharkWebSite "http://www.wireshark.org">
<!ENTITY WiresharkUsersGuidePage "&WiresharkWebSite;/docs/#usersguide">
<!ENTITY WiresharkDownloadPage "&WiresharkWebSite;/download.html">
@@ -128,76 +128,77 @@ FILE SECTION
-->
<!-- These refer to graphics files and figures contained in the document -->
<!-- -->
- <!ENTITY WiresharkLogo SYSTEM "./wsug_graphics/wireshark-logo.png" NDATA PNG>
+ <!ENTITY WiresharkLogo SYSTEM "./wsug_graphics/ws-logo.png" NDATA PNG>
<!-- 1st Chapter -->
- <!ENTITY WiresharkMain1 SYSTEM "./wsug_graphics/wireshark-main.png" NDATA PNG>
+ <!ENTITY WiresharkMain1 SYSTEM "./wsug_graphics/ws-main.png" NDATA PNG>
<!-- 2nd Chapter -->
<!-- Third Chapter -->
- <!ENTITY WiresharkEmpty SYSTEM "./wsug_graphics/ethereal-empty.png" NDATA PNG>
- <!ENTITY WiresharkThreePane1 SYSTEM "./wsug_graphics/wireshark-main.png" NDATA PNG>
- <!ENTITY WiresharkMenuOnly SYSTEM "./wsug_graphics/ethereal-menu.png" NDATA PNG>
- <!ENTITY WiresharkMainToolbar SYSTEM "./wsug_graphics/ethereal-main-toolbar.png" NDATA PNG>
- <!ENTITY WiresharkFilterToolbar SYSTEM "./wsug_graphics/ethereal-filter-toolbar.png" NDATA PNG>
- <!ENTITY WiresharkListPane SYSTEM "./wsug_graphics/ethereal-list-pane.png" NDATA PNG>
- <!ENTITY WiresharkDetailsPane SYSTEM "./wsug_graphics/ethereal-details-pane.png" NDATA PNG>
- <!ENTITY WiresharkBytesPane SYSTEM "./wsug_graphics/ethereal-bytes-pane.png" NDATA PNG>
- <!ENTITY WiresharkBytesPaneTabs SYSTEM "./wsug_graphics/ethereal-bytes-pane-tabs.png" NDATA PNG>
- <!ENTITY WiresharkStatusbarEmpty SYSTEM "./wsug_graphics/ethereal-statusbar-empty.png" NDATA PNG>
- <!ENTITY WiresharkStatusbarLoaded SYSTEM "./wsug_graphics/ethereal-statusbar-loaded.png" NDATA PNG>
- <!ENTITY WiresharkStatusbarSelected SYSTEM "./wsug_graphics/ethereal-statusbar-selected.png" NDATA PNG>
- <!ENTITY WiresharkSaveAs SYSTEM "./wsug_graphics/ethereal-save-as.png" NDATA PNG>
- <!ENTITY WiresharkOpen SYSTEM "./wsug_graphics/ethereal-open.png" NDATA PNG>
- <!ENTITY WiresharkPacketSelected1 SYSTEM "./wsug_graphics/ethereal-packet-selected.png" NDATA PNG>
- <!ENTITY WiresharkPacketSepView SYSTEM "./wsug_graphics/ethereal-packet-sep-win.png" NDATA PNG>
- <!ENTITY WiresharkFilterTCP SYSTEM "./wsug_graphics/ethereal-display-filter-tcp.png" NDATA PNG>
- <!ENTITY WiresharkColoringRulesDialog SYSTEM "./wsug_graphics/ethereal-coloring-rules-dialog.png" NDATA PNG>
- <!ENTITY WiresharkEditColorDialog SYSTEM "./wsug_graphics/ethereal-edit-color-rule-dialog.png" NDATA PNG>
- <!ENTITY WiresharkChooseColorDialog SYSTEM "./wsug_graphics/ethereal-choose-color-rule.png" NDATA PNG>
- <!ENTITY WiresharkFollowStream SYSTEM "./wsug_graphics/ethereal-follow-stream.png" NDATA PNG>
- <!ENTITY WiresharkFindPacket SYSTEM "./wsug_graphics/ethereal-find-packet.png" NDATA PNG>
- <!ENTITY WiresharkGoToPacket SYSTEM "./wsug_graphics/ethereal-goto-packet.png" NDATA PNG>
- <!ENTITY WiresharkPrint SYSTEM "./wsug_graphics/ethereal-print.png" NDATA PNG>
- <!ENTITY WiresharkGUIPreferences SYSTEM "./wsug_graphics/ethereal-gui-preferences.png" NDATA PNG>
- <!ENTITY WiresharkGUILayoutPreferences SYSTEM "./wsug_graphics/ethereal-gui-layout-preferences.png" NDATA PNG>
- <!ENTITY WiresharkGUIColumnsPreferences SYSTEM "./wsug_graphics/ethereal-gui-columns-preferences.png" NDATA PNG>
- <!ENTITY WiresharkGUIFontPreferences SYSTEM "./wsug_graphics/ethereal-gui-font-preferences.png" NDATA PNG>
- <!ENTITY WiresharkGUIColorsPreferences SYSTEM "./wsug_graphics/ethereal-gui-colors-preferences.png" NDATA PNG>
- <!ENTITY WiresharkCapturePreferences SYSTEM "./wsug_graphics/ethereal-capture-preferences.png" NDATA PNG>
- <!ENTITY WiresharkPrintingPreferences SYSTEM "./wsug_graphics/ethereal-printing-preferences.png" NDATA PNG>
- <!ENTITY WiresharkNameResolutionPreferences SYSTEM "./wsug_graphics/ethereal-nameresolution-preferences.png" NDATA PNG>
- <!ENTITY WiresharkFilters SYSTEM "./wsug_graphics/ethereal-filters.png" NDATA PNG>
- <!ENTITY WiresharkFileMenu SYSTEM "./wsug_graphics/ethereal-file-menu.png" NDATA PNG>
- <!ENTITY WiresharkEditMenu SYSTEM "./wsug_graphics/ethereal-edit-menu.png" NDATA PNG>
- <!ENTITY WiresharkViewMenu SYSTEM "./wsug_graphics/ethereal-view-menu.png" NDATA PNG>
- <!ENTITY WiresharkGoMenu SYSTEM "./wsug_graphics/ethereal-go-menu.png" NDATA PNG>
- <!ENTITY WiresharkCaptureMenu SYSTEM "./wsug_graphics/ethereal-capture-menu.png" NDATA PNG>
- <!ENTITY WiresharkAnalyzeMenu SYSTEM "./wsug_graphics/ethereal-analyze-menu.png" NDATA PNG>
- <!ENTITY WiresharkStatisticsMenu SYSTEM "./wsug_graphics/ethereal-statistics-menu.png" NDATA PNG>
- <!ENTITY WiresharkHelpMenu SYSTEM "./wsug_graphics/ethereal-help-menu.png" NDATA PNG>
- <!ENTITY WiresharkPacketPanePopupMenu SYSTEM "./wsug_graphics/ethereal-packet-pane-popup-menu.png" NDATA PNG>
- <!ENTITY WiresharkDetailsPanePopupMenu SYSTEM "./wsug_graphics/ethereal-details-pane-popup-menu.png" NDATA PNG>
- <!ENTITY WiresharkBytesPanePopupMenu SYSTEM "./wsug_graphics/ethereal-bytes-pane-popup-menu.png" NDATA PNG>
- <!ENTITY WiresharkFilterAddExpression SYSTEM "./wsug_graphics/ethereal-filter-add-expression.png" NDATA PNG>
- <!ENTITY WiresharkFilters2 SYSTEM "./wsug_graphics/ethereal-filters-2.png" NDATA PNG>
- <!ENTITY WiresharkExportPlainDialog SYSTEM "./wsug_graphics/ethereal-export-plain.png" NDATA PNG>
- <!ENTITY WiresharkExportPSDialog SYSTEM "./wsug_graphics/ethereal-export-ps.png" NDATA PNG>
- <!ENTITY WiresharkExportPSMLDialog SYSTEM "./wsug_graphics/ethereal-export-psml.png" NDATA PNG>
- <!ENTITY WiresharkExportPDMLDialog SYSTEM "./wsug_graphics/ethereal-export-pdml.png" NDATA PNG>
- <!ENTITY WiresharkExportSelectedDialog SYSTEM "./wsug_graphics/ethereal-export-selected.png" NDATA PNG>
- <!ENTITY WiresharkCaptureInterfacesDialog SYSTEM "./wsug_graphics/ethereal-capture-interfaces.png" NDATA PNG>
- <!ENTITY WiresharkCaptureOptionsDialog SYSTEM "./wsug_graphics/ethereal-capture-options.png" NDATA PNG>
- <!ENTITY WiresharkCaptureInfoDialog SYSTEM "./wsug_graphics/ethereal-capture-info.png" NDATA PNG>
- <!ENTITY WiresharkMergeDialog SYSTEM "./wsug_graphics/ethereal-merge.png" NDATA PNG>
- <!ENTITY WiresharkPacketRangeFrame SYSTEM "./wsug_graphics/ethereal-packet-range.png" NDATA PNG>
- <!ENTITY WiresharkPacketFormatFrame SYSTEM "./wsug_graphics/ethereal-packet-format.png" NDATA PNG>
- <!ENTITY WiresharkTimeReference SYSTEM "./wsug_graphics/ethereal-time-reference.png" NDATA PNG>
- <!ENTITY WiresharkEnabledProtocols SYSTEM "./wsug_graphics/ethereal-enabled-protocols.png" NDATA PNG>
- <!ENTITY WiresharkDecodeAs SYSTEM "./wsug_graphics/ethereal-decode-as.png" NDATA PNG>
- <!ENTITY WiresharkDecodeAsShow SYSTEM "./wsug_graphics/ethereal-decode-as-show.png" NDATA PNG>
- <!ENTITY WiresharkFileSetDialog SYSTEM "./wsug_graphics/ethereal-file-set-dialog.png" NDATA PNG>
+ <!ENTITY WiresharkEmpty SYSTEM "./wsug_graphics/ws-empty.png" NDATA PNG>
+ <!ENTITY WiresharkThreePane1 SYSTEM "./wsug_graphics/ws-main.png" NDATA PNG>
+ <!ENTITY WiresharkMenuOnly SYSTEM "./wsug_graphics/ws-menu.png" NDATA PNG>
+ <!ENTITY WiresharkMainToolbar SYSTEM "./wsug_graphics/ws-main-toolbar.png" NDATA PNG>
+ <!ENTITY WiresharkFilterToolbar SYSTEM "./wsug_graphics/ws-filter-toolbar.png" NDATA PNG>
+ <!ENTITY WiresharkListPane SYSTEM "./wsug_graphics/ws-list-pane.png" NDATA PNG>
+ <!ENTITY WiresharkDetailsPane SYSTEM "./wsug_graphics/ws-details-pane.png" NDATA PNG>
+ <!ENTITY WiresharkBytesPane SYSTEM "./wsug_graphics/ws-bytes-pane.png" NDATA PNG>
+ <!ENTITY WiresharkBytesPaneTabs SYSTEM "./wsug_graphics/ws-bytes-pane-tabs.png" NDATA PNG>
+ <!ENTITY WiresharkStatusbarEmpty SYSTEM "./wsug_graphics/ws-statusbar-empty.png" NDATA PNG>
+ <!ENTITY WiresharkStatusbarLoaded SYSTEM "./wsug_graphics/ws-statusbar-loaded.png" NDATA PNG>
+ <!ENTITY WiresharkStatusbarSelected SYSTEM "./wsug_graphics/ws-statusbar-selected.png" NDATA PNG>
+ <!ENTITY WiresharkSaveAs SYSTEM "./wsug_graphics/ws-save-as.png" NDATA PNG>
+ <!ENTITY WiresharkOpen SYSTEM "./wsug_graphics/ws-open.png" NDATA PNG>
+ <!ENTITY WiresharkPacketSelected1 SYSTEM "./wsug_graphics/ws-packet-selected.png" NDATA PNG>
+ <!ENTITY WiresharkPacketSepView SYSTEM "./wsug_graphics/ws-packet-sep-win.png" NDATA PNG>
+ <!ENTITY WiresharkFilterTCP SYSTEM "./wsug_graphics/ws-display-filter-tcp.png" NDATA PNG>
+ <!ENTITY WiresharkColoringRulesDialog SYSTEM "./wsug_graphics/ws-coloring-rules-dialog.png" NDATA PNG>
+ <!ENTITY WiresharkColoringFields SYSTEM "./wsug_graphics/ws-coloring-fields.png" NDATA PNG>
+ <!ENTITY WiresharkEditColorDialog SYSTEM "./wsug_graphics/ws-edit-color-rule-dialog.png" NDATA PNG>
+ <!ENTITY WiresharkChooseColorDialog SYSTEM "./wsug_graphics/ws-choose-color-rule.png" NDATA PNG>
+ <!ENTITY WiresharkFollowStream SYSTEM "./wsug_graphics/ws-follow-stream.png" NDATA PNG>
+ <!ENTITY WiresharkFindPacket SYSTEM "./wsug_graphics/ws-find-packet.png" NDATA PNG>
+ <!ENTITY WiresharkGoToPacket SYSTEM "./wsug_graphics/ws-goto-packet.png" NDATA PNG>
+ <!ENTITY WiresharkPrint SYSTEM "./wsug_graphics/ws-print.png" NDATA PNG>
+ <!ENTITY WiresharkGUIPreferences SYSTEM "./wsug_graphics/ws-gui-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkGUILayoutPreferences SYSTEM "./wsug_graphics/ws-gui-layout-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkGUIColumnsPreferences SYSTEM "./wsug_graphics/ws-gui-columns-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkGUIFontPreferences SYSTEM "./wsug_graphics/ws-gui-font-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkGUIColorsPreferences SYSTEM "./wsug_graphics/ws-gui-colors-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkCapturePreferences SYSTEM "./wsug_graphics/ws-capture-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkPrintingPreferences SYSTEM "./wsug_graphics/ws-printing-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkNameResolutionPreferences SYSTEM "./wsug_graphics/ws-nameresolution-preferences.png" NDATA PNG>
+ <!ENTITY WiresharkFilters SYSTEM "./wsug_graphics/ws-filters.png" NDATA PNG>
+ <!ENTITY WiresharkFileMenu SYSTEM "./wsug_graphics/ws-file-menu.png" NDATA PNG>
+ <!ENTITY WiresharkEditMenu SYSTEM "./wsug_graphics/ws-edit-menu.png" NDATA PNG>
+ <!ENTITY WiresharkViewMenu SYSTEM "./wsug_graphics/ws-view-menu.png" NDATA PNG>
+ <!ENTITY WiresharkGoMenu SYSTEM "./wsug_graphics/ws-go-menu.png" NDATA PNG>
+ <!ENTITY WiresharkCaptureMenu SYSTEM "./wsug_graphics/ws-capture-menu.png" NDATA PNG>
+ <!ENTITY WiresharkAnalyzeMenu SYSTEM "./wsug_graphics/ws-analyze-menu.png" NDATA PNG>
+ <!ENTITY WiresharkStatisticsMenu SYSTEM "./wsug_graphics/ws-statistics-menu.png" NDATA PNG>
+ <!ENTITY WiresharkHelpMenu SYSTEM "./wsug_graphics/ws-help-menu.png" NDATA PNG>
+ <!ENTITY WiresharkPacketPanePopupMenu SYSTEM "./wsug_graphics/ws-packet-pane-popup-menu.png" NDATA PNG>
+ <!ENTITY WiresharkDetailsPanePopupMenu SYSTEM "./wsug_graphics/ws-details-pane-popup-menu.png" NDATA PNG>
+ <!ENTITY WiresharkBytesPanePopupMenu SYSTEM "./wsug_graphics/ws-bytes-pane-popup-menu.png" NDATA PNG>
+ <!ENTITY WiresharkFilterAddExpression SYSTEM "./wsug_graphics/ws-filter-add-expression.png" NDATA PNG>
+ <!ENTITY WiresharkFilters2 SYSTEM "./wsug_graphics/ws-filters-2.png" NDATA PNG>
+ <!ENTITY WiresharkExportPlainDialog SYSTEM "./wsug_graphics/ws-export-plain.png" NDATA PNG>
+ <!ENTITY WiresharkExportPSDialog SYSTEM "./wsug_graphics/ws-export-ps.png" NDATA PNG>
+ <!ENTITY WiresharkExportPSMLDialog SYSTEM "./wsug_graphics/ws-export-psml.png" NDATA PNG>
+ <!ENTITY WiresharkExportPDMLDialog SYSTEM "./wsug_graphics/ws-export-pdml.png" NDATA PNG>
+ <!ENTITY WiresharkExportSelectedDialog SYSTEM "./wsug_graphics/ws-export-selected.png" NDATA PNG>
+ <!ENTITY WiresharkCaptureInterfacesDialog SYSTEM "./wsug_graphics/ws-capture-interfaces.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 WiresharkMergeDialog SYSTEM "./wsug_graphics/ws-merge.png" NDATA PNG>
+ <!ENTITY WiresharkPacketRangeFrame SYSTEM "./wsug_graphics/ws-packet-range.png" NDATA PNG>
+ <!ENTITY WiresharkPacketFormatFrame SYSTEM "./wsug_graphics/ws-packet-format.png" NDATA PNG>
+ <!ENTITY WiresharkTimeReference SYSTEM "./wsug_graphics/ws-time-reference.png" NDATA PNG>
+ <!ENTITY WiresharkEnabledProtocols SYSTEM "./wsug_graphics/ws-enabled-protocols.png" NDATA PNG>
+ <!ENTITY WiresharkDecodeAs SYSTEM "./wsug_graphics/ws-decode-as.png" NDATA PNG>
+ <!ENTITY WiresharkDecodeAsShow SYSTEM "./wsug_graphics/ws-decode-as-show.png" NDATA PNG>
+ <!ENTITY WiresharkFileSetDialog SYSTEM "./wsug_graphics/ws-file-set-dialog.png" NDATA PNG>
<!-- Third Chapter Toolbar-->
<!ENTITY WiresharkToolbarCaptureInterfaces SYSTEM "./wsug_graphics/toolbar/capture_interfaces_24.png" NDATA PNG>
@@ -208,7 +209,9 @@ FILE SECTION
<!ENTITY WiresharkToolbarCaptureFilters SYSTEM "./wsug_graphics/toolbar/capture_filter_24.png" NDATA PNG>
<!ENTITY WiresharkToolbarDisplayFilters SYSTEM "./wsug_graphics/toolbar/display_filter_24.png" NDATA PNG>
<!ENTITY WiresharkToolbarAdd SYSTEM "./wsug_graphics/toolbar/stock_add_24.png" NDATA PNG>
+ <!ENTITY WiresharkToolbarApply SYSTEM "./wsug_graphics/toolbar/stock_apply_20.png" NDATA PNG>
<!ENTITY WiresharkToolbarGoLast SYSTEM "./wsug_graphics/toolbar/stock_bottom_24.png" NDATA PNG>
+ <!ENTITY WiresharkToolbarClear SYSTEM "./wsug_graphics/toolbar/stock_clear_24.png" NDATA PNG>
<!ENTITY WiresharkToolbarClose SYSTEM "./wsug_graphics/toolbar/stock_close_24.png" NDATA PNG>
<!ENTITY WiresharkToolbarColoringRules SYSTEM "./wsug_graphics/toolbar/stock_colorselector_24.png" NDATA PNG>
<!ENTITY WiresharkToolbarHelp SYSTEM "./wsug_graphics/toolbar/stock_help_24.png" NDATA PNG>
@@ -233,22 +236,22 @@ FILE SECTION
<!ENTITY WiresharkToolbarResizeColumns SYSTEM "./wsug_graphics/toolbar/resize_columns_24.png" NDATA PNG>
<!-- Third Chapter Statistics -->
- <!ENTITY WiresharkStatsSummary SYSTEM "./wsug_graphics/ethereal-stats-summary.png" NDATA PNG>
- <!ENTITY WiresharkStatsHierarchy SYSTEM "./wsug_graphics/ethereal-stats-hierarchy.png" NDATA PNG>
- <!ENTITY WiresharkStatsEndpoints SYSTEM "./wsug_graphics/ethereal-stats-endpoints.png" NDATA PNG>
- <!ENTITY WiresharkStatsConversations SYSTEM "./wsug_graphics/ethereal-stats-conversations.png" NDATA PNG>
- <!ENTITY WiresharkStatsIOGraphs SYSTEM "./wsug_graphics/ethereal-stats-iographs.png" NDATA PNG>
- <!ENTITY WiresharkStatsSrtDcerpcFilter SYSTEM "./wsug_graphics/ethereal-stats-srt-dcerpc-filter.png" NDATA PNG>
- <!ENTITY WiresharkStatsSrtDcerpc SYSTEM "./wsug_graphics/ethereal-stats-srt-dcerpc.png" NDATA PNG>
+ <!ENTITY WiresharkStatsSummary SYSTEM "./wsug_graphics/ws-stats-summary.png" NDATA PNG>
+ <!ENTITY WiresharkStatsHierarchy SYSTEM "./wsug_graphics/ws-stats-hierarchy.png" NDATA PNG>
+ <!ENTITY WiresharkStatsEndpoints SYSTEM "./wsug_graphics/ws-stats-endpoints.png" NDATA PNG>
+ <!ENTITY WiresharkStatsConversations SYSTEM "./wsug_graphics/ws-stats-conversations.png" NDATA PNG>
+ <!ENTITY WiresharkStatsIOGraphs SYSTEM "./wsug_graphics/ws-stats-iographs.png" NDATA PNG>
+ <!ENTITY WiresharkStatsSrtDcerpcFilter SYSTEM "./wsug_graphics/ws-stats-srt-dcerpc-filter.png" NDATA PNG>
+ <!ENTITY WiresharkStatsSrtDcerpc SYSTEM "./wsug_graphics/ws-stats-srt-dcerpc.png" NDATA PNG>
<!-- Fifth Chapter -->
<!-- Sixth Chapter -->
<!-- Appendices etc -->
- <!ENTITY WiresharkFormatError SYSTEM "./wsug_graphics/ethereal-error-open.png" NDATA PNG>
- <!ENTITY WiresharkFormatError SYSTEM "./wsug_graphics/ethereal-error-open.png" NDATA PNG>
- <!ENTITY WiresharkSaveError SYSTEM "./wsug_graphics/ethereal-save-error.png" NDATA PNG>
+ <!ENTITY WiresharkFormatError SYSTEM "./wsug_graphics/ws-error-open.png" NDATA PNG>
+ <!ENTITY WiresharkFormatError SYSTEM "./wsug_graphics/ws-error-open.png" NDATA PNG>
+ <!ENTITY WiresharkSaveError SYSTEM "./wsug_graphics/ws-save-error.png" NDATA PNG>
<!-- These are the actual files that make up the document -->
diff --git a/docbook/wsdg_graphics/ethereal-capture-sync.dia b/docbook/wsdg_graphics/ethereal-capture-sync.dia
deleted file mode 100644
index 32bdfbfb8c..0000000000
--- a/docbook/wsdg_graphics/ethereal-capture-sync.dia
+++ /dev/null
Binary files differ
diff --git a/docbook/wsdg_graphics/ethereal-capture-sync.png b/docbook/wsdg_graphics/ethereal-capture-sync.png
deleted file mode 100644
index ef7cb360a1..0000000000
--- a/docbook/wsdg_graphics/ethereal-capture-sync.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsdg_graphics/ethereal-function-blocks.dia b/docbook/wsdg_graphics/ethereal-function-blocks.dia
deleted file mode 100644
index 8c962e4034..0000000000
--- a/docbook/wsdg_graphics/ethereal-function-blocks.dia
+++ /dev/null
Binary files differ
diff --git a/docbook/wsdg_graphics/ethereal-function-blocks.png b/docbook/wsdg_graphics/ethereal-function-blocks.png
deleted file mode 100644
index 3eba0a074f..0000000000
--- a/docbook/wsdg_graphics/ethereal-function-blocks.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsdg_graphics/ws-capture-sync.dia b/docbook/wsdg_graphics/ws-capture-sync.dia
new file mode 100644
index 0000000000..00ba9cf8ca
--- /dev/null
+++ b/docbook/wsdg_graphics/ws-capture-sync.dia
Binary files differ
diff --git a/docbook/wsdg_graphics/ws-capture-sync.png b/docbook/wsdg_graphics/ws-capture-sync.png
new file mode 100644
index 0000000000..bd3e2a15e3
--- /dev/null
+++ b/docbook/wsdg_graphics/ws-capture-sync.png
Binary files differ
diff --git a/docbook/wsdg_graphics/ethereal-capture_internals.dia b/docbook/wsdg_graphics/ws-capture_internals.dia
index 0eae20e589..0eae20e589 100644
--- a/docbook/wsdg_graphics/ethereal-capture_internals.dia
+++ b/docbook/wsdg_graphics/ws-capture_internals.dia
Binary files differ
diff --git a/docbook/wsdg_graphics/ethereal-capture_internals.png b/docbook/wsdg_graphics/ws-capture_internals.png
index 2fada73ab9..2fada73ab9 100644
--- a/docbook/wsdg_graphics/ethereal-capture_internals.png
+++ b/docbook/wsdg_graphics/ws-capture_internals.png
Binary files differ
diff --git a/docbook/wsdg_graphics/ws-function-blocks.dia b/docbook/wsdg_graphics/ws-function-blocks.dia
new file mode 100644
index 0000000000..5f0619c754
--- /dev/null
+++ b/docbook/wsdg_graphics/ws-function-blocks.dia
Binary files differ
diff --git a/docbook/wsdg_graphics/ws-function-blocks.png b/docbook/wsdg_graphics/ws-function-blocks.png
new file mode 100644
index 0000000000..73fdd8ef10
--- /dev/null
+++ b/docbook/wsdg_graphics/ws-function-blocks.png
Binary files differ
diff --git a/docbook/wsdg_graphics/wireshark-logo.png b/docbook/wsdg_graphics/ws-logo.png
index 20bd23c5a9..20bd23c5a9 100644
--- a/docbook/wsdg_graphics/wireshark-logo.png
+++ b/docbook/wsdg_graphics/ws-logo.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-3pane.png b/docbook/wsug_graphics/ethereal-3pane.png
deleted file mode 100644
index bbab65cdae..0000000000
--- a/docbook/wsug_graphics/ethereal-3pane.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-analyze-menu.png b/docbook/wsug_graphics/ethereal-analyze-menu.png
deleted file mode 100644
index 1613c0d1bf..0000000000
--- a/docbook/wsug_graphics/ethereal-analyze-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-bytes-pane-popup-menu.png b/docbook/wsug_graphics/ethereal-bytes-pane-popup-menu.png
deleted file mode 100644
index 64e65e55c2..0000000000
--- a/docbook/wsug_graphics/ethereal-bytes-pane-popup-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-capture-info.png b/docbook/wsug_graphics/ethereal-capture-info.png
deleted file mode 100644
index d31e09e655..0000000000
--- a/docbook/wsug_graphics/ethereal-capture-info.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-capture-interfaces.png b/docbook/wsug_graphics/ethereal-capture-interfaces.png
deleted file mode 100644
index 9f5b6691ff..0000000000
--- a/docbook/wsug_graphics/ethereal-capture-interfaces.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-capture-menu.png b/docbook/wsug_graphics/ethereal-capture-menu.png
deleted file mode 100644
index ef831ab89f..0000000000
--- a/docbook/wsug_graphics/ethereal-capture-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-capture-options.png b/docbook/wsug_graphics/ethereal-capture-options.png
deleted file mode 100644
index f641be2dc5..0000000000
--- a/docbook/wsug_graphics/ethereal-capture-options.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-capture-preferences.png b/docbook/wsug_graphics/ethereal-capture-preferences.png
deleted file mode 100644
index 84448f611f..0000000000
--- a/docbook/wsug_graphics/ethereal-capture-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-choose-color-rule.png b/docbook/wsug_graphics/ethereal-choose-color-rule.png
deleted file mode 100644
index db8a3f0d57..0000000000
--- a/docbook/wsug_graphics/ethereal-choose-color-rule.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-coloring-rules-dialog.png b/docbook/wsug_graphics/ethereal-coloring-rules-dialog.png
deleted file mode 100644
index 172ee6f2f9..0000000000
--- a/docbook/wsug_graphics/ethereal-coloring-rules-dialog.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-decode-as-show.png b/docbook/wsug_graphics/ethereal-decode-as-show.png
deleted file mode 100644
index 3a28cc895b..0000000000
--- a/docbook/wsug_graphics/ethereal-decode-as-show.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-decode-as.png b/docbook/wsug_graphics/ethereal-decode-as.png
deleted file mode 100644
index 89da973544..0000000000
--- a/docbook/wsug_graphics/ethereal-decode-as.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-details-pane-popup-menu.png b/docbook/wsug_graphics/ethereal-details-pane-popup-menu.png
deleted file mode 100644
index df3c9dd825..0000000000
--- a/docbook/wsug_graphics/ethereal-details-pane-popup-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-display-filter-tcp.png b/docbook/wsug_graphics/ethereal-display-filter-tcp.png
deleted file mode 100644
index 4af9792301..0000000000
--- a/docbook/wsug_graphics/ethereal-display-filter-tcp.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-edit-color-rule-dialog.png b/docbook/wsug_graphics/ethereal-edit-color-rule-dialog.png
deleted file mode 100644
index 61e695a0c7..0000000000
--- a/docbook/wsug_graphics/ethereal-edit-color-rule-dialog.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-edit-menu.png b/docbook/wsug_graphics/ethereal-edit-menu.png
deleted file mode 100644
index 0ada936c0f..0000000000
--- a/docbook/wsug_graphics/ethereal-edit-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-empty.png b/docbook/wsug_graphics/ethereal-empty.png
deleted file mode 100644
index 7238f70fe2..0000000000
--- a/docbook/wsug_graphics/ethereal-empty.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-enabled-protocols.png b/docbook/wsug_graphics/ethereal-enabled-protocols.png
deleted file mode 100644
index ed260c89c0..0000000000
--- a/docbook/wsug_graphics/ethereal-enabled-protocols.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-error-file-exists.png b/docbook/wsug_graphics/ethereal-error-file-exists.png
deleted file mode 100644
index 3f6861d97e..0000000000
--- a/docbook/wsug_graphics/ethereal-error-file-exists.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-error-open.png b/docbook/wsug_graphics/ethereal-error-open.png
deleted file mode 100644
index 6b4b633d69..0000000000
--- a/docbook/wsug_graphics/ethereal-error-open.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-file-menu.png b/docbook/wsug_graphics/ethereal-file-menu.png
deleted file mode 100644
index 312a5adf4b..0000000000
--- a/docbook/wsug_graphics/ethereal-file-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-file-set-dialog.png b/docbook/wsug_graphics/ethereal-file-set-dialog.png
deleted file mode 100644
index 27123c6fa0..0000000000
--- a/docbook/wsug_graphics/ethereal-file-set-dialog.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-filter-add-expression.png b/docbook/wsug_graphics/ethereal-filter-add-expression.png
deleted file mode 100644
index 213471fb01..0000000000
--- a/docbook/wsug_graphics/ethereal-filter-add-expression.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-filters-2.png b/docbook/wsug_graphics/ethereal-filters-2.png
deleted file mode 100644
index 6e66068dd3..0000000000
--- a/docbook/wsug_graphics/ethereal-filters-2.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-filters.png b/docbook/wsug_graphics/ethereal-filters.png
deleted file mode 100644
index 8fcf83f0fe..0000000000
--- a/docbook/wsug_graphics/ethereal-filters.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-find-packet.png b/docbook/wsug_graphics/ethereal-find-packet.png
deleted file mode 100644
index 50f5b53492..0000000000
--- a/docbook/wsug_graphics/ethereal-find-packet.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-follow-stream.png b/docbook/wsug_graphics/ethereal-follow-stream.png
deleted file mode 100644
index f1bcad2006..0000000000
--- a/docbook/wsug_graphics/ethereal-follow-stream.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-go-menu.png b/docbook/wsug_graphics/ethereal-go-menu.png
deleted file mode 100644
index 64648e932d..0000000000
--- a/docbook/wsug_graphics/ethereal-go-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-goto-packet.png b/docbook/wsug_graphics/ethereal-goto-packet.png
deleted file mode 100644
index d68184270d..0000000000
--- a/docbook/wsug_graphics/ethereal-goto-packet.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-gui-colors-preferences.png b/docbook/wsug_graphics/ethereal-gui-colors-preferences.png
deleted file mode 100644
index f3a9c74d6e..0000000000
--- a/docbook/wsug_graphics/ethereal-gui-colors-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-gui-columns-preferences.png b/docbook/wsug_graphics/ethereal-gui-columns-preferences.png
deleted file mode 100644
index 2d4ba0bdc1..0000000000
--- a/docbook/wsug_graphics/ethereal-gui-columns-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-gui-font-preferences.png b/docbook/wsug_graphics/ethereal-gui-font-preferences.png
deleted file mode 100644
index 1a4451cd34..0000000000
--- a/docbook/wsug_graphics/ethereal-gui-font-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-gui-layout-preferences.png b/docbook/wsug_graphics/ethereal-gui-layout-preferences.png
deleted file mode 100644
index 8d31efc1a5..0000000000
--- a/docbook/wsug_graphics/ethereal-gui-layout-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-gui-preferences.png b/docbook/wsug_graphics/ethereal-gui-preferences.png
deleted file mode 100644
index 819a5acd85..0000000000
--- a/docbook/wsug_graphics/ethereal-gui-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-help-menu.png b/docbook/wsug_graphics/ethereal-help-menu.png
deleted file mode 100644
index a4290c7a14..0000000000
--- a/docbook/wsug_graphics/ethereal-help-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-nameresolution-preferences.png b/docbook/wsug_graphics/ethereal-nameresolution-preferences.png
deleted file mode 100644
index bec511deef..0000000000
--- a/docbook/wsug_graphics/ethereal-nameresolution-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-packet-pane-popup-menu.png b/docbook/wsug_graphics/ethereal-packet-pane-popup-menu.png
deleted file mode 100644
index 300f4b41d1..0000000000
--- a/docbook/wsug_graphics/ethereal-packet-pane-popup-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-packet-selected.png b/docbook/wsug_graphics/ethereal-packet-selected.png
deleted file mode 100644
index 0ce0180e6e..0000000000
--- a/docbook/wsug_graphics/ethereal-packet-selected.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-packet-sep-win.png b/docbook/wsug_graphics/ethereal-packet-sep-win.png
deleted file mode 100644
index 6c89528be5..0000000000
--- a/docbook/wsug_graphics/ethereal-packet-sep-win.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-print.png b/docbook/wsug_graphics/ethereal-print.png
deleted file mode 100644
index fa02ec6462..0000000000
--- a/docbook/wsug_graphics/ethereal-print.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-printing-preferences.png b/docbook/wsug_graphics/ethereal-printing-preferences.png
deleted file mode 100644
index 94c2f047cd..0000000000
--- a/docbook/wsug_graphics/ethereal-printing-preferences.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-statistics-menu.png b/docbook/wsug_graphics/ethereal-statistics-menu.png
deleted file mode 100644
index b1d650cc37..0000000000
--- a/docbook/wsug_graphics/ethereal-statistics-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-stats-conversations.png b/docbook/wsug_graphics/ethereal-stats-conversations.png
deleted file mode 100644
index 8333bd1563..0000000000
--- a/docbook/wsug_graphics/ethereal-stats-conversations.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-stats-endpoints.png b/docbook/wsug_graphics/ethereal-stats-endpoints.png
deleted file mode 100644
index 7df82a1aa6..0000000000
--- a/docbook/wsug_graphics/ethereal-stats-endpoints.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-stats-hierarchy.png b/docbook/wsug_graphics/ethereal-stats-hierarchy.png
deleted file mode 100644
index f441124a16..0000000000
--- a/docbook/wsug_graphics/ethereal-stats-hierarchy.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-stats-iographs.png b/docbook/wsug_graphics/ethereal-stats-iographs.png
deleted file mode 100644
index a19396e54a..0000000000
--- a/docbook/wsug_graphics/ethereal-stats-iographs.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-stats-srt-dcerpc-filter.png b/docbook/wsug_graphics/ethereal-stats-srt-dcerpc-filter.png
deleted file mode 100644
index 15b61079c5..0000000000
--- a/docbook/wsug_graphics/ethereal-stats-srt-dcerpc-filter.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-stats-srt-dcerpc.png b/docbook/wsug_graphics/ethereal-stats-srt-dcerpc.png
deleted file mode 100644
index c544bc6e8a..0000000000
--- a/docbook/wsug_graphics/ethereal-stats-srt-dcerpc.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-stats-summary.png b/docbook/wsug_graphics/ethereal-stats-summary.png
deleted file mode 100644
index 99928608a1..0000000000
--- a/docbook/wsug_graphics/ethereal-stats-summary.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-time-reference.png b/docbook/wsug_graphics/ethereal-time-reference.png
deleted file mode 100644
index 49315c096b..0000000000
--- a/docbook/wsug_graphics/ethereal-time-reference.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-view-menu.png b/docbook/wsug_graphics/ethereal-view-menu.png
deleted file mode 100644
index 9746a67216..0000000000
--- a/docbook/wsug_graphics/ethereal-view-menu.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/toolbar/stock_apply_20.png b/docbook/wsug_graphics/toolbar/stock_apply_20.png
new file mode 100644
index 0000000000..58a64cfc48
--- /dev/null
+++ b/docbook/wsug_graphics/toolbar/stock_apply_20.png
Binary files differ
diff --git a/docbook/wsug_graphics/toolbar/stock_clear_24.png b/docbook/wsug_graphics/toolbar/stock_clear_24.png
new file mode 100644
index 0000000000..96b6d57ddf
--- /dev/null
+++ b/docbook/wsug_graphics/toolbar/stock_clear_24.png
Binary files differ
diff --git a/docbook/wsug_graphics/wireshark-main.png b/docbook/wsug_graphics/wireshark-main.png
deleted file mode 100644
index 394c1e843a..0000000000
--- a/docbook/wsug_graphics/wireshark-main.png
+++ /dev/null
Binary files differ
diff --git a/docbook/wsug_graphics/ws-analyze-menu.png b/docbook/wsug_graphics/ws-analyze-menu.png
new file mode 100644
index 0000000000..a253874254
--- /dev/null
+++ b/docbook/wsug_graphics/ws-analyze-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-bytes-pane-popup-menu.png b/docbook/wsug_graphics/ws-bytes-pane-popup-menu.png
new file mode 100644
index 0000000000..df0ed89078
--- /dev/null
+++ b/docbook/wsug_graphics/ws-bytes-pane-popup-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-bytes-pane-tabs.png b/docbook/wsug_graphics/ws-bytes-pane-tabs.png
index 422b56e3ed..422b56e3ed 100644
--- a/docbook/wsug_graphics/ethereal-bytes-pane-tabs.png
+++ b/docbook/wsug_graphics/ws-bytes-pane-tabs.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-bytes-pane.png b/docbook/wsug_graphics/ws-bytes-pane.png
index ed396fcb42..ed396fcb42 100644
--- a/docbook/wsug_graphics/ethereal-bytes-pane.png
+++ b/docbook/wsug_graphics/ws-bytes-pane.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-capture-info.png b/docbook/wsug_graphics/ws-capture-info.png
new file mode 100644
index 0000000000..09ba98491c
--- /dev/null
+++ b/docbook/wsug_graphics/ws-capture-info.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-capture-interfaces.png b/docbook/wsug_graphics/ws-capture-interfaces.png
new file mode 100644
index 0000000000..61dade10ca
--- /dev/null
+++ b/docbook/wsug_graphics/ws-capture-interfaces.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-capture-menu.png b/docbook/wsug_graphics/ws-capture-menu.png
new file mode 100644
index 0000000000..8fe598c325
--- /dev/null
+++ b/docbook/wsug_graphics/ws-capture-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-capture-options.png b/docbook/wsug_graphics/ws-capture-options.png
new file mode 100644
index 0000000000..ce9d082f04
--- /dev/null
+++ b/docbook/wsug_graphics/ws-capture-options.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-capture-preferences.png b/docbook/wsug_graphics/ws-capture-preferences.png
new file mode 100644
index 0000000000..ff1118927c
--- /dev/null
+++ b/docbook/wsug_graphics/ws-capture-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-choose-color-rule.png b/docbook/wsug_graphics/ws-choose-color-rule.png
new file mode 100644
index 0000000000..e5fd3b5116
--- /dev/null
+++ b/docbook/wsug_graphics/ws-choose-color-rule.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-coloring-fields.png b/docbook/wsug_graphics/ws-coloring-fields.png
new file mode 100644
index 0000000000..f6c9245f74
--- /dev/null
+++ b/docbook/wsug_graphics/ws-coloring-fields.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-coloring-rules-dialog.png b/docbook/wsug_graphics/ws-coloring-rules-dialog.png
new file mode 100644
index 0000000000..08bf575478
--- /dev/null
+++ b/docbook/wsug_graphics/ws-coloring-rules-dialog.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-decode-as-show.png b/docbook/wsug_graphics/ws-decode-as-show.png
new file mode 100644
index 0000000000..7875224abc
--- /dev/null
+++ b/docbook/wsug_graphics/ws-decode-as-show.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-decode-as.png b/docbook/wsug_graphics/ws-decode-as.png
new file mode 100644
index 0000000000..1ac5ad0b2b
--- /dev/null
+++ b/docbook/wsug_graphics/ws-decode-as.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-details-pane-popup-menu.png b/docbook/wsug_graphics/ws-details-pane-popup-menu.png
new file mode 100644
index 0000000000..65fa841828
--- /dev/null
+++ b/docbook/wsug_graphics/ws-details-pane-popup-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-details-pane.png b/docbook/wsug_graphics/ws-details-pane.png
index 3abdf6a0ee..3abdf6a0ee 100644
--- a/docbook/wsug_graphics/ethereal-details-pane.png
+++ b/docbook/wsug_graphics/ws-details-pane.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-display-filter-tcp.png b/docbook/wsug_graphics/ws-display-filter-tcp.png
new file mode 100644
index 0000000000..36260e6455
--- /dev/null
+++ b/docbook/wsug_graphics/ws-display-filter-tcp.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-edit-color-rule-dialog.png b/docbook/wsug_graphics/ws-edit-color-rule-dialog.png
new file mode 100644
index 0000000000..6b9709d447
--- /dev/null
+++ b/docbook/wsug_graphics/ws-edit-color-rule-dialog.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-edit-menu.png b/docbook/wsug_graphics/ws-edit-menu.png
new file mode 100644
index 0000000000..29d7ed1014
--- /dev/null
+++ b/docbook/wsug_graphics/ws-edit-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-enabled-protocols.png b/docbook/wsug_graphics/ws-enabled-protocols.png
new file mode 100644
index 0000000000..23ef40a8fb
--- /dev/null
+++ b/docbook/wsug_graphics/ws-enabled-protocols.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-export-pdml.png b/docbook/wsug_graphics/ws-export-pdml.png
index 4e6565d1eb..4e6565d1eb 100644
--- a/docbook/wsug_graphics/ethereal-export-pdml.png
+++ b/docbook/wsug_graphics/ws-export-pdml.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-export-plain.png b/docbook/wsug_graphics/ws-export-plain.png
index fade1c17a1..fade1c17a1 100644
--- a/docbook/wsug_graphics/ethereal-export-plain.png
+++ b/docbook/wsug_graphics/ws-export-plain.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-export-ps.png b/docbook/wsug_graphics/ws-export-ps.png
index c15f746b65..c15f746b65 100644
--- a/docbook/wsug_graphics/ethereal-export-ps.png
+++ b/docbook/wsug_graphics/ws-export-ps.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-export-psml.png b/docbook/wsug_graphics/ws-export-psml.png
index ae7ef1f138..ae7ef1f138 100644
--- a/docbook/wsug_graphics/ethereal-export-psml.png
+++ b/docbook/wsug_graphics/ws-export-psml.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-export-selected.png b/docbook/wsug_graphics/ws-export-selected.png
index 22977f6858..22977f6858 100644
--- a/docbook/wsug_graphics/ethereal-export-selected.png
+++ b/docbook/wsug_graphics/ws-export-selected.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-file-menu.png b/docbook/wsug_graphics/ws-file-menu.png
new file mode 100644
index 0000000000..2eb41dddb3
--- /dev/null
+++ b/docbook/wsug_graphics/ws-file-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-file-set-dialog.png b/docbook/wsug_graphics/ws-file-set-dialog.png
new file mode 100644
index 0000000000..f2dff2ffa6
--- /dev/null
+++ b/docbook/wsug_graphics/ws-file-set-dialog.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-filter-add-expression.png b/docbook/wsug_graphics/ws-filter-add-expression.png
new file mode 100644
index 0000000000..675ea3e5d3
--- /dev/null
+++ b/docbook/wsug_graphics/ws-filter-add-expression.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-filter-toolbar.png b/docbook/wsug_graphics/ws-filter-toolbar.png
index 541d6f9d3f..541d6f9d3f 100644
--- a/docbook/wsug_graphics/ethereal-filter-toolbar.png
+++ b/docbook/wsug_graphics/ws-filter-toolbar.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-filters.png b/docbook/wsug_graphics/ws-filters.png
new file mode 100644
index 0000000000..3c001ef3ac
--- /dev/null
+++ b/docbook/wsug_graphics/ws-filters.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-find-packet.png b/docbook/wsug_graphics/ws-find-packet.png
new file mode 100644
index 0000000000..9ab660ea57
--- /dev/null
+++ b/docbook/wsug_graphics/ws-find-packet.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-follow-stream.png b/docbook/wsug_graphics/ws-follow-stream.png
new file mode 100644
index 0000000000..50cfd9adb0
--- /dev/null
+++ b/docbook/wsug_graphics/ws-follow-stream.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-go-menu.png b/docbook/wsug_graphics/ws-go-menu.png
new file mode 100644
index 0000000000..c25ac63f7e
--- /dev/null
+++ b/docbook/wsug_graphics/ws-go-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-goto-packet.png b/docbook/wsug_graphics/ws-goto-packet.png
new file mode 100644
index 0000000000..62cd185c1d
--- /dev/null
+++ b/docbook/wsug_graphics/ws-goto-packet.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-gui-colors-preferences.png b/docbook/wsug_graphics/ws-gui-colors-preferences.png
new file mode 100644
index 0000000000..0c89bb06d0
--- /dev/null
+++ b/docbook/wsug_graphics/ws-gui-colors-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-gui-columns-preferences.png b/docbook/wsug_graphics/ws-gui-columns-preferences.png
new file mode 100644
index 0000000000..269d3acca4
--- /dev/null
+++ b/docbook/wsug_graphics/ws-gui-columns-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-gui-font-preferences.png b/docbook/wsug_graphics/ws-gui-font-preferences.png
new file mode 100644
index 0000000000..c87508938a
--- /dev/null
+++ b/docbook/wsug_graphics/ws-gui-font-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-gui-layout-preferences.png b/docbook/wsug_graphics/ws-gui-layout-preferences.png
new file mode 100644
index 0000000000..6f7e42b126
--- /dev/null
+++ b/docbook/wsug_graphics/ws-gui-layout-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-gui-preferences.png b/docbook/wsug_graphics/ws-gui-preferences.png
new file mode 100644
index 0000000000..451e6067ff
--- /dev/null
+++ b/docbook/wsug_graphics/ws-gui-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-help-menu.png b/docbook/wsug_graphics/ws-help-menu.png
new file mode 100644
index 0000000000..0b95757083
--- /dev/null
+++ b/docbook/wsug_graphics/ws-help-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-list-pane.png b/docbook/wsug_graphics/ws-list-pane.png
index fbe468a069..fbe468a069 100644
--- a/docbook/wsug_graphics/ethereal-list-pane.png
+++ b/docbook/wsug_graphics/ws-list-pane.png
Binary files differ
diff --git a/docbook/wsug_graphics/wireshark-logo.png b/docbook/wsug_graphics/ws-logo.png
index 20bd23c5a9..20bd23c5a9 100644
--- a/docbook/wsug_graphics/wireshark-logo.png
+++ b/docbook/wsug_graphics/ws-logo.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-main-toolbar.png b/docbook/wsug_graphics/ws-main-toolbar.png
index c4c98a8509..c4c98a8509 100644
--- a/docbook/wsug_graphics/ethereal-main-toolbar.png
+++ b/docbook/wsug_graphics/ws-main-toolbar.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-main.png b/docbook/wsug_graphics/ws-main.png
new file mode 100644
index 0000000000..cef41f6819
--- /dev/null
+++ b/docbook/wsug_graphics/ws-main.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-menu.png b/docbook/wsug_graphics/ws-menu.png
index 5d070ee3ae..5d070ee3ae 100644
--- a/docbook/wsug_graphics/ethereal-menu.png
+++ b/docbook/wsug_graphics/ws-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-merge.png b/docbook/wsug_graphics/ws-merge.png
index 3cc5b0a99e..3cc5b0a99e 100644
--- a/docbook/wsug_graphics/ethereal-merge.png
+++ b/docbook/wsug_graphics/ws-merge.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-nameresolution-preferences.png b/docbook/wsug_graphics/ws-nameresolution-preferences.png
new file mode 100644
index 0000000000..3e5ee6deb0
--- /dev/null
+++ b/docbook/wsug_graphics/ws-nameresolution-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-open.png b/docbook/wsug_graphics/ws-open.png
index 8857cf1efe..8857cf1efe 100644
--- a/docbook/wsug_graphics/ethereal-open.png
+++ b/docbook/wsug_graphics/ws-open.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-packet-format.png b/docbook/wsug_graphics/ws-packet-format.png
index 69487fc654..69487fc654 100644
--- a/docbook/wsug_graphics/ethereal-packet-format.png
+++ b/docbook/wsug_graphics/ws-packet-format.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-packet-pane-popup-menu.png b/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
new file mode 100644
index 0000000000..bf45db7458
--- /dev/null
+++ b/docbook/wsug_graphics/ws-packet-pane-popup-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-packet-range.png b/docbook/wsug_graphics/ws-packet-range.png
index 959914e318..959914e318 100644
--- a/docbook/wsug_graphics/ethereal-packet-range.png
+++ b/docbook/wsug_graphics/ws-packet-range.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-packet-selected.png b/docbook/wsug_graphics/ws-packet-selected.png
new file mode 100644
index 0000000000..2af7c14ef8
--- /dev/null
+++ b/docbook/wsug_graphics/ws-packet-selected.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-packet-sep-win.png b/docbook/wsug_graphics/ws-packet-sep-win.png
new file mode 100644
index 0000000000..cc8682436d
--- /dev/null
+++ b/docbook/wsug_graphics/ws-packet-sep-win.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-print.png b/docbook/wsug_graphics/ws-print.png
new file mode 100644
index 0000000000..e1fc28782f
--- /dev/null
+++ b/docbook/wsug_graphics/ws-print.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-printing-preferences.png b/docbook/wsug_graphics/ws-printing-preferences.png
new file mode 100644
index 0000000000..f0a52849a3
--- /dev/null
+++ b/docbook/wsug_graphics/ws-printing-preferences.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-save-as.png b/docbook/wsug_graphics/ws-save-as.png
index 0a518247e4..0a518247e4 100644
--- a/docbook/wsug_graphics/ethereal-save-as.png
+++ b/docbook/wsug_graphics/ws-save-as.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-statistics-menu.png b/docbook/wsug_graphics/ws-statistics-menu.png
new file mode 100644
index 0000000000..794c5d378d
--- /dev/null
+++ b/docbook/wsug_graphics/ws-statistics-menu.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-stats-conversations.png b/docbook/wsug_graphics/ws-stats-conversations.png
new file mode 100644
index 0000000000..f10e403109
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-conversations.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-stats-endpoints.png b/docbook/wsug_graphics/ws-stats-endpoints.png
new file mode 100644
index 0000000000..b047d2ca85
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-endpoints.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-stats-hierarchy.png b/docbook/wsug_graphics/ws-stats-hierarchy.png
new file mode 100644
index 0000000000..bd5d9fecef
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-hierarchy.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-stats-iographs.png b/docbook/wsug_graphics/ws-stats-iographs.png
new file mode 100644
index 0000000000..bb21254663
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-iographs.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png b/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png
new file mode 100644
index 0000000000..f00b748394
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-stats-srt-dcerpc.png b/docbook/wsug_graphics/ws-stats-srt-dcerpc.png
new file mode 100644
index 0000000000..c23c869877
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-srt-dcerpc.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-stats-summary.png b/docbook/wsug_graphics/ws-stats-summary.png
new file mode 100644
index 0000000000..0aaa2c3623
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-summary.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-statusbar-empty.png b/docbook/wsug_graphics/ws-statusbar-empty.png
index fb5a03afd3..fb5a03afd3 100644
--- a/docbook/wsug_graphics/ethereal-statusbar-empty.png
+++ b/docbook/wsug_graphics/ws-statusbar-empty.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-statusbar-loaded.png b/docbook/wsug_graphics/ws-statusbar-loaded.png
index 1ef0ac4cbe..1ef0ac4cbe 100644
--- a/docbook/wsug_graphics/ethereal-statusbar-loaded.png
+++ b/docbook/wsug_graphics/ws-statusbar-loaded.png
Binary files differ
diff --git a/docbook/wsug_graphics/ethereal-statusbar-selected.png b/docbook/wsug_graphics/ws-statusbar-selected.png
index b8b4bd68a3..b8b4bd68a3 100644
--- a/docbook/wsug_graphics/ethereal-statusbar-selected.png
+++ b/docbook/wsug_graphics/ws-statusbar-selected.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-time-reference.png b/docbook/wsug_graphics/ws-time-reference.png
new file mode 100644
index 0000000000..f918f24087
--- /dev/null
+++ b/docbook/wsug_graphics/ws-time-reference.png
Binary files differ
diff --git a/docbook/wsug_graphics/ws-view-menu.png b/docbook/wsug_graphics/ws-view-menu.png
new file mode 100644
index 0000000000..78de1cd2bb
--- /dev/null
+++ b/docbook/wsug_graphics/ws-view-menu.png
Binary files differ
diff --git a/docbook/wsug_src/WSUG_chapter_capture.xml b/docbook/wsug_src/WSUG_chapter_capture.xml
index b40c42c09d..31ab1ff446 100644
--- a/docbook/wsug_src/WSUG_chapter_capture.xml
+++ b/docbook/wsug_src/WSUG_chapter_capture.xml
@@ -214,7 +214,7 @@ wireshark -i eth0 -k
</para>
</listitem>
</varlistentry>
- <varlistentry><term><command>Prepare</command></term>
+ <varlistentry><term><command>Options</command></term>
<listitem>
<para>
Open the Capture Options dialog with this interface selected, see
@@ -222,6 +222,13 @@ wireshark -i eth0 -k
</para>
</listitem>
</varlistentry>
+ <varlistentry><term><command>Details (Win32 only)</command></term>
+ <listitem>
+ <para>
+ Open a dialog with detailed information about the interface.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry><term><command>Close</command></term>
<listitem>
<para>
@@ -963,7 +970,7 @@ tcp port 23 and not host 10.0.0.5
<orderedlist>
<listitem>
<para>Using the
- "<inlinegraphic entityref="WiresharkToolbarStop" format="PNG"/>
+ "<inlinegraphic entityref="WiresharkToolbarCaptureStop" format="PNG"/>
Stop" button from the <command>Capture Info dialog box
</command>.
</para>
diff --git a/docbook/wsug_src/WSUG_chapter_customize.xml b/docbook/wsug_src/WSUG_chapter_customize.xml
index 78bbad6117..6c1c6c3f09 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.xml
+++ b/docbook/wsug_src/WSUG_chapter_customize.xml
@@ -572,9 +572,14 @@ standard libpcap format.
filters being used in Wireshark. You may not like the color choices,
however, feel free to choose your own.
</para>
+ <para>
+ If you are uncertain which coloring rule actually took place for a
+ specific packet, have a look at the [Coloring Rule Name: ...] and
+ [Coloring Rule String: ...] fields.
+ </para>
<figure id="ChCustColorFilterMany">
<title>Using color filters with Wireshark</title>
- <graphic entityref="WiresharkThreePane1" format="PNG"/>
+ <graphic entityref="WiresharkColoringFields" format="PNG"/>
</figure>
</section>
diff --git a/docbook/wsug_src/WSUG_chapter_use.xml b/docbook/wsug_src/WSUG_chapter_use.xml
index 8573bbe402..d6b2142928 100644
--- a/docbook/wsug_src/WSUG_chapter_use.xml
+++ b/docbook/wsug_src/WSUG_chapter_use.xml
@@ -517,47 +517,66 @@
<entry></entry>
</row>
<row>
- <entry><command>Time Reference > Set Time Reference (toggle)</command></entry>
- <entry>Ctrl+T</entry>
+ <entry><command>Mark Packet (toggle)</command></entry>
+ <entry>Ctrl+M</entry>
<entry><para>
- This menu item set a time reference on the currently selected
- packet. See <xref linkend="ChWorkTimeReferencePacketSection"/> for more information
- about the time referenced packets.
+ This menu item "marks" the currently selected packet. See
+ <xref linkend="ChWorkMarkPacketSection"/> for details.
</para></entry>
</row>
<row>
- <entry><command>Time Reference > Find Next</command></entry>
- <entry></entry>
+ <entry><command>Find Next Mark</command></entry>
+ <entry>Shift+Ctrl+N</entry>
<entry><para>
- This menu item tries to find the next time referenced packet.
+ Find the next marked packet.
+ </para></entry>
+ </row>
+ <row>
+ <entry><command>Find Previous Mark</command></entry>
+ <entry>Shift+Ctrl+B</entry>
+ <entry><para>
+ Find the previous marked packet.
</para></entry>
</row>
<row>
- <entry><command>Time Reference > Find Previous</command></entry>
+ <entry><command>Mark All Packets</command></entry>
<entry></entry>
<entry><para>
- This menu item tries to find the previous time referenced packet.
+ This menu item "marks" all packets.
</para></entry>
</row>
<row>
- <entry><command>Mark Packet (toggle)</command></entry>
- <entry>Ctrl+M</entry>
+ <entry><command>Unmark All Packets</command></entry>
+ <entry></entry>
+ <entry><para>This menu item "unmarks" all marked packets.
+ </para></entry>
+ </row>
+ <row>
+ <entry><command>------</command></entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><command>Set Time Reference (toggle)</command></entry>
+ <entry>Ctrl+T</entry>
<entry><para>
- This menu item "marks" the currently selected packet. See
- <xref linkend="ChWorkMarkPacketSection"/> for details.
+ This menu item set a time reference on the currently selected
+ packet. See <xref linkend="ChWorkTimeReferencePacketSection"/> for more information
+ about the time referenced packets.
</para></entry>
</row>
<row>
- <entry><command>Mark All Packets</command></entry>
+ <entry><command>Find Next Reference</command></entry>
<entry></entry>
<entry><para>
- This menu item "marks" all packets.
+ This menu item tries to find the next time referenced packet.
</para></entry>
</row>
<row>
- <entry><command>Unmark All Packets</command></entry>
+ <entry><command>Find Previous Reference</command></entry>
<entry></entry>
- <entry><para>This menu item "unmarks" all marked packets.
+ <entry><para>
+ This menu item tries to find the previous time referenced packet.
</para></entry>
</row>
<row>
@@ -1182,6 +1201,33 @@
<xref linkend="ChAdvFollowTCPSection"/>
</para></entry>
</row>
+ <row>
+ <entry><command>Follow SSL Stream</command></entry>
+ <entry></entry>
+ <entry><para>
+ Same functionality as "Follow TCP Stream" but for SSL streams.
+ XXX - how to provide the SSL keys?
+ </para></entry>
+ </row>
+ <row>
+ <entry><command>Expert Info</command></entry>
+ <entry></entry>
+ <entry><para>
+ Open a dialog showing some expert information about the captured
+ packets in a log style display.
+ The amount of information will depend on the protocol and varies
+ from very detailed to none existing. This is currently a work in
+ progress. XXX - add a new section about this and link from here
+ </para></entry>
+ </row>
+ <row>
+ <entry><command>Expert Info Composite</command></entry>
+ <entry></entry>
+ <entry><para>
+ Same information as in "Expert Info" but trying to group items
+ together for faster analysis.
+ </para></entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -1798,17 +1844,34 @@
<title>The "Filter" toolbar</title>
<graphic entityref="WiresharkFilterToolbar" format="PNG"/>
</figure>
- <itemizedlist>
- <listitem>
- <para>
- The leftmost button labeled "Filter:" can be clicked to
- bring up the filter construction dialog, described in <xref linkend="FiltersDialog"/>.
- </para>
- </listitem>
- <listitem>
+ <table id="ChUseFilterToolbar" frame="none">
+ <title>Filter toolbar items</title>
+ <tgroup cols="3">
+ <colspec colnum="1" colwidth="40pt"/>
+ <colspec colnum="2" colwidth="80pt"/>
+ <thead>
+ <row>
+ <entry>Toolbar Icon</entry>
+ <entry>Toolbar Item</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><graphic entityref="WiresharkToolbarDisplayFilters" format="PNG"/></entry>
+ <entry><command>Filter:</command></entry>
+ <entry><para>
+ Brings up the filter construction dialog, described in <xref linkend="FiltersDialog"/>.
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>Filter input</entry>
+ <entry>
<para>
- The left middle text box provides an area to enter or edit display
- filter strings, see <xref linkend="ChWorkBuildDisplayFilterSection"/>
+ The area to enter or edit a display filter string,
+ see <xref linkend="ChWorkBuildDisplayFilterSection"/>
. A syntax check of your filter string is done while you are typing.
The background will turn red if you enter an incomplete or invalid
string, and will become green when you enter a valid string. You can
@@ -1828,33 +1891,43 @@
This field is also where the current filter in effect is displayed.
</para>
</note>
- </listitem>
- <listitem>
- <para>
+ </entry>
+ </row>
+ <row>
+ <entry><graphic entityref="WiresharkToolbarAdd" format="PNG"/></entry>
+ <entry><command>Expression...</command></entry>
+ <entry><para>
The middle button labeled "Add Expression..." opens a dialog box that lets
you edit a display filter from a list of protocol fields, described in
<xref linkend="ChWorkFilterAddExpressionSection"/>
- </para>
- </listitem>
- <listitem>
- <para>
- The right middle button labeled "Clear" resets the current
- display filter and clears the edit area.
- </para>
- </listitem>
- <listitem>
- <para>
- The rightmost button labeled "Apply" applies the current
- value in the edit area as the new display filter.
- </para>
- </listitem>
- </itemizedlist>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry><graphic entityref="WiresharkToolbarClear" format="PNG"/></entry>
+ <entry><command>Clear</command></entry>
+ <entry><para>
+ Reset the current display filter and clears the edit area.
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry><graphic entityref="WiresharkToolbarApply" format="PNG"/></entry>
+ <entry><command>Apply</command></entry>
+ <entry><para>
+ Apply the current value in the edit area as the new display filter.
+ <note><title>Note!</title>
+ <para>
+ Applying a display filter on large capture files might take quite a long time!
+ </para>
+ </note>
+ </para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
</para>
- <note><title>Note!</title>
- <para>
- Applying a display filter on large capture files might take quite a long time!
- </para>
- </note>
</section>
<section id="ChUsePacketListPaneSection"><title>The "Packet List" pane</title>
diff --git a/docbook/wsug_src/WSUG_chapter_work.xml b/docbook/wsug_src/WSUG_chapter_work.xml
index 0ed9e1365a..e610b125a5 100644
--- a/docbook/wsug_src/WSUG_chapter_work.xml
+++ b/docbook/wsug_src/WSUG_chapter_work.xml
@@ -42,8 +42,11 @@
<graphic entityref="WiresharkPacketSepView" format="PNG"/>
</figure>
</para>
+ </section>
+
+ <section id="ChWorkDisplayPopUpSection"><title>Pop-up menus</title>
<para>
- Finally, you can bring up a pop-up menu over either the "Packet List",
+ You can bring up a pop-up menu over either the "Packet List",
"Packet Details" or "Packet Bytes" pane by clicking your right mouse button.
</para>
<para>
@@ -55,10 +58,10 @@
<title>Function overview of the pop-up menus</title>
<tgroup cols="6">
<colspec colnum="1" colwidth="80pt"/>
- <colspec colnum="2" colwidth="20pt"/>
- <colspec colnum="3" colwidth="20pt"/>
- <colspec colnum="4" colwidth="20pt"/>
- <colspec colnum="5" colwidth="80pt"/>
+ <colspec colnum="2" colwidth="25pt"/>
+ <colspec colnum="3" colwidth="25pt"/>
+ <colspec colnum="4" colwidth="25pt"/>
+ <colspec colnum="5" colwidth="70pt"/>
<thead>
<row>
<entry>Item</entry>
@@ -77,17 +80,17 @@
<entry>-</entry>
<entry>Edit</entry>
<entry>
- <para>Mark a packet.</para>
+ <para>Mark/unmark a packet.</para>
</entry>
</row>
<row>
- <entry><command>Time Reference</command></entry>
+ <entry><command>Set Time Reference (toggle)</command></entry>
<entry>X</entry>
<entry>-</entry>
<entry>-</entry>
<entry>Edit</entry>
<entry>
- <para>Set/reset and find time references.</para>
+ <para>Set/reset a time reference.</para>
</entry>
</row>
<row>
@@ -274,6 +277,8 @@
</tbody>
</tgroup>
</table>
+
+ <section id="ChWorkPacketListPanePopUpMenuSection"><title>Pop-up menu of "Packet List" pane</title>
<para>
<figure id="ChWorkPacketListPanePopUpMenu">
<title>Pop-up menu of "Packet List" pane</title>
@@ -284,15 +289,15 @@
<listitem>
<para>
This menu item is the same as the Edit menu item of the same
- name. It allows you to mark a packet.
+ name. It allows you to mark/unmark a packet.
</para>
</listitem>
</varlistentry>
- <varlistentry><term><command>Time Reference</command></term>
+ <varlistentry><term><command>Set Time Reference (toggle)</command></term>
<listitem>
<para>
This menu item is the same as the Edit menu items of the same
- name. It allows you to set and work with time references.
+ name. It allows you to set/reset a time references.
</para>
</listitem>
</varlistentry>
@@ -312,6 +317,23 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry><term><command>Conversation Filter</command></term>
+ <listitem>
+ <para>
+ This menu item applies a display filter with the address information
+ from the selected packet. E.g. the IP menu entry will set a filter
+ between the two IP addresses of the current packet.
+ XXX - add a new section describing this better.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term><command>SCTP</command></term>
+ <listitem>
+ <para>
+ XXX - add an explanation of this.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry><term><command>Follow TCP Stream</command></term>
<listitem>
<para>
@@ -321,6 +343,14 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry><term><command>Follow SSL Stream</command></term>
+ <listitem>
+ <para>
+ Same as "Follow TCP Stream" but for SSL.
+ XXX - add a new section describing this better.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry><term><command>Decode As...</command></term>
<listitem>
<para>
@@ -349,12 +379,22 @@
</varlistentry>
</variablelist>
</para>
+ </section>
+
+ <section id="ChWorkPacketDetailsPanePopUpMenuSection"><title>Pop-up menu of "Packet Details" pane</title>
<para>
<figure id="ChWorkPacketDetailsPanePopUpMenu">
<title>Pop-up menu of "Packet Details" pane</title>
<graphic entityref="WiresharkDetailsPanePopupMenu" format="PNG"/>
</figure>
<variablelist>
+ <varlistentry><term><command>Copy</command></term>
+ <listitem>
+ <para>
+ Copy the text of the selected field to the system clipboard.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry><term><command>Expand Subtrees</command></term>
<listitem>
<para>
@@ -405,6 +445,14 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry><term><command>Follow SSL Stream</command></term>
+ <listitem>
+ <para>
+ Same as "Follow TCP Stream" but for SSL.
+ XXX - add a new section describing this better.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry><term><command>Wiki Protocol Page</command></term>
<listitem>
<para>
@@ -459,13 +507,23 @@
</varlistentry>
</variablelist>
</para>
+ </section>
+
+ <section id="ChWorkPacketBytesPanePopUpMenuSection"><title>Pop-up menu of "Packet Bytes" pane</title>
<para>
<figure id="ChWorkPacketBytesPanePopUpMenu">
<title>Pop-up menu of "Packet Bytes" pane</title>
<graphic entityref="WiresharkBytesPanePopupMenu" format="PNG"/>
</figure>
<variablelist>
- <varlistentry><term><command>Copy</command></term>
+ <varlistentry><term><command>Copy/All Information</command></term>
+ <listitem>
+ <para>
+ Copy the selected (XXX - all?) packet data to the clipboard (XXX - in which format).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term><command>Copy/Text Only</command></term>
<listitem>
<para>
Copy the selected packet data to the clipboard (XXX - in which format).
@@ -483,6 +541,8 @@
</variablelist>
</para>
</section>
+
+ </section>
<section id="ChWorkDisplayFilterSection"><title>Filtering packets while viewing</title>
<para>