rename "graphics" directory to "wsug_graphics" to make it clear that it's only used for the users_guide

svn path=/trunk/; revision=18473

111 files changed, 257 insertions, 257 deletions

diff --git a/docbook/Makefile b/docbook/Makefile
index f5e90849a2..7aeb11bcd8 100644
--- a/docbook/Makefile
+++ b/docbook/Makefile
@@ -17,18 +17,18 @@ FOP_OPTS=-Xmx256m
 #
 # for win32 (cygwin) environments (as of fop-0.20 the cygwin script does
 # not use $FOP_OPTS)
-#FOP=fop-0.20.5/fop.bat
+FOP=fop-0.20.5/fop.bat
 #
 # for unix like environments (if you have problems with fop, try to use an absolute path here)
 #FOP=fop-0.20.5/fop.sh
 #
 # One SUSE 9.1 and 9.2 uncomment the following line (make sure you have at least fop-0.20.5-71.2)
-FOP=fop
+#FOP=fop
 
 # html help compiler (Win32 only)
 # Leave these commented out if you don't have HHC installed or you
 # don't want CHM documentation.
-#HHC="/cygdrive/c/Program Files/HTML Help Workshop/hhc.exe"
+HHC="/cygdrive/c/Program Files/HTML Help Workshop/hhc.exe"
 #HHC="true"
 
 # elinks (text version of release notes)
@@ -70,113 +70,113 @@ WSUG_FILES =	\
 	wsug_src/WSUG_preface.xml
 
 WSUG_GRAPHICS =	\
-	graphics/ethereal-3pane.png			\
-	graphics/ethereal-analyze-menu.png		\
-	graphics/ethereal-bytes-pane-popup-menu.png	\
-	graphics/ethereal-bytes-pane-tabs.png		\
-	graphics/ethereal-bytes-pane.png		\
-	graphics/ethereal-capture-info.png		\
-	graphics/ethereal-capture-interfaces.png	\
-	graphics/ethereal-capture-menu.png		\
-	graphics/ethereal-capture-options.png		\
-	graphics/ethereal-capture-preferences.png	\
-	graphics/ethereal-choose-color-rule.png		\
-	graphics/ethereal-coloring-rules-dialog.png	\
-	graphics/ethereal-decode-as-show.png		\
-	graphics/ethereal-decode-as.png			\
-	graphics/ethereal-details-pane-popup-menu.png	\
-	graphics/ethereal-details-pane.png		\
-	graphics/ethereal-display-filter-tcp.png	\
-	graphics/ethereal-edit-color-rule-dialog.png	\
-	graphics/ethereal-edit-menu.png			\
-	graphics/ethereal-empty.png			\
-	graphics/ethereal-enabled-protocols.png		\
-	graphics/ethereal-error-file-exists.png		\
-	graphics/ethereal-error-open.png		\
-	graphics/ethereal-export-pdml.png		\
-	graphics/ethereal-export-plain.png		\
-	graphics/ethereal-export-ps.png			\
-	graphics/ethereal-export-psml.png		\
-	graphics/ethereal-export-selected.png		\
-	graphics/ethereal-file-menu.png			\
-	graphics/ethereal-file-set-dialog.png		\
-	graphics/ethereal-filter-add-expression.png	\
-	graphics/ethereal-filter-toolbar.png		\
-	graphics/ethereal-filters-2.png			\
-	graphics/ethereal-filters.png			\
-	graphics/ethereal-find-packet.png		\
-	graphics/ethereal-follow-stream.png		\
-	graphics/ethereal-go-menu.png			\
-	graphics/ethereal-goto-packet.png		\
-	graphics/ethereal-gui-colors-preferences.png	\
-	graphics/ethereal-gui-columns-preferences.png	\
-	graphics/ethereal-gui-font-preferences.png	\
-	graphics/ethereal-gui-layout-preferences.png	\
-	graphics/ethereal-gui-preferences.png		\
-	graphics/ethereal-help-menu.png			\
-	graphics/ethereal-list-pane.png			\
-	graphics/ethereal-main-toolbar.png		\
-	graphics/ethereal-menu.png			\
-	graphics/ethereal-merge.png			\
-	graphics/ethereal-nameresolution-preferences.png	\
-	graphics/ethereal-open.png			\
-	graphics/ethereal-packet-format.png		\
-	graphics/ethereal-packet-pane-popup-menu.png	\
-	graphics/ethereal-packet-range.png		\
-	graphics/ethereal-packet-selected.png		\
-	graphics/ethereal-packet-sep-win.png		\
-	graphics/ethereal-print.png			\
-	graphics/ethereal-printing-preferences.png	\
-	graphics/ethereal-save-as.png			\
-	graphics/ethereal-statistics-menu.png		\
-	graphics/ethereal-stats-conversations.png	\
-	graphics/ethereal-stats-endpoints.png		\
-	graphics/ethereal-stats-hierarchy.png		\
-	graphics/ethereal-stats-iographs.png		\
-	graphics/ethereal-stats-srt-dcerpc-filter.png	\
-	graphics/ethereal-stats-srt-dcerpc.png		\
-	graphics/ethereal-stats-summary.png		\
-	graphics/ethereal-statusbar-empty.png		\
-	graphics/ethereal-statusbar-loaded.png		\
-	graphics/ethereal-statusbar-selected.png	\
-	graphics/ethereal-time-reference.png		\
-	graphics/ethereal-view-menu.png			\
-	graphics/note.png				\
-	graphics/tip.png				\
-	graphics/warning.png				\
-	graphics/toolbar/autoscroll_24.png		\
-	graphics/toolbar/capture_filter_24.png		\
-	graphics/toolbar/capture_interfaces_24.png 	\
-	graphics/toolbar/capture_options_24.png 	\
-	graphics/toolbar/capture_restart_24.png 	\
-	graphics/toolbar/capture_start_24.png 		\
-	graphics/toolbar/capture_stop_24.png 		\
-	graphics/toolbar/colorize_24.png		\
-	graphics/toolbar/display_filter_24.png		\
-	graphics/toolbar/resize_columns_24.png		\
-	graphics/toolbar/stock_add_24.png		\
-	graphics/toolbar/stock_bottom_24.png		\
-	graphics/toolbar/stock_close_24.png		\
-	graphics/toolbar/stock_colorselector_24.png	\
-	graphics/toolbar/stock_help_24.png		\
-	graphics/toolbar/stock_jump_to_24.png		\
-	graphics/toolbar/stock_left_arrow_24.png	\
-	graphics/toolbar/stock_open_24.png		\
-	graphics/toolbar/stock_preferences_24.png	\
-	graphics/toolbar/stock_print_24.png		\
-	graphics/toolbar/stock_properties_24.png	\
-	graphics/toolbar/stock_refresh_24.png		\
-	graphics/toolbar/stock_right_arrow_24.png	\
-	graphics/toolbar/stock_save_24.png		\
-	graphics/toolbar/stock_save_as_24.png		\
-	graphics/toolbar/stock_search_24.png		\
-	graphics/toolbar/stock_stop_24.png		\
-	graphics/toolbar/stock_top_24.png		\
-	graphics/toolbar/stock_zoom_1_24.png		\
-	graphics/toolbar/stock_zoom_in_24.png		\
-	graphics/toolbar/stock_zoom_out_24.png		\
-	graphics/wireshark-logo.png			\
-	graphics/wireshark-main.png
+	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/note.png				\
+	wsug_graphics/tip.png				\
+	wsug_graphics/warning.png				\
+	wsug_graphics/toolbar/autoscroll_24.png		\
+	wsug_graphics/toolbar/capture_filter_24.png		\
+	wsug_graphics/toolbar/capture_interfaces_24.png 	\
+	wsug_graphics/toolbar/capture_options_24.png 	\
+	wsug_graphics/toolbar/capture_restart_24.png 	\
+	wsug_graphics/toolbar/capture_start_24.png 		\
+	wsug_graphics/toolbar/capture_stop_24.png 		\
+	wsug_graphics/toolbar/colorize_24.png		\
+	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_bottom_24.png		\
+	wsug_graphics/toolbar/stock_close_24.png		\
+	wsug_graphics/toolbar/stock_colorselector_24.png	\
+	wsug_graphics/toolbar/stock_help_24.png		\
+	wsug_graphics/toolbar/stock_jump_to_24.png		\
+	wsug_graphics/toolbar/stock_left_arrow_24.png	\
+	wsug_graphics/toolbar/stock_open_24.png		\
+	wsug_graphics/toolbar/stock_preferences_24.png	\
+	wsug_graphics/toolbar/stock_print_24.png		\
+	wsug_graphics/toolbar/stock_properties_24.png	\
+	wsug_graphics/toolbar/stock_refresh_24.png		\
+	wsug_graphics/toolbar/stock_right_arrow_24.png	\
+	wsug_graphics/toolbar/stock_save_24.png		\
+	wsug_graphics/toolbar/stock_save_as_24.png		\
+	wsug_graphics/toolbar/stock_search_24.png		\
+	wsug_graphics/toolbar/stock_stop_24.png		\
+	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/wireshark-logo.png			\
+	wsug_graphics/wireshark-main.png
 
 WSDG_FILES =	\
 	wsdg_src/WSDG_chapter_build_intro.xml	\
@@ -271,21 +271,21 @@ wsug.validated: $(WSUG_SOURCE)
 # create html single page file
 user-guide.html: $(WSUG_SOURCE)
 	@ echo --- WSUG - HTML SINGLE PAGE ---
-	mkdir -p wsug_html/graphics/toolbar
-	cp graphics/*.* wsug_html/graphics
-	cp graphics/toolbar/* wsug_html/graphics/toolbar
+	mkdir -p wsug_html/wsug_graphics/toolbar
+	cp wsug_graphics/*.* wsug_html/wsug_graphics
+	cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar
 	cp ws.css wsug_html
-	$(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > wsug_html/$@
+	$(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > wsug_html/$@
 	-chmod -R og+rX wsug_html
 	
 # create html chunked page files
 wsug_html_chunked: $(WSUG_SOURCE)
 	@ echo --- WSUG - HTML CHUNKED ---
-	mkdir -p wsug_html_chunked/graphics/toolbar
-	cp graphics/*.* wsug_html_chunked/graphics
-	cp graphics/toolbar/* wsug_html_chunked/graphics/toolbar
+	mkdir -p wsug_html_chunked/wsug_graphics/toolbar
+	cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics
+	cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar
 	cp ws.css wsug_html_chunked
-	$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
+	$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
 	-chmod -R og+rX wsug_html_chunked
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
@@ -308,10 +308,10 @@ endif
 user-guide.chm: $(WSUG_SOURCE)
 ifdef HHC
 	@ echo --- WSUG - MICROSOFT HTML HELP ---
-	mkdir -p wsug_chm/graphics/toolbar
-	-cp graphics/*.* wsug_chm/graphics/
-	-cp graphics/toolbar/* wsug_chm/graphics/toolbar/
-	$(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1  --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
+	mkdir -p wsug_chm/wsug_graphics/toolbar
+	-cp wsug_graphics/*.* wsug_chm/wsug_graphics/
+	-cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar/
+	$(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1  --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
 	-$(HHC) htmlhelp.hhp
 	-mv htmlhelp.chm $@
 	-rm -r htmlhelp.hhp
@@ -414,7 +414,7 @@ endif
 release-notes.chm: $(RELEASE_NOTES_SOURCE)
 ifdef HHC
 	@ echo --- RELEASE NOTES - MICROSOFT HTML HELP ---
-	$(XSLTPROC) --stringparam base.dir release_notes_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
+	$(XSLTPROC) --stringparam base.dir release_notes_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
 	-$(HHC) htmlhelp.hhp
 	-mv htmlhelp.chm $@
 	-rm -r htmlhelp.hhp
diff --git a/docbook/Makefile.auto.am b/docbook/Makefile.auto.am
index 85dd07d22e..d444ba8536 100644
--- a/docbook/Makefile.auto.am
+++ b/docbook/Makefile.auto.am
@@ -45,21 +45,21 @@ wsug_validate:
 wsug_html:
 	@ echo --- HTML SINGLE PAGE ---
 	mkdir -p wsug_html
-	mkdir -p wsug_html/graphics
-	mkdir -p wsug_html/graphics/toolbar
-	cp ./graphics/*.* wsug_html/graphics
-	cp ./graphics/toolbar/*.* wsug_html/graphics/toolbar
+	mkdir -p wsug_html/wsug_graphics
+	mkdir -p wsug_html/wsug_graphics/toolbar
+	cp ./wsug_graphics/*.* wsug_html/wsug_graphics
+	cp ./wsug_graphics/toolbar/*.* wsug_html/wsug_graphics/toolbar
 	$(XSLTPROC) --nonet $(DOCBOOKXSL)/html/docbook.xsl user-guide.xml > wsug_html/user-guide.html
 	
 # create html chunked page files
 wsug_html_chunked:
 	@ echo --- HTML CHUNKED ---
 	mkdir -p wsug_html_chunked
-	mkdir -p wsug_html_chunked/graphics
-	mkdir -p wsug_html_chunked/graphics/toolbar
-	cp ./graphics/*.* wsug_html_chunked/graphics
-	cp ./graphics/toolbar/*.* wsug_html_chunked/graphics/toolbar
-	$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/html/chunk.xsl user-guide.xml
+	mkdir -p wsug_html_chunked/wsug_graphics
+	mkdir -p wsug_html_chunked/wsug_graphics/toolbar
+	cp ./wsug_graphics/*.* wsug_html_chunked/wsug_graphics
+	cp ./wsug_graphics/toolbar/*.* wsug_html_chunked/wsug_graphics/toolbar
+	$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/html/chunk.xsl user-guide.xml
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
 # you will get lot's of errors, but that's ok
@@ -84,11 +84,11 @@ wsug_chm:
 if HAVE_HHC
 	@ echo --- MICROSOFT HTML HELP ---
 	mkdir -p wsug_chm
-	mkdir -p wsug_chm/graphics
-	mkdir -p wsug_chm/graphics/toolbar
-	cp ./graphics/*.* wsug_chm/graphics
-	cp ./graphics/toolbar/*.* wsug_chm/graphics/toolbar
-	$(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/htmlhelp/htmlhelp.xsl user-guide.xml
+	mkdir -p wsug_chm/wsug_graphics
+	mkdir -p wsug_chm/wsug_graphics/toolbar
+	cp ./wsug_graphics/*.* wsug_chm/wsug_graphics
+	cp ./wsug_graphics/toolbar/*.* wsug_chm/wsug_graphics/toolbar
+	$(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/htmlhelp/htmlhelp.xsl user-guide.xml
 	-$(HHC) htmlhelp.hhp
 	mv htmlhelp.chm user-guide.chm
 	rm -r htmlhelp.hhp
@@ -107,21 +107,21 @@ wsdg_validate:
 wsdg_html:
 	@ echo --- HTML SINGLE PAGE ---
 	mkdir -p wsdg_html
-	mkdir -p wsdg_html/graphics
-	mkdir -p wsdg_html/graphics/toolbar
-	cp ./graphics/*.* wsdg_html/graphics
-	cp ./graphics/toolbar/*.* wsdg_html/graphics/toolbar
+	mkdir -p wsdg_html/wsdg_graphics
+	mkdir -p wsdg_html/wsdg_graphics/toolbar
+	cp ./wsdg_graphics/*.* wsdg_html/wsdg_graphics
+	cp ./wsdg_graphics/toolbar/*.* wsdg_html/wsdg_graphics/toolbar
 	$(XSLTPROC) --nonet $(DOCBOOKXSL)/html/docbook.xsl developer-guide.xml > wsdg_html/developer-guide.html
 	
 # create html chunked page files
 wsdg_html_chunked:
 	@ echo --- HTML CHUNKED ---
 	mkdir -p wsdg_html_chunked
-	mkdir -p wsdg_html_chunked/graphics
-	mkdir -p wsdg_html_chunked/graphics/toolbar
-	cp ./graphics/*.* wsdg_html_chunked/graphics
-	cp ./graphics/toolbar/*.* wsdg_html_chunked/graphics/toolbar
-	$(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/html/chunk.xsl developer-guide.xml
+	mkdir -p wsdg_html_chunked/wsdg_graphics
+	mkdir -p wsdg_html_chunked/wsdg_graphics/toolbar
+	cp ./wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics
+	cp ./wsdg_graphics/toolbar/*.* wsdg_html_chunked/wsdg_graphics/toolbar
+	$(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/html/chunk.xsl developer-guide.xml
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
 # you will get lot's of errors, but that's ok
@@ -146,11 +146,11 @@ wsdg_chm:
 if HAVE_HHC
 	@ echo --- MICROSOFT HTML HELP ---
 	mkdir -p wsdg_chm
-	mkdir -p wsdg_chm/graphics
-	mkdir -p wsdg_chm/graphics/toolbar
-	cp ./graphics/*.* wsdg_chm/graphics
-	cp ./graphics/toolbar/*.* wsdg_chm/graphics/toolbar
-	$(XSLTPROC) --stringparam base.dir wsdg_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/htmlhelp/htmlhelp.xsl developer-guide.xml
+	mkdir -p wsdg_chm/wsdg_graphics
+	mkdir -p wsdg_chm/wsdg_graphics/toolbar
+	cp ./wsdg_graphics/*.* wsdg_chm/wsdg_graphics
+	cp ./wsdg_graphics/toolbar/*.* wsdg_chm/wsdg_graphics/toolbar
+	$(XSLTPROC) --stringparam base.dir wsdg_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/htmlhelp/htmlhelp.xsl developer-guide.xml
 	-$(HHC) htmlhelp.hhp
 	mv htmlhelp.chm developer-guide.chm
 	rm -r htmlhelp.hhp
diff --git a/docbook/custom_layer_pdf.xsl b/docbook/custom_layer_pdf.xsl
index a982dd7deb..8207ba3eee 100644
--- a/docbook/custom_layer_pdf.xsl
+++ b/docbook/custom_layer_pdf.xsl
@@ -12,7 +12,7 @@
 
 <!-- use graphics for admons (note, tip, ...) -->
 <xsl:param name="admon.graphics" select="1"/>
-<xsl:param name="admon.graphics.path">graphics/</xsl:param>
+<xsl:param name="admon.graphics.path">wsug_graphics/</xsl:param>
 <xsl:param name="admon.graphics.extension" select="'.png'"/>
 
 <!-- use numbering for sections (not only for chapters) -->
diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index b33b9ba0cb..2d06cf98b9 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -128,127 +128,127 @@ FILE SECTION
 -->
 <!-- These refer to graphics files and figures contained in the document -->
   <!-- -->
-  <!ENTITY WiresharkLogo SYSTEM "./graphics/wireshark-logo.png" NDATA PNG>
+  <!ENTITY WiresharkLogo SYSTEM "./wsug_graphics/wireshark-logo.png" NDATA PNG>
   
   <!-- 1st Chapter -->
-  <!ENTITY WiresharkMain1 SYSTEM "./graphics/wireshark-main.png" NDATA PNG>
+  <!ENTITY WiresharkMain1 SYSTEM "./wsug_graphics/wireshark-main.png" NDATA PNG>
 
   <!-- 2nd Chapter -->
 
   <!-- Third Chapter -->
-  <!ENTITY WiresharkEmpty SYSTEM "./graphics/ethereal-empty.png" NDATA PNG>
-  <!ENTITY WiresharkThreePane1 SYSTEM "./graphics/wireshark-main.png" NDATA PNG>
-  <!ENTITY WiresharkMenuOnly SYSTEM "./graphics/ethereal-menu.png" NDATA PNG>
-  <!ENTITY WiresharkMainToolbar SYSTEM "./graphics/ethereal-main-toolbar.png" NDATA PNG>
-  <!ENTITY WiresharkFilterToolbar SYSTEM "./graphics/ethereal-filter-toolbar.png" NDATA PNG>
-  <!ENTITY WiresharkListPane SYSTEM "./graphics/ethereal-list-pane.png" NDATA PNG>
-  <!ENTITY WiresharkDetailsPane SYSTEM "./graphics/ethereal-details-pane.png" NDATA PNG>
-  <!ENTITY WiresharkBytesPane SYSTEM "./graphics/ethereal-bytes-pane.png" NDATA PNG>
-  <!ENTITY WiresharkBytesPaneTabs SYSTEM "./graphics/ethereal-bytes-pane-tabs.png" NDATA PNG>
-  <!ENTITY WiresharkStatusbarEmpty SYSTEM "./graphics/ethereal-statusbar-empty.png" NDATA PNG>
-  <!ENTITY WiresharkStatusbarLoaded SYSTEM "./graphics/ethereal-statusbar-loaded.png" NDATA PNG>
-  <!ENTITY WiresharkStatusbarSelected SYSTEM "./graphics/ethereal-statusbar-selected.png" NDATA PNG>
-  <!ENTITY WiresharkSaveAs SYSTEM "./graphics/ethereal-save-as.png" NDATA PNG>
-  <!ENTITY WiresharkOpen SYSTEM "./graphics/ethereal-open.png" NDATA PNG> 
-  <!ENTITY WiresharkPacketSelected1 SYSTEM "./graphics/ethereal-packet-selected.png" NDATA PNG>
-  <!ENTITY WiresharkPacketSepView SYSTEM "./graphics/ethereal-packet-sep-win.png" NDATA PNG>
-  <!ENTITY WiresharkFilterTCP SYSTEM "./graphics/ethereal-display-filter-tcp.png" NDATA PNG>  
-  <!ENTITY WiresharkColoringRulesDialog SYSTEM "./graphics/ethereal-coloring-rules-dialog.png" NDATA PNG>
-  <!ENTITY WiresharkEditColorDialog SYSTEM "./graphics/ethereal-edit-color-rule-dialog.png" NDATA PNG>
-  <!ENTITY WiresharkChooseColorDialog SYSTEM "./graphics/ethereal-choose-color-rule.png" NDATA PNG>
-  <!ENTITY WiresharkFollowStream SYSTEM "./graphics/ethereal-follow-stream.png" NDATA PNG>
-  <!ENTITY WiresharkFindPacket SYSTEM "./graphics/ethereal-find-packet.png" NDATA PNG>  
-  <!ENTITY WiresharkGoToPacket SYSTEM "./graphics/ethereal-goto-packet.png" NDATA PNG>  
-  <!ENTITY WiresharkPrint SYSTEM "./graphics/ethereal-print.png" NDATA PNG>
-  <!ENTITY WiresharkGUIPreferences SYSTEM "./graphics/ethereal-gui-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkGUILayoutPreferences SYSTEM "./graphics/ethereal-gui-layout-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkGUIColumnsPreferences SYSTEM "./graphics/ethereal-gui-columns-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkGUIFontPreferences SYSTEM "./graphics/ethereal-gui-font-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkGUIColorsPreferences SYSTEM "./graphics/ethereal-gui-colors-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkCapturePreferences SYSTEM "./graphics/ethereal-capture-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkPrintingPreferences SYSTEM "./graphics/ethereal-printing-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkNameResolutionPreferences SYSTEM "./graphics/ethereal-nameresolution-preferences.png" NDATA PNG>
-  <!ENTITY WiresharkFilters SYSTEM "./graphics/ethereal-filters.png" NDATA PNG>
-  <!ENTITY WiresharkFileMenu SYSTEM "./graphics/ethereal-file-menu.png" NDATA PNG>
-  <!ENTITY WiresharkEditMenu SYSTEM "./graphics/ethereal-edit-menu.png" NDATA PNG>
-  <!ENTITY WiresharkViewMenu SYSTEM "./graphics/ethereal-view-menu.png" NDATA PNG>
-  <!ENTITY WiresharkGoMenu SYSTEM "./graphics/ethereal-go-menu.png" NDATA PNG>
-  <!ENTITY WiresharkCaptureMenu SYSTEM "./graphics/ethereal-capture-menu.png" NDATA PNG>
-  <!ENTITY WiresharkAnalyzeMenu SYSTEM "./graphics/ethereal-analyze-menu.png" NDATA PNG>
-  <!ENTITY WiresharkStatisticsMenu SYSTEM "./graphics/ethereal-statistics-menu.png" NDATA PNG>
-  <!ENTITY WiresharkHelpMenu SYSTEM "./graphics/ethereal-help-menu.png" NDATA PNG>
-  <!ENTITY WiresharkPacketPanePopupMenu SYSTEM "./graphics/ethereal-packet-pane-popup-menu.png" NDATA PNG>
-  <!ENTITY WiresharkDetailsPanePopupMenu SYSTEM "./graphics/ethereal-details-pane-popup-menu.png" NDATA PNG>
-  <!ENTITY WiresharkBytesPanePopupMenu SYSTEM "./graphics/ethereal-bytes-pane-popup-menu.png" NDATA PNG>
-  <!ENTITY WiresharkFilterAddExpression SYSTEM "./graphics/ethereal-filter-add-expression.png" NDATA PNG>
-  <!ENTITY WiresharkFilters2 SYSTEM "./graphics/ethereal-filters-2.png" NDATA PNG>
-  <!ENTITY WiresharkExportPlainDialog SYSTEM "./graphics/ethereal-export-plain.png" NDATA PNG>
-  <!ENTITY WiresharkExportPSDialog SYSTEM "./graphics/ethereal-export-ps.png" NDATA PNG>
-  <!ENTITY WiresharkExportPSMLDialog SYSTEM "./graphics/ethereal-export-psml.png" NDATA PNG>
-  <!ENTITY WiresharkExportPDMLDialog SYSTEM "./graphics/ethereal-export-pdml.png" NDATA PNG>
-  <!ENTITY WiresharkExportSelectedDialog SYSTEM "./graphics/ethereal-export-selected.png" NDATA PNG>
-  <!ENTITY WiresharkCaptureInterfacesDialog SYSTEM "./graphics/ethereal-capture-interfaces.png" NDATA PNG>
-  <!ENTITY WiresharkCaptureOptionsDialog SYSTEM "./graphics/ethereal-capture-options.png" NDATA PNG>
-  <!ENTITY WiresharkCaptureInfoDialog SYSTEM "./graphics/ethereal-capture-info.png" NDATA PNG>
-  <!ENTITY WiresharkMergeDialog SYSTEM "./graphics/ethereal-merge.png" NDATA PNG>
-  <!ENTITY WiresharkPacketRangeFrame SYSTEM "./graphics/ethereal-packet-range.png" NDATA PNG>
-  <!ENTITY WiresharkPacketFormatFrame SYSTEM "./graphics/ethereal-packet-format.png" NDATA PNG>
-  <!ENTITY WiresharkTimeReference SYSTEM "./graphics/ethereal-time-reference.png" NDATA PNG>
-  <!ENTITY WiresharkEnabledProtocols SYSTEM "./graphics/ethereal-enabled-protocols.png" NDATA PNG>
-  <!ENTITY WiresharkDecodeAs SYSTEM "./graphics/ethereal-decode-as.png" NDATA PNG>
-  <!ENTITY WiresharkDecodeAsShow SYSTEM "./graphics/ethereal-decode-as-show.png" NDATA PNG>
-  <!ENTITY WiresharkFileSetDialog SYSTEM "./graphics/ethereal-file-set-dialog.png" NDATA PNG>
+  <!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>
 
   <!-- Third Chapter Toolbar-->
-  <!ENTITY WiresharkToolbarCaptureInterfaces SYSTEM "./graphics/toolbar/capture_interfaces_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarCaptureOptions SYSTEM "./graphics/toolbar/capture_options_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarCaptureStart SYSTEM "./graphics/toolbar/capture_start_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarCaptureStop SYSTEM "./graphics/toolbar/capture_stop_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarCaptureRestart SYSTEM "./graphics/toolbar/capture_restart_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarCaptureFilters SYSTEM "./graphics/toolbar/capture_filter_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarDisplayFilters SYSTEM "./graphics/toolbar/display_filter_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarAdd SYSTEM "./graphics/toolbar/stock_add_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarGoLast SYSTEM "./graphics/toolbar/stock_bottom_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarClose SYSTEM "./graphics/toolbar/stock_close_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarColoringRules SYSTEM "./graphics/toolbar/stock_colorselector_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarHelp SYSTEM "./graphics/toolbar/stock_help_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarGoTo SYSTEM "./graphics/toolbar/stock_jump_to_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarGoBack SYSTEM "./graphics/toolbar/stock_left_arrow_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarOpen SYSTEM "./graphics/toolbar/stock_open_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarPreferences SYSTEM "./graphics/toolbar/stock_preferences_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarPrint SYSTEM "./graphics/toolbar/stock_print_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarProperties SYSTEM "./graphics/toolbar/stock_properties_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarReload SYSTEM "./graphics/toolbar/stock_refresh_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarGoForward SYSTEM "./graphics/toolbar/stock_right_arrow_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarSave SYSTEM "./graphics/toolbar/stock_save_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarSaveAs SYSTEM "./graphics/toolbar/stock_save_as_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarFind SYSTEM "./graphics/toolbar/stock_search_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarStop SYSTEM "./graphics/toolbar/stock_stop_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarGoFirst SYSTEM "./graphics/toolbar/stock_top_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarZoom100 SYSTEM "./graphics/toolbar/stock_zoom_1_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarZoomIn SYSTEM "./graphics/toolbar/stock_zoom_in_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarZoomOut SYSTEM "./graphics/toolbar/stock_zoom_out_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarColorize SYSTEM "./graphics/toolbar/colorize_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarAutoScroll SYSTEM "./graphics/toolbar/autoscroll_24.png" NDATA PNG>
-  <!ENTITY WiresharkToolbarResizeColumns SYSTEM "./graphics/toolbar/resize_columns_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarCaptureInterfaces SYSTEM "./wsug_graphics/toolbar/capture_interfaces_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarCaptureOptions SYSTEM "./wsug_graphics/toolbar/capture_options_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarCaptureStart SYSTEM "./wsug_graphics/toolbar/capture_start_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarCaptureStop SYSTEM "./wsug_graphics/toolbar/capture_stop_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarCaptureRestart SYSTEM "./wsug_graphics/toolbar/capture_restart_24.png" NDATA PNG>
+  <!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 WiresharkToolbarGoLast SYSTEM "./wsug_graphics/toolbar/stock_bottom_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>
+  <!ENTITY WiresharkToolbarGoTo SYSTEM "./wsug_graphics/toolbar/stock_jump_to_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarGoBack SYSTEM "./wsug_graphics/toolbar/stock_left_arrow_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarOpen SYSTEM "./wsug_graphics/toolbar/stock_open_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarPreferences SYSTEM "./wsug_graphics/toolbar/stock_preferences_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarPrint SYSTEM "./wsug_graphics/toolbar/stock_print_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarProperties SYSTEM "./wsug_graphics/toolbar/stock_properties_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarReload SYSTEM "./wsug_graphics/toolbar/stock_refresh_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarGoForward SYSTEM "./wsug_graphics/toolbar/stock_right_arrow_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarSave SYSTEM "./wsug_graphics/toolbar/stock_save_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarSaveAs SYSTEM "./wsug_graphics/toolbar/stock_save_as_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarFind SYSTEM "./wsug_graphics/toolbar/stock_search_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarStop SYSTEM "./wsug_graphics/toolbar/stock_stop_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarGoFirst SYSTEM "./wsug_graphics/toolbar/stock_top_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarZoom100 SYSTEM "./wsug_graphics/toolbar/stock_zoom_1_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarZoomIn SYSTEM "./wsug_graphics/toolbar/stock_zoom_in_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarZoomOut SYSTEM "./wsug_graphics/toolbar/stock_zoom_out_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarColorize SYSTEM "./wsug_graphics/toolbar/colorize_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarAutoScroll SYSTEM "./wsug_graphics/toolbar/autoscroll_24.png" NDATA PNG>
+  <!ENTITY WiresharkToolbarResizeColumns SYSTEM "./wsug_graphics/toolbar/resize_columns_24.png" NDATA PNG>
 
   <!-- Third Chapter Statistics -->
-  <!ENTITY WiresharkStatsSummary SYSTEM "./graphics/ethereal-stats-summary.png" NDATA PNG>
-  <!ENTITY WiresharkStatsHierarchy SYSTEM "./graphics/ethereal-stats-hierarchy.png" NDATA PNG>
-  <!ENTITY WiresharkStatsEndpoints SYSTEM "./graphics/ethereal-stats-endpoints.png" NDATA PNG>
-  <!ENTITY WiresharkStatsConversations SYSTEM "./graphics/ethereal-stats-conversations.png" NDATA PNG>
-  <!ENTITY WiresharkStatsIOGraphs SYSTEM "./graphics/ethereal-stats-iographs.png" NDATA PNG>
-  <!ENTITY WiresharkStatsSrtDcerpcFilter SYSTEM "./graphics/ethereal-stats-srt-dcerpc-filter.png" NDATA PNG>
-  <!ENTITY WiresharkStatsSrtDcerpc SYSTEM "./graphics/ethereal-stats-srt-dcerpc.png" NDATA PNG>
+  <!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>
 
   <!-- Fifth Chapter -->
 
   <!-- Sixth Chapter -->
 
   <!-- Appendices etc -->
-  <!ENTITY WiresharkFormatError SYSTEM "./graphics/ethereal-error-open.png" NDATA PNG>
-  <!ENTITY WiresharkFormatError SYSTEM "./graphics/ethereal-error-open.png" NDATA PNG>
-  <!ENTITY WiresharkSaveError SYSTEM "./graphics/ethereal-save-error.png" NDATA PNG>
+  <!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>
 
 
 <!-- These are the actual files that make up the document -->
diff --git a/docbook/graphics/ethereal-3pane.png b/docbook/wsug_graphics/ethereal-3pane.png
index bbab65cdae..bbab65cdae 100644
--- a/docbook/graphics/ethereal-3pane.png
+++ b/docbook/wsug_graphics/ethereal-3pane.png
diff --git a/docbook/graphics/ethereal-analyze-menu.png b/docbook/wsug_graphics/ethereal-analyze-menu.png
index 1613c0d1bf..1613c0d1bf 100644
--- a/docbook/graphics/ethereal-analyze-menu.png
+++ b/docbook/wsug_graphics/ethereal-analyze-menu.png
diff --git a/docbook/graphics/ethereal-bytes-pane-popup-menu.png b/docbook/wsug_graphics/ethereal-bytes-pane-popup-menu.png
index 64e65e55c2..64e65e55c2 100644
--- a/docbook/graphics/ethereal-bytes-pane-popup-menu.png
+++ b/docbook/wsug_graphics/ethereal-bytes-pane-popup-menu.png
diff --git a/docbook/graphics/ethereal-bytes-pane-tabs.png b/docbook/wsug_graphics/ethereal-bytes-pane-tabs.png
index 422b56e3ed..422b56e3ed 100644
--- a/docbook/graphics/ethereal-bytes-pane-tabs.png
+++ b/docbook/wsug_graphics/ethereal-bytes-pane-tabs.png
diff --git a/docbook/graphics/ethereal-bytes-pane.png b/docbook/wsug_graphics/ethereal-bytes-pane.png
index ed396fcb42..ed396fcb42 100644
--- a/docbook/graphics/ethereal-bytes-pane.png
+++ b/docbook/wsug_graphics/ethereal-bytes-pane.png
diff --git a/docbook/graphics/ethereal-capture-info.png b/docbook/wsug_graphics/ethereal-capture-info.png
index d31e09e655..d31e09e655 100644
--- a/docbook/graphics/ethereal-capture-info.png
+++ b/docbook/wsug_graphics/ethereal-capture-info.png
diff --git a/docbook/graphics/ethereal-capture-interfaces.png b/docbook/wsug_graphics/ethereal-capture-interfaces.png
index 9f5b6691ff..9f5b6691ff 100644
--- a/docbook/graphics/ethereal-capture-interfaces.png
+++ b/docbook/wsug_graphics/ethereal-capture-interfaces.png
diff --git a/docbook/graphics/ethereal-capture-menu.png b/docbook/wsug_graphics/ethereal-capture-menu.png
index ef831ab89f..ef831ab89f 100644
--- a/docbook/graphics/ethereal-capture-menu.png
+++ b/docbook/wsug_graphics/ethereal-capture-menu.png
diff --git a/docbook/graphics/ethereal-capture-options.png b/docbook/wsug_graphics/ethereal-capture-options.png
index f641be2dc5..f641be2dc5 100644
--- a/docbook/graphics/ethereal-capture-options.png
+++ b/docbook/wsug_graphics/ethereal-capture-options.png
diff --git a/docbook/graphics/ethereal-capture-preferences.png b/docbook/wsug_graphics/ethereal-capture-preferences.png
index 84448f611f..84448f611f 100644
--- a/docbook/graphics/ethereal-capture-preferences.png
+++ b/docbook/wsug_graphics/ethereal-capture-preferences.png
diff --git a/docbook/graphics/ethereal-choose-color-rule.png b/docbook/wsug_graphics/ethereal-choose-color-rule.png
index db8a3f0d57..db8a3f0d57 100644
--- a/docbook/graphics/ethereal-choose-color-rule.png
+++ b/docbook/wsug_graphics/ethereal-choose-color-rule.png
diff --git a/docbook/graphics/ethereal-coloring-rules-dialog.png b/docbook/wsug_graphics/ethereal-coloring-rules-dialog.png
index 172ee6f2f9..172ee6f2f9 100644
--- a/docbook/graphics/ethereal-coloring-rules-dialog.png
+++ b/docbook/wsug_graphics/ethereal-coloring-rules-dialog.png
diff --git a/docbook/graphics/ethereal-decode-as-show.png b/docbook/wsug_graphics/ethereal-decode-as-show.png
index 3a28cc895b..3a28cc895b 100644
--- a/docbook/graphics/ethereal-decode-as-show.png
+++ b/docbook/wsug_graphics/ethereal-decode-as-show.png
diff --git a/docbook/graphics/ethereal-decode-as.png b/docbook/wsug_graphics/ethereal-decode-as.png
index 89da973544..89da973544 100644
--- a/docbook/graphics/ethereal-decode-as.png
+++ b/docbook/wsug_graphics/ethereal-decode-as.png
diff --git a/docbook/graphics/ethereal-details-pane-popup-menu.png b/docbook/wsug_graphics/ethereal-details-pane-popup-menu.png
index df3c9dd825..df3c9dd825 100644
--- a/docbook/graphics/ethereal-details-pane-popup-menu.png
+++ b/docbook/wsug_graphics/ethereal-details-pane-popup-menu.png
diff --git a/docbook/graphics/ethereal-details-pane.png b/docbook/wsug_graphics/ethereal-details-pane.png
index 3abdf6a0ee..3abdf6a0ee 100644
--- a/docbook/graphics/ethereal-details-pane.png
+++ b/docbook/wsug_graphics/ethereal-details-pane.png
diff --git a/docbook/graphics/ethereal-display-filter-tcp.png b/docbook/wsug_graphics/ethereal-display-filter-tcp.png
index 4af9792301..4af9792301 100644
--- a/docbook/graphics/ethereal-display-filter-tcp.png
+++ b/docbook/wsug_graphics/ethereal-display-filter-tcp.png
diff --git a/docbook/graphics/ethereal-edit-color-rule-dialog.png b/docbook/wsug_graphics/ethereal-edit-color-rule-dialog.png
index 61e695a0c7..61e695a0c7 100644
--- a/docbook/graphics/ethereal-edit-color-rule-dialog.png
+++ b/docbook/wsug_graphics/ethereal-edit-color-rule-dialog.png
diff --git a/docbook/graphics/ethereal-edit-menu.png b/docbook/wsug_graphics/ethereal-edit-menu.png
index 0ada936c0f..0ada936c0f 100644
--- a/docbook/graphics/ethereal-edit-menu.png
+++ b/docbook/wsug_graphics/ethereal-edit-menu.png
diff --git a/docbook/graphics/ethereal-empty.png b/docbook/wsug_graphics/ethereal-empty.png
index 7238f70fe2..7238f70fe2 100644
--- a/docbook/graphics/ethereal-empty.png
+++ b/docbook/wsug_graphics/ethereal-empty.png
diff --git a/docbook/graphics/ethereal-enabled-protocols.png b/docbook/wsug_graphics/ethereal-enabled-protocols.png
index ed260c89c0..ed260c89c0 100644
--- a/docbook/graphics/ethereal-enabled-protocols.png
+++ b/docbook/wsug_graphics/ethereal-enabled-protocols.png
diff --git a/docbook/graphics/ethereal-error-file-exists.png b/docbook/wsug_graphics/ethereal-error-file-exists.png
index 3f6861d97e..3f6861d97e 100644
--- a/docbook/graphics/ethereal-error-file-exists.png
+++ b/docbook/wsug_graphics/ethereal-error-file-exists.png
diff --git a/docbook/graphics/ethereal-error-open.png b/docbook/wsug_graphics/ethereal-error-open.png
index 6b4b633d69..6b4b633d69 100644
--- a/docbook/graphics/ethereal-error-open.png
+++ b/docbook/wsug_graphics/ethereal-error-open.png
diff --git a/docbook/graphics/ethereal-export-pdml.png b/docbook/wsug_graphics/ethereal-export-pdml.png
index 4e6565d1eb..4e6565d1eb 100644
--- a/docbook/graphics/ethereal-export-pdml.png
+++ b/docbook/wsug_graphics/ethereal-export-pdml.png
diff --git a/docbook/graphics/ethereal-export-plain.png b/docbook/wsug_graphics/ethereal-export-plain.png
index fade1c17a1..fade1c17a1 100644
--- a/docbook/graphics/ethereal-export-plain.png
+++ b/docbook/wsug_graphics/ethereal-export-plain.png
diff --git a/docbook/graphics/ethereal-export-ps.png b/docbook/wsug_graphics/ethereal-export-ps.png
index c15f746b65..c15f746b65 100644
--- a/docbook/graphics/ethereal-export-ps.png
+++ b/docbook/wsug_graphics/ethereal-export-ps.png
diff --git a/docbook/graphics/ethereal-export-psml.png b/docbook/wsug_graphics/ethereal-export-psml.png
index ae7ef1f138..ae7ef1f138 100644
--- a/docbook/graphics/ethereal-export-psml.png
+++ b/docbook/wsug_graphics/ethereal-export-psml.png
diff --git a/docbook/graphics/ethereal-export-selected.png b/docbook/wsug_graphics/ethereal-export-selected.png
index 22977f6858..22977f6858 100644
--- a/docbook/graphics/ethereal-export-selected.png
+++ b/docbook/wsug_graphics/ethereal-export-selected.png
diff --git a/docbook/graphics/ethereal-file-menu.png b/docbook/wsug_graphics/ethereal-file-menu.png
index 312a5adf4b..312a5adf4b 100644
--- a/docbook/graphics/ethereal-file-menu.png
+++ b/docbook/wsug_graphics/ethereal-file-menu.png
diff --git a/docbook/graphics/ethereal-file-set-dialog.png b/docbook/wsug_graphics/ethereal-file-set-dialog.png
index 27123c6fa0..27123c6fa0 100644
--- a/docbook/graphics/ethereal-file-set-dialog.png
+++ b/docbook/wsug_graphics/ethereal-file-set-dialog.png
diff --git a/docbook/graphics/ethereal-filter-add-expression.png b/docbook/wsug_graphics/ethereal-filter-add-expression.png
index 213471fb01..213471fb01 100644
--- a/docbook/graphics/ethereal-filter-add-expression.png
+++ b/docbook/wsug_graphics/ethereal-filter-add-expression.png
diff --git a/docbook/graphics/ethereal-filter-toolbar.png b/docbook/wsug_graphics/ethereal-filter-toolbar.png
index 541d6f9d3f..541d6f9d3f 100644
--- a/docbook/graphics/ethereal-filter-toolbar.png
+++ b/docbook/wsug_graphics/ethereal-filter-toolbar.png
diff --git a/docbook/graphics/ethereal-filters-2.png b/docbook/wsug_graphics/ethereal-filters-2.png
index 6e66068dd3..6e66068dd3 100644
--- a/docbook/graphics/ethereal-filters-2.png
+++ b/docbook/wsug_graphics/ethereal-filters-2.png
diff --git a/docbook/graphics/ethereal-filters.png b/docbook/wsug_graphics/ethereal-filters.png
index 8fcf83f0fe..8fcf83f0fe 100644
--- a/docbook/graphics/ethereal-filters.png
+++ b/docbook/wsug_graphics/ethereal-filters.png
diff --git a/docbook/graphics/ethereal-find-packet.png b/docbook/wsug_graphics/ethereal-find-packet.png
index 50f5b53492..50f5b53492 100644
--- a/docbook/graphics/ethereal-find-packet.png
+++ b/docbook/wsug_graphics/ethereal-find-packet.png
diff --git a/docbook/graphics/ethereal-follow-stream.png b/docbook/wsug_graphics/ethereal-follow-stream.png
index f1bcad2006..f1bcad2006 100644
--- a/docbook/graphics/ethereal-follow-stream.png
+++ b/docbook/wsug_graphics/ethereal-follow-stream.png
diff --git a/docbook/graphics/ethereal-go-menu.png b/docbook/wsug_graphics/ethereal-go-menu.png
index 64648e932d..64648e932d 100644
--- a/docbook/graphics/ethereal-go-menu.png
+++ b/docbook/wsug_graphics/ethereal-go-menu.png
diff --git a/docbook/graphics/ethereal-goto-packet.png b/docbook/wsug_graphics/ethereal-goto-packet.png
index d68184270d..d68184270d 100644
--- a/docbook/graphics/ethereal-goto-packet.png
+++ b/docbook/wsug_graphics/ethereal-goto-packet.png
diff --git a/docbook/graphics/ethereal-gui-colors-preferences.png b/docbook/wsug_graphics/ethereal-gui-colors-preferences.png
index f3a9c74d6e..f3a9c74d6e 100644
--- a/docbook/graphics/ethereal-gui-colors-preferences.png
+++ b/docbook/wsug_graphics/ethereal-gui-colors-preferences.png
diff --git a/docbook/graphics/ethereal-gui-columns-preferences.png b/docbook/wsug_graphics/ethereal-gui-columns-preferences.png
index 2d4ba0bdc1..2d4ba0bdc1 100644
--- a/docbook/graphics/ethereal-gui-columns-preferences.png
+++ b/docbook/wsug_graphics/ethereal-gui-columns-preferences.png
diff --git a/docbook/graphics/ethereal-gui-font-preferences.png b/docbook/wsug_graphics/ethereal-gui-font-preferences.png
index 1a4451cd34..1a4451cd34 100644
--- a/docbook/graphics/ethereal-gui-font-preferences.png
+++ b/docbook/wsug_graphics/ethereal-gui-font-preferences.png
diff --git a/docbook/graphics/ethereal-gui-layout-preferences.png b/docbook/wsug_graphics/ethereal-gui-layout-preferences.png
index 8d31efc1a5..8d31efc1a5 100644
--- a/docbook/graphics/ethereal-gui-layout-preferences.png
+++ b/docbook/wsug_graphics/ethereal-gui-layout-preferences.png
diff --git a/docbook/graphics/ethereal-gui-preferences.png b/docbook/wsug_graphics/ethereal-gui-preferences.png
index 819a5acd85..819a5acd85 100644
--- a/docbook/graphics/ethereal-gui-preferences.png
+++ b/docbook/wsug_graphics/ethereal-gui-preferences.png
diff --git a/docbook/graphics/ethereal-help-menu.png b/docbook/wsug_graphics/ethereal-help-menu.png
index a4290c7a14..a4290c7a14 100644
--- a/docbook/graphics/ethereal-help-menu.png
+++ b/docbook/wsug_graphics/ethereal-help-menu.png
diff --git a/docbook/graphics/ethereal-list-pane.png b/docbook/wsug_graphics/ethereal-list-pane.png
index fbe468a069..fbe468a069 100644
--- a/docbook/graphics/ethereal-list-pane.png
+++ b/docbook/wsug_graphics/ethereal-list-pane.png
diff --git a/docbook/graphics/ethereal-main-toolbar.png b/docbook/wsug_graphics/ethereal-main-toolbar.png
index c4c98a8509..c4c98a8509 100644
--- a/docbook/graphics/ethereal-main-toolbar.png
+++ b/docbook/wsug_graphics/ethereal-main-toolbar.png
diff --git a/docbook/graphics/ethereal-menu.png b/docbook/wsug_graphics/ethereal-menu.png
index 5d070ee3ae..5d070ee3ae 100644
--- a/docbook/graphics/ethereal-menu.png
+++ b/docbook/wsug_graphics/ethereal-menu.png
diff --git a/docbook/graphics/ethereal-merge.png b/docbook/wsug_graphics/ethereal-merge.png
index 3cc5b0a99e..3cc5b0a99e 100644
--- a/docbook/graphics/ethereal-merge.png
+++ b/docbook/wsug_graphics/ethereal-merge.png
diff --git a/docbook/graphics/ethereal-nameresolution-preferences.png b/docbook/wsug_graphics/ethereal-nameresolution-preferences.png
index bec511deef..bec511deef 100644
--- a/docbook/graphics/ethereal-nameresolution-preferences.png
+++ b/docbook/wsug_graphics/ethereal-nameresolution-preferences.png
diff --git a/docbook/graphics/ethereal-open.png b/docbook/wsug_graphics/ethereal-open.png
index 8857cf1efe..8857cf1efe 100644
--- a/docbook/graphics/ethereal-open.png
+++ b/docbook/wsug_graphics/ethereal-open.png
diff --git a/docbook/graphics/ethereal-packet-format.png b/docbook/wsug_graphics/ethereal-packet-format.png
index 69487fc654..69487fc654 100644
--- a/docbook/graphics/ethereal-packet-format.png
+++ b/docbook/wsug_graphics/ethereal-packet-format.png
diff --git a/docbook/graphics/ethereal-packet-pane-popup-menu.png b/docbook/wsug_graphics/ethereal-packet-pane-popup-menu.png
index 300f4b41d1..300f4b41d1 100644
--- a/docbook/graphics/ethereal-packet-pane-popup-menu.png
+++ b/docbook/wsug_graphics/ethereal-packet-pane-popup-menu.png
diff --git a/docbook/graphics/ethereal-packet-range.png b/docbook/wsug_graphics/ethereal-packet-range.png
index 959914e318..959914e318 100644
--- a/docbook/graphics/ethereal-packet-range.png
+++ b/docbook/wsug_graphics/ethereal-packet-range.png
diff --git a/docbook/graphics/ethereal-packet-selected.png b/docbook/wsug_graphics/ethereal-packet-selected.png
index 0ce0180e6e..0ce0180e6e 100644
--- a/docbook/graphics/ethereal-packet-selected.png
+++ b/docbook/wsug_graphics/ethereal-packet-selected.png
diff --git a/docbook/graphics/ethereal-packet-sep-win.png b/docbook/wsug_graphics/ethereal-packet-sep-win.png
index 6c89528be5..6c89528be5 100644
--- a/docbook/graphics/ethereal-packet-sep-win.png
+++ b/docbook/wsug_graphics/ethereal-packet-sep-win.png
diff --git a/docbook/graphics/ethereal-print.png b/docbook/wsug_graphics/ethereal-print.png
index fa02ec6462..fa02ec6462 100644
--- a/docbook/graphics/ethereal-print.png
+++ b/docbook/wsug_graphics/ethereal-print.png
diff --git a/docbook/graphics/ethereal-printing-preferences.png b/docbook/wsug_graphics/ethereal-printing-preferences.png
index 94c2f047cd..94c2f047cd 100644
--- a/docbook/graphics/ethereal-printing-preferences.png
+++ b/docbook/wsug_graphics/ethereal-printing-preferences.png
diff --git a/docbook/graphics/ethereal-save-as.png b/docbook/wsug_graphics/ethereal-save-as.png
index 0a518247e4..0a518247e4 100644
--- a/docbook/graphics/ethereal-save-as.png
+++ b/docbook/wsug_graphics/ethereal-save-as.png
diff --git a/docbook/graphics/ethereal-statistics-menu.png b/docbook/wsug_graphics/ethereal-statistics-menu.png
index b1d650cc37..b1d650cc37 100644
--- a/docbook/graphics/ethereal-statistics-menu.png
+++ b/docbook/wsug_graphics/ethereal-statistics-menu.png
diff --git a/docbook/graphics/ethereal-stats-conversations.png b/docbook/wsug_graphics/ethereal-stats-conversations.png
index 8333bd1563..8333bd1563 100644
--- a/docbook/graphics/ethereal-stats-conversations.png
+++ b/docbook/wsug_graphics/ethereal-stats-conversations.png
diff --git a/docbook/graphics/ethereal-stats-endpoints.png b/docbook/wsug_graphics/ethereal-stats-endpoints.png
index 7df82a1aa6..7df82a1aa6 100644
--- a/docbook/graphics/ethereal-stats-endpoints.png
+++ b/docbook/wsug_graphics/ethereal-stats-endpoints.png
diff --git a/docbook/graphics/ethereal-stats-hierarchy.png b/docbook/wsug_graphics/ethereal-stats-hierarchy.png
index f441124a16..f441124a16 100644
--- a/docbook/graphics/ethereal-stats-hierarchy.png
+++ b/docbook/wsug_graphics/ethereal-stats-hierarchy.png
diff --git a/docbook/graphics/ethereal-stats-iographs.png b/docbook/wsug_graphics/ethereal-stats-iographs.png
index a19396e54a..a19396e54a 100644
--- a/docbook/graphics/ethereal-stats-iographs.png
+++ b/docbook/wsug_graphics/ethereal-stats-iographs.png
diff --git a/docbook/graphics/ethereal-stats-srt-dcerpc-filter.png b/docbook/wsug_graphics/ethereal-stats-srt-dcerpc-filter.png
index 15b61079c5..15b61079c5 100644
--- a/docbook/graphics/ethereal-stats-srt-dcerpc-filter.png
+++ b/docbook/wsug_graphics/ethereal-stats-srt-dcerpc-filter.png
diff --git a/docbook/graphics/ethereal-stats-srt-dcerpc.png b/docbook/wsug_graphics/ethereal-stats-srt-dcerpc.png
index c544bc6e8a..c544bc6e8a 100644
--- a/docbook/graphics/ethereal-stats-srt-dcerpc.png
+++ b/docbook/wsug_graphics/ethereal-stats-srt-dcerpc.png
diff --git a/docbook/graphics/ethereal-stats-summary.png b/docbook/wsug_graphics/ethereal-stats-summary.png
index 99928608a1..99928608a1 100644
--- a/docbook/graphics/ethereal-stats-summary.png
+++ b/docbook/wsug_graphics/ethereal-stats-summary.png
diff --git a/docbook/graphics/ethereal-statusbar-empty.png b/docbook/wsug_graphics/ethereal-statusbar-empty.png
index fb5a03afd3..fb5a03afd3 100644
--- a/docbook/graphics/ethereal-statusbar-empty.png
+++ b/docbook/wsug_graphics/ethereal-statusbar-empty.png
diff --git a/docbook/graphics/ethereal-statusbar-loaded.png b/docbook/wsug_graphics/ethereal-statusbar-loaded.png
index 1ef0ac4cbe..1ef0ac4cbe 100644
--- a/docbook/graphics/ethereal-statusbar-loaded.png
+++ b/docbook/wsug_graphics/ethereal-statusbar-loaded.png
diff --git a/docbook/graphics/ethereal-statusbar-selected.png b/docbook/wsug_graphics/ethereal-statusbar-selected.png
index b8b4bd68a3..b8b4bd68a3 100644
--- a/docbook/graphics/ethereal-statusbar-selected.png
+++ b/docbook/wsug_graphics/ethereal-statusbar-selected.png
diff --git a/docbook/graphics/ethereal-time-reference.png b/docbook/wsug_graphics/ethereal-time-reference.png
index 49315c096b..49315c096b 100644
--- a/docbook/graphics/ethereal-time-reference.png
+++ b/docbook/wsug_graphics/ethereal-time-reference.png
diff --git a/docbook/graphics/ethereal-view-menu.png b/docbook/wsug_graphics/ethereal-view-menu.png
index 9746a67216..9746a67216 100644
--- a/docbook/graphics/ethereal-view-menu.png
+++ b/docbook/wsug_graphics/ethereal-view-menu.png
diff --git a/docbook/graphics/note.png b/docbook/wsug_graphics/note.png
index 490e48c310..490e48c310 100644
--- a/docbook/graphics/note.png
+++ b/docbook/wsug_graphics/note.png
diff --git a/docbook/graphics/tip.png b/docbook/wsug_graphics/tip.png
index bbec35fc09..bbec35fc09 100644
--- a/docbook/graphics/tip.png
+++ b/docbook/wsug_graphics/tip.png
diff --git a/docbook/graphics/toolbar/autoscroll_24.png b/docbook/wsug_graphics/toolbar/autoscroll_24.png
index 8fe4cb339b..8fe4cb339b 100644
--- a/docbook/graphics/toolbar/autoscroll_24.png
+++ b/docbook/wsug_graphics/toolbar/autoscroll_24.png
diff --git a/docbook/graphics/toolbar/capture_filter_24.png b/docbook/wsug_graphics/toolbar/capture_filter_24.png
index cfadbb4e11..cfadbb4e11 100644
--- a/docbook/graphics/toolbar/capture_filter_24.png
+++ b/docbook/wsug_graphics/toolbar/capture_filter_24.png
diff --git a/docbook/graphics/toolbar/capture_interfaces_24.png b/docbook/wsug_graphics/toolbar/capture_interfaces_24.png
index 1cecb22e54..1cecb22e54 100644
--- a/docbook/graphics/toolbar/capture_interfaces_24.png
+++ b/docbook/wsug_graphics/toolbar/capture_interfaces_24.png
diff --git a/docbook/graphics/toolbar/capture_options_24.png b/docbook/wsug_graphics/toolbar/capture_options_24.png
index e7adb81cf2..e7adb81cf2 100644
--- a/docbook/graphics/toolbar/capture_options_24.png
+++ b/docbook/wsug_graphics/toolbar/capture_options_24.png
diff --git a/docbook/graphics/toolbar/capture_restart_24.png b/docbook/wsug_graphics/toolbar/capture_restart_24.png
index a60bddced5..a60bddced5 100644
--- a/docbook/graphics/toolbar/capture_restart_24.png
+++ b/docbook/wsug_graphics/toolbar/capture_restart_24.png
diff --git a/docbook/graphics/toolbar/capture_start_24.png b/docbook/wsug_graphics/toolbar/capture_start_24.png
index 8fef78b0bf..8fef78b0bf 100644
--- a/docbook/graphics/toolbar/capture_start_24.png
+++ b/docbook/wsug_graphics/toolbar/capture_start_24.png
diff --git a/docbook/graphics/toolbar/capture_stop_24.png b/docbook/wsug_graphics/toolbar/capture_stop_24.png
index 027dcf5ed1..027dcf5ed1 100644
--- a/docbook/graphics/toolbar/capture_stop_24.png
+++ b/docbook/wsug_graphics/toolbar/capture_stop_24.png
diff --git a/docbook/graphics/toolbar/colorize_24.png b/docbook/wsug_graphics/toolbar/colorize_24.png
index cec867b938..cec867b938 100644
--- a/docbook/graphics/toolbar/colorize_24.png
+++ b/docbook/wsug_graphics/toolbar/colorize_24.png
diff --git a/docbook/graphics/toolbar/display_filter_24.png b/docbook/wsug_graphics/toolbar/display_filter_24.png
index 74c0e04270..74c0e04270 100644
--- a/docbook/graphics/toolbar/display_filter_24.png
+++ b/docbook/wsug_graphics/toolbar/display_filter_24.png
diff --git a/docbook/graphics/toolbar/resize_columns_24.png b/docbook/wsug_graphics/toolbar/resize_columns_24.png
index f8c877875f..f8c877875f 100644
--- a/docbook/graphics/toolbar/resize_columns_24.png
+++ b/docbook/wsug_graphics/toolbar/resize_columns_24.png
diff --git a/docbook/graphics/toolbar/stock_add_24.png b/docbook/wsug_graphics/toolbar/stock_add_24.png
index 062d005208..062d005208 100644
--- a/docbook/graphics/toolbar/stock_add_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_add_24.png
diff --git a/docbook/graphics/toolbar/stock_bottom_24.png b/docbook/wsug_graphics/toolbar/stock_bottom_24.png
index 3f1916d42f..3f1916d42f 100644
--- a/docbook/graphics/toolbar/stock_bottom_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_bottom_24.png
diff --git a/docbook/graphics/toolbar/stock_close_24.png b/docbook/wsug_graphics/toolbar/stock_close_24.png
index b560765411..b560765411 100644
--- a/docbook/graphics/toolbar/stock_close_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_close_24.png
diff --git a/docbook/graphics/toolbar/stock_colorselector_24.png b/docbook/wsug_graphics/toolbar/stock_colorselector_24.png
index a4c5b1f6df..a4c5b1f6df 100644
--- a/docbook/graphics/toolbar/stock_colorselector_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_colorselector_24.png
diff --git a/docbook/graphics/toolbar/stock_help_24.png b/docbook/wsug_graphics/toolbar/stock_help_24.png
index aee3f0556a..aee3f0556a 100644
--- a/docbook/graphics/toolbar/stock_help_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_help_24.png
diff --git a/docbook/graphics/toolbar/stock_jump_to_24.png b/docbook/wsug_graphics/toolbar/stock_jump_to_24.png
index 52f7f60a9a..52f7f60a9a 100644
--- a/docbook/graphics/toolbar/stock_jump_to_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_jump_to_24.png
diff --git a/docbook/graphics/toolbar/stock_left_arrow_24.png b/docbook/wsug_graphics/toolbar/stock_left_arrow_24.png
index c60eb07c11..c60eb07c11 100644
--- a/docbook/graphics/toolbar/stock_left_arrow_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_left_arrow_24.png
diff --git a/docbook/graphics/toolbar/stock_open_24.png b/docbook/wsug_graphics/toolbar/stock_open_24.png
index 622b95a491..622b95a491 100644
--- a/docbook/graphics/toolbar/stock_open_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_open_24.png
diff --git a/docbook/graphics/toolbar/stock_preferences_24.png b/docbook/wsug_graphics/toolbar/stock_preferences_24.png
index f3e8bfd4fc..f3e8bfd4fc 100644
--- a/docbook/graphics/toolbar/stock_preferences_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_preferences_24.png
diff --git a/docbook/graphics/toolbar/stock_print_24.png b/docbook/wsug_graphics/toolbar/stock_print_24.png
index 309de8388c..309de8388c 100644
--- a/docbook/graphics/toolbar/stock_print_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_print_24.png
diff --git a/docbook/graphics/toolbar/stock_properties_24.png b/docbook/wsug_graphics/toolbar/stock_properties_24.png
index 946197c4a4..946197c4a4 100644
--- a/docbook/graphics/toolbar/stock_properties_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_properties_24.png
diff --git a/docbook/graphics/toolbar/stock_refresh_24.png b/docbook/wsug_graphics/toolbar/stock_refresh_24.png
index c7e691b9c7..c7e691b9c7 100644
--- a/docbook/graphics/toolbar/stock_refresh_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_refresh_24.png
diff --git a/docbook/graphics/toolbar/stock_right_arrow_24.png b/docbook/wsug_graphics/toolbar/stock_right_arrow_24.png
index 1a2162688f..1a2162688f 100644
--- a/docbook/graphics/toolbar/stock_right_arrow_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_right_arrow_24.png
diff --git a/docbook/graphics/toolbar/stock_save_24.png b/docbook/wsug_graphics/toolbar/stock_save_24.png
index b52d1d71fa..b52d1d71fa 100644
--- a/docbook/graphics/toolbar/stock_save_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_save_24.png
diff --git a/docbook/graphics/toolbar/stock_save_as_24.png b/docbook/wsug_graphics/toolbar/stock_save_as_24.png
index 23a5f7cbd2..23a5f7cbd2 100644
--- a/docbook/graphics/toolbar/stock_save_as_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_save_as_24.png
diff --git a/docbook/graphics/toolbar/stock_search_24.png b/docbook/wsug_graphics/toolbar/stock_search_24.png
index 904b1a84f9..904b1a84f9 100644
--- a/docbook/graphics/toolbar/stock_search_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_search_24.png
diff --git a/docbook/graphics/toolbar/stock_stop_24.png b/docbook/wsug_graphics/toolbar/stock_stop_24.png
index 89c212493e..89c212493e 100644
--- a/docbook/graphics/toolbar/stock_stop_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_stop_24.png
diff --git a/docbook/graphics/toolbar/stock_top_24.png b/docbook/wsug_graphics/toolbar/stock_top_24.png
index 3cb262e35d..3cb262e35d 100644
--- a/docbook/graphics/toolbar/stock_top_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_top_24.png
diff --git a/docbook/graphics/toolbar/stock_zoom_1_24.png b/docbook/wsug_graphics/toolbar/stock_zoom_1_24.png
index 8265f27840..8265f27840 100644
--- a/docbook/graphics/toolbar/stock_zoom_1_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_zoom_1_24.png
diff --git a/docbook/graphics/toolbar/stock_zoom_in_24.png b/docbook/wsug_graphics/toolbar/stock_zoom_in_24.png
index 1ac4864d4a..1ac4864d4a 100644
--- a/docbook/graphics/toolbar/stock_zoom_in_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_zoom_in_24.png
diff --git a/docbook/graphics/toolbar/stock_zoom_out_24.png b/docbook/wsug_graphics/toolbar/stock_zoom_out_24.png
index d67a87de53..d67a87de53 100644
--- a/docbook/graphics/toolbar/stock_zoom_out_24.png
+++ b/docbook/wsug_graphics/toolbar/stock_zoom_out_24.png
diff --git a/docbook/graphics/warning.png b/docbook/wsug_graphics/warning.png
index fcea8105cd..fcea8105cd 100644
--- a/docbook/graphics/warning.png
+++ b/docbook/wsug_graphics/warning.png
diff --git a/docbook/graphics/wireshark-logo.png b/docbook/wsug_graphics/wireshark-logo.png
index 20bd23c5a9..20bd23c5a9 100644
--- a/docbook/graphics/wireshark-logo.png
+++ b/docbook/wsug_graphics/wireshark-logo.png
diff --git a/docbook/graphics/wireshark-main.png b/docbook/wsug_graphics/wireshark-main.png
index 394c1e843a..394c1e843a 100644
--- a/docbook/graphics/wireshark-main.png
+++ b/docbook/wsug_graphics/wireshark-main.png