Convert admon graphics to SVG.

Use a common set of SVG files for AsciiDoc / DocBook admonition
graphics. Put them in a common directory. According to
http://caniuse.com/svg all common browsers have had SVG support for
a while now.

The graphics themselves were created with Inkscape. If you would like
to refine them further you are more than welcome.

Use variables to assemble xsltproc commands in Autotools and Nmake
while we're here.

Try to update Debian rules to reflect ga92c3fb.

Change-Id: If82647af27a60117c517125dff0aca81c033be72
Reviewed-on: https://code.wireshark.org/review/3206
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

17 files changed, 410 insertions, 63 deletions

diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake
index 2afc803926..f1b721ab81 100644
--- a/cmake/modules/FindXSLTPROC.cmake
+++ b/cmake/modules/FindXSLTPROC.cmake
@@ -68,8 +68,8 @@ MACRO(XML2HTML _guide _mode _xmlsources _gfxsources)
            -E make_directory ${_outdir}/${_gfxdir}/toolbar
         COMMAND cp
            ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/*.* ${_outdir}/${_gfxdir}/
-#        COMMAND cp
-#           ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/*.* ${_outdir}/${_gfxdir}/
+        COMMAND cp
+           ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/*.* ${_outdir}/${_gfxdir}/
         COMMAND cp
            ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/toolbar/*.* ${_outdir}/${_gfxdir}/toolbar/
         COMMAND cmake
@@ -80,12 +80,11 @@ MACRO(XML2HTML _guide _mode _xmlsources _gfxsources)
             --stringparam use.id.as.filename 1
             --stringparam admon.graphics 1
             --stringparam admon.graphics.path ${_gfxdir}/
-#            --stringparam admon.graphics.extension .svg
+            --stringparam admon.graphics.extension .svg
             --stringparam section.autolabel 1
             --stringparam section.label.includes.component.label 1
             --stringparam html.stylesheet ws.css
             --nonet
-#            --output ${_output}
             ${_STYLESHEET}
             ${_source}
         COMMAND chmod
@@ -119,8 +118,8 @@ MACRO(XML2PDF _output _sources _stylesheet _paper)
             --stringparam img.src.path ${CMAKE_CURRENT_SOURCE_DIR}/
             --stringparam use.id.as.filename 1
             --stringparam admon.graphics 1
-#            --stringparam admon.graphics.path ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/
-#            --stringparam admon.graphics.extension .svg
+            --stringparam admon.graphics.path ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/
+            --stringparam admon.graphics.extension .svg
             --nonet
             --output ${_output}.fo
             ${_stylesheet}
diff --git a/debian/rules b/debian/rules
index 8a7d9fd2cd..50842c52e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_build:
 	# create menu icon
 	convert image/wsicon32.png image/wsicon32.xpm
 	# fix links in documentation
-	sed -i "s|$(CURDIR)/docbook|..|" obj-*/docbook/ws*g_html_chunked/*
+	sed -i "s|$(CURDIR)/docbook|..|" obj-*/docbook/ws*g_html_chunked/*.html
 
 override_dh_strip:
 	dh_strip --dbg-package=wireshark-dbg
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 0bc6d572b7..e3c99fbccf 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -25,6 +25,12 @@ find_package( XSLTPROC )
 find_package( XMLLINT )
 find_package( ASCIIDOC )
 
+set(COMMON_GRAPHICS
+	common_graphics/note.svg
+	common_graphics/tip.svg
+	common_graphics/warning.svg
+)
+
 set(WSUG_FILES
 	wsug_src/WSUG_app_files.xml
 	wsug_src/WSUG_app_howitworks.xml
@@ -149,9 +155,6 @@ set(WSUG_GRAPHICS
 	wsug_graphics/ws-time-reference.png
 	wsug_graphics/ws-tools-menu.png
 	wsug_graphics/ws-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
@@ -185,6 +188,7 @@ set(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
+	${COMMON_GRAPHICS}
 )
 
 set(WSDG_FILES
@@ -210,9 +214,7 @@ set(WSDG_GRAPHICS
 	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
+	${COMMON_GRAPHICS}
 )
 
 # user-guide.xml must be first in the list
diff --git a/docbook/Makefile.am b/docbook/Makefile.am
index 2ab4929106..8e3cfffca2 100644
--- a/docbook/Makefile.am
+++ b/docbook/Makefile.am
@@ -112,14 +112,11 @@ wsug_html/index.html: $(WSUG_SOURCE) wsluarm
 	@ echo --- WSUG - HTML SINGLE PAGE ---
 	mkdir -p wsug_html/wsug_graphics/toolbar
 	cp $(srcdir)/wsug_graphics/*.* wsug_html/wsug_graphics
+	cp $(srcdir)/common_graphics/*.* wsug_html/wsug_graphics
 	cp $(srcdir)/wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar
 	cp $(srcdir)/ws.css 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 \
-		    --path .:wsluarm_src \
-		    --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@
+	$(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \
+		--path .:wsluarm_src $(SINGLE_XSLTPROC_ARGS) $< > $@
 	-chmod -R og+rX wsug_html
 
 # create html chunked page files
@@ -129,14 +126,12 @@ wsug_html_chunked/index.html: $(WSUG_SOURCE) wsluarm
 	@ echo --- WSUG - HTML CHUNKED ---
 	mkdir -p wsug_html_chunked/wsug_graphics/toolbar
 	cp $(srcdir)/wsug_graphics/*.* wsug_html_chunked/wsug_graphics
+	cp $(srcdir)/common_graphics/*.* wsug_html_chunked/wsug_graphics
 	cp $(srcdir)/wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar
 	cp $(srcdir)/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 wsug_graphics/ \
-		    --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 \
-		    --stringparam html.stylesheet ws.css \
+	$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
 		    --path .:wsluarm_src \
-		    --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
+		    $(CHUNKED_XSLTPROC_ARGS) $<
 	-chmod -R og+rX wsug_html_chunked
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper
@@ -199,13 +194,11 @@ wsdg_html/index.html: $(WSDG_SOURCE)
 	@ echo --- WSDG - HTML SINGLE PAGE ---
 	mkdir -p wsdg_html/wsdg_graphics/toolbar
 	cp $(srcdir)/wsdg_graphics/*.* wsdg_html/wsdg_graphics
+	cp $(srcdir)/common_graphics/*.* wsdg_html/wsdg_graphics
 	cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/
 	cp $(srcdir)/ws.css wsdg_html
-	$(XSLTPROC) --stringparam base.dir wsdg_html/ --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 \
-		    --stringparam html.stylesheet ws.css \
-		    --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@
+	$(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \
+		    $(SINGLE_XSLTPROC_ARGS) $< > $@
 	-chmod -R og+rX wsdg_html
 
 # create html chunked page files
@@ -215,13 +208,11 @@ wsdg_html_chunked/index.html: $(WSDG_SOURCE)
 	@ echo --- WSDG - HTML CHUNKED ---
 	mkdir -p wsdg_html_chunked/wsdg_graphics/toolbar
 	cp $(srcdir)/wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics
+	cp $(srcdir)/common_graphics/*.* wsdg_html_chunked/wsdg_graphics
 	cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/
 	cp $(srcdir)/ws.css wsdg_html_chunked
-	$(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 \
-		    --stringparam html.stylesheet ws.css \
-		    --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
+	$(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
+		    $(CHUNKED_XSLTPROC_ARGS) $<
 	-chmod -R og+rX wsdg_html_chunked
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper
diff --git a/docbook/Makefile.common b/docbook/Makefile.common
index da34e9f5a7..03b9df0cc3 100644
--- a/docbook/Makefile.common
+++ b/docbook/Makefile.common
@@ -1,4 +1,5 @@
 #
+
 WSUG_FILES =	\
 	wsug_src/WSUG_app_files.xml		\
 	wsug_src/WSUG_app_howitworks.xml	\
@@ -134,9 +135,6 @@ WSUG_GRAPHICS =	\
 	wsug_graphics/ws-tools-menu.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				\
 	wsug_graphics/toolbar/autoscroll_24.png			\
 	wsug_graphics/toolbar/capture_filter_24.png		\
 	wsug_graphics/toolbar/capture_interfaces_24.png 	\
@@ -196,11 +194,13 @@ WSDG_GRAPHICS =	\
 	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		\
 	wsdg_graphics/toolbar/dummy.dummy
 
+COMMON_GRAPHICS = \
+	common_graphics/note.svg	\
+	common_graphics/tip.svg		\
+	common_graphics/warning.svg
+
 # user-guide.xml must be first in the list (to match $<)
 WSUG_DIST =	\
 	user-guide.xml		\
@@ -209,7 +209,8 @@ WSUG_DIST =	\
 	custom_layer_pdf.xsl	\
 	Makefile.common		\
 	$(WSUG_FILES)		\
-	$(WSUG_GRAPHICS)
+	$(WSUG_GRAPHICS)	\
+	$(COMMON_GRAPHICS)
 
 WSUG_SOURCE = $(WSUG_DIST) $(WSUG_GENERATED_SOURCE)
 
@@ -220,7 +221,8 @@ WSDG_DIST =	\
 	custom_layer_pdf.xsl	\
 	Makefile.common		\
 	$(WSDG_FILES)		\
-	$(WSDG_GRAPHICS)
+	$(WSDG_GRAPHICS)	\
+	$(COMMON_GRAPHICS)
 
 WSDG_SOURCE = $(WSDG_GENERATED_SOURCE) $(WSDG_DIST)
 
@@ -275,3 +277,21 @@ WSLUA_MODULES = \
 	$(top_srcdir)/epan/wslua/wslua_file.c \
 	$(top_srcdir)/epan/wslua/wslua_dir.c \
 	$(top_srcdir)/epan/wslua/wslua_util.c
+
+COMMON_XSLTPROC_ARGS = \
+	--stringparam use.id.as.filename 1 \
+	--stringparam admon.graphics 1 \
+	--stringparam admon.graphics.path common_graphics/ \
+	--stringparam admon.graphics.extension .svg \
+	--stringparam section.autolabel 1 \
+	--stringparam section.label.includes.component.label 1 \
+	--stringparam html.stylesheet ws.css
+
+SINGLE_XSLTPROC_ARGS = \
+	--nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
+
+CHUNKED_XSLTPROC_ARGS = \
+	--nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
+
+HTMLHELP_XSLTPROC_ARGS = \
+	--nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl
diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake
index eb3e9c32ff..0a55ffa326 100644
--- a/docbook/Makefile.nmake
+++ b/docbook/Makefile.nmake
@@ -103,9 +103,11 @@ wsug_html\index.html: $(WSUG_SOURCE) wsluarm
 	@ echo --- WSUG - HTML SINGLE PAGE ---
 	if not exist wsug_html\wsug_graphics\toolbar md wsug_html\wsug_graphics\toolbar
 	cp wsug_graphics/*.* wsug_html/wsug_graphics
+	cp common_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 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 user-guide.xml > $@
+	$(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \
+		$(SINGLE_XSLTPROC_ARGS) user-guide.xml > $@
 	-chmod -R og+rX wsug_html
 
 # create html chunked page files
@@ -115,9 +117,11 @@ wsug_html_chunked\index.html: $(WSUG_SOURCE) wsluarm
 	@ echo --- WSUG - HTML CHUNKED ---
 	if not exist wsug_html_chunked\wsug_graphics\toolbar md wsug_html_chunked\wsug_graphics\toolbar
 	cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics
+	cp common_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 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 user-guide.xml
+	$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
+		$(CHUNKED_XSLTPROC_ARGS) user-guide.xml
 	-chmod -R og+rX wsug_html_chunked
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
@@ -141,9 +145,11 @@ user-guide.chm: $(WSUG_SOURCE) wsluarm
 !ifdef HHC_EXE
 	@ echo --- WSUG - MICROSOFT HTML HELP ---
 	if not exist wsug_chm\wsug_graphics\toolbar md 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 user-guide.xml
+	-cp wsug_graphics/*.* wsug_chm/wsug_graphics
+	-cp common_graphics/*.* wsug_chm/wsug_graphics
+	-cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar
+	$(XSLTPROC) --stringparam base.dir wsug_chm/ $(COMMON_XSLTPROC_ARGS) \
+		$(HTMLHELP_XSLTPROC_ARGS) user-guide.xml
 	-$(HHC_EXE) htmlhelp.hhp
 	-mv htmlhelp.chm $@
 	-rm -r htmlhelp.hhp
@@ -183,10 +189,12 @@ wsdg_html\index.html: $(WSDG_SOURCE)
 	@ echo --- WSDG - HTML SINGLE PAGE ---
 	if not exist wsdg_html\wsdg_graphics md wsdg_html\wsdg_graphics
 	if not exist wsdg_html\wsdg_graphics\toolbar md wsdg_html\wsdg_graphics\toolbar
-	cp wsdg_graphics/*.* wsdg_html/wsdg_graphics/
-	cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/
+	cp wsdg_graphics/*.* wsdg_html/wsdg_graphics
+	cp common_graphics/*.* wsdg_html/wsdg_graphics
+	cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar
 	cp ws.css wsdg_html
-	$(XSLTPROC) --stringparam base.dir wsdg_html/ --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 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl developer-guide.xml > $@
+	$(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \
+		$(SINGLE_XSLTPROC_ARGS) developer-guide.xml > $@
 	-chmod -R og+rX wsdg_html
 
 # create html chunked page files
@@ -196,11 +204,12 @@ wsdg_html_chunked\index.html: $(WSDG_SOURCE)
 	@ echo --- WSDG - HTML CHUNKED ---
 	if not exist wsdg_html_chunked\wsdg_graphics md wsdg_html_chunked\wsdg_graphics
 	if not exist wsdg_html_chunked\wsdg_graphics\toolbar md wsdg_html_chunked\wsdg_graphics\toolbar
-	cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics/
-	cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/
+	cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics
+	cp common_graphics/*.* wsdg_html_chunked/wsdg_graphics
+	cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar
 	cp ws.css wsdg_html_chunked
-	$(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 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl developer-guide.xml
-	-chmod -R og+rX wsdg_html_chunked
+	$(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
+		$(CHUNKED_XSLTPROC_ARGS) 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
@@ -224,9 +233,11 @@ developer-guide.chm: $(WSDG_SOURCE)
 	@ echo --- WSDG - MICROSOFT HTML HELP ---
 	if not exist wsdg_chm\wsdg_graphics md wsdg_chm\wsdg_graphics
 	if not exist wsdg_chm\wsdg_graphics\toolbar md 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 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl developer-guide.xml
+	cp wsdg_graphics/*.* wsdg_chm/wsdg_graphics
+	cp common_graphics/*.* wsdg_chm/wsdg_graphics
+	cp wsdg_graphics/toolbar/* wsdg_chm/wsdg_graphics/toolbar
+	$(XSLTPROC) --stringparam base.dir wsdg_chm/ $(COMMON_XSLTPROC_ARGS) \
+		$(HTMLHELP_XSLTPROC_ARGS) developer-guide.xml
 	-$(HHC_EXE) htmlhelp.hhp
 	-mv htmlhelp.chm $@
 	-rm -r htmlhelp.hhp
diff --git a/docbook/common_graphics/note.svg b/docbook/common_graphics/note.svg
new file mode 100644
index 0000000000..5d9fae792c
--- /dev/null
+++ b/docbook/common_graphics/note.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="note.svg"
+   inkscape:export-filename="/Users/gerald/Development/wireshark/docbook/wsug_graphics/note_100.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="22.820399"
+     inkscape:cy="16.594823"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="963"
+     inkscape:window-height="629"
+     inkscape:window-x="504"
+     inkscape:window-y="138"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>Original font: DejaVu Serif</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.00987187,-1020.3767)">
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Helvetica"
+       x="-34.648232"
+       y="28.228661"
+       id="text2997"
+       sodipodi:linespacing="125%"
+       transform="translate(0,952.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan2999"
+         x="-34.648232"
+         y="28.228661"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="44.194176"
+       y="48.027653"
+       id="text3790"
+       sodipodi:linespacing="125%"
+       transform="translate(0,952.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan3792"
+         x="44.194176"
+         y="48.027653" /></text>
+    <g
+       id="g3010"
+       transform="matrix(1.25,0,0,1.25,1.0098721,-264.07607)">
+      <path
+         transform="matrix(0.25116432,0,0,0.2573405,-0.96480016,1026.729)"
+         d="m 95.812973,52.977398 c 0,23.821982 -19.786406,43.133514 -44.194176,43.133514 -24.407769,0 -44.1941754,-19.311532 -44.1941754,-43.133514 0,-23.821982 19.7864064,-43.1335145 44.1941754,-43.1335145 24.40777,0 44.194176,19.3115325 44.194176,43.1335145 z"
+         sodipodi:ry="43.133514"
+         sodipodi:rx="44.194176"
+         sodipodi:cy="52.977398"
+         sodipodi:cx="51.618797"
+         id="path3788"
+         style="fill:none;stroke:#000000;stroke-width:7.08010149;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <g
+         transform="matrix(0.28333334,0,0,0.28333334,-2.2248719,756.46363)"
+         id="text3794"
+         style="font-size:65.92274475px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif">
+        <path
+           id="path3000"
+           style="font-weight:bold;-inkscape-font-specification:DejaVu Serif Bold"
+           d="m 78.909869,994.73123 c 0.858308,-0.17164 1.287492,-0.68666 1.287554,-1.54506 -6.2e-5,-0.85834 -0.85843,-1.4592 -2.575107,-1.80258 -7.038679,-1.37335 -13.819788,-2.06005 -20.343347,-2.06008 -11.84552,3e-5 -21.716755,1.97428 -29.613733,5.92274 l -0.515022,0.25751 -0.515021,-0.25751 c -0.858377,-0.68666 -1.802582,-1.45919 -2.832618,-2.31759 l 0,17.76824 c 1.716731,-0.515 3.09012,-0.8584 4.120171,-1.03 2.231748,0 4.463506,0.7725 6.695279,2.3175 1.888394,1.2018 4.549336,1.8026 7.982833,1.8026 1.030017,0 2.060059,-0.086 3.090128,-0.2575 -1.373416,-1.03 -2.317621,-2.4034 -2.832618,-4.1202 l 1.545065,-0.7725 c 0.514995,1.7168 1.630873,3.0902 3.347639,4.1202 1.545033,1.03 3.090096,1.5451 4.635193,1.545 0.686661,10e-5 1.201682,10e-5 1.545064,0 2.060049,-0.1716 3.261764,-1.1158 3.60515,-2.8326 -0.51506,0.1717 -1.716775,0.1717 -3.60515,0 -4.635224,-0.1716 -7.811186,-2.2317 -9.527896,-6.1802 l 1.545064,-0.7726 c 1.373362,3.2619 4.291814,4.9786 8.755365,5.1503 3.776783,0.1716 5.665193,-0.6867 5.665235,-2.5752 -4.2e-5,-0.1716 -4.2e-5,-0.4291 0,-0.7725 -0.171715,0.1717 -0.429226,0.2575 -0.772532,0.2575 -0.343388,0.1717 -0.686736,0.086 -1.030043,-0.2575 -0.515061,0.6867 -1.287592,1.0301 -2.317596,1.0301 -1.201753,0 -2.575143,-0.515 -4.120172,-1.5451 -1.545096,-0.8584 -2.918485,-2.1459 -4.120171,-3.8627 -2.918482,2.2318 -6.094444,3.3477 -9.527897,3.3477 -2.403451,0.1717 -4.377698,0 -5.922747,-0.5151 l 0.515022,-1.8025 c 1.030027,0.3433 2.317579,0.515 3.862661,0.515 3.948475,0.1717 7.553621,-1.03 10.81545,-3.60515 l 0.772532,-0.77254 0.515022,1.03009 c 1.030011,1.7167 2.317563,3.0043 3.86266,3.8626 1.373355,1.0301 2.489234,1.5451 3.34764,1.5451 0.686657,0.1717 1.030004,-0.1717 1.030043,-1.0301 -3.9e-5,-0.6866 -0.343386,-1.7167 -1.030043,-3.0901 -1.03008,-1.88838 -2.660979,-3.60511 -4.892704,-5.1502 -2.746811,-1.71671 -5.7511,-2.66092 -9.012875,-2.83262 l 0.257511,-1.80258 c 3.433448,0.34338 6.609411,1.37342 9.527896,3.09013 2.746745,1.71677 4.635155,3.60518 5.665236,5.66527 0.858329,1.5451 1.287513,2.9184 1.287554,4.1201 0.171633,0.1717 0.343306,0.2576 0.515021,0.2575 0.343306,0.1717 0.600817,0.086 0.772532,-0.2575 0.858327,-0.515 1.287511,-1.4592 1.287554,-2.8326 -4.3e-5,-2.57506 -1.97429,-4.37763 -5.922747,-5.4077 l 0.257511,-1.80258 c 4.635151,0.68673 9.356176,1.03007 14.16309,1.03004 4.120116,3e-5 7.038567,-0.25748 8.755364,-0.77253 m -1.030043,-5.15021 c 2.746719,0.51505 4.120108,1.71677 4.120172,3.60515 -6.4e-5,1.71676 -0.944269,2.83264 -2.832618,3.34764 -1.716797,0.51505 -4.635249,0.77256 -8.755364,0.77253 -2.918504,3e-5 -6.00863,-0.17165 -9.270386,-0.51502 1.54502,1.20174 2.317551,2.57513 2.317596,4.12018 -4.5e-5,0.1717 -4.5e-5,0.4292 0,0.7725 -4.5e-5,1.7168 -0.515066,3.0043 -1.545064,3.8627 0.17163,0.515 0.257467,1.03 0.25751,1.545 -4.3e-5,1.8885 -0.944248,3.176 -2.832617,3.8627 -0.171715,1.7168 -0.85841,3.0043 -2.060086,3.8627 -0.858407,0.8583 -2.14596,1.2875 -3.862661,1.2875 -2.060119,0.1717 -3.776855,-0.086 -5.150215,-0.7725 -2.060113,0.3433 -3.948523,0.4292 -5.665235,0.2575 -3.776845,0 -6.60946,-0.6008 -8.497854,-1.8026 -2.231773,-1.3734 -4.20602,-2.06 -5.922747,-2.0601 -1.201725,10e-5 -2.918462,0.3434 -5.150214,1.0301 L 22,1013.272 l 0,-23.69098 1.030043,0.77253 c 1.716732,1.03008 3.175958,2.06012 4.377682,3.09013 8.583673,-3.94847 18.540744,-5.92271 29.871244,-5.92275 6.523559,4e-5 13.390505,0.68673 20.600857,2.06009"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docbook/common_graphics/tip.svg b/docbook/common_graphics/tip.svg
new file mode 100644
index 0000000000..f53622313a
--- /dev/null
+++ b/docbook/common_graphics/tip.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="tip.svg"
+   inkscape:export-filename="/Users/gerald/Development/wireshark/docbook/wsug_graphics/tip_100.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="4.3465672"
+     inkscape:cy="39.080258"
+     inkscape:document-units="px"
+     inkscape:current-layer="text3794"
+     showgrid="false"
+     inkscape:window-width="963"
+     inkscape:window-height="629"
+     inkscape:window-x="504"
+     inkscape:window-y="138"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="" />
+        <dc:description>Original font: DejaVu Serif</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Helvetica"
+       x="-34.648232"
+       y="28.228661"
+       id="text2997"
+       sodipodi:linespacing="125%"
+       transform="translate(0,952.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan2999"
+         x="-34.648232"
+         y="28.228661"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="44.194176"
+       y="48.027653"
+       id="text3790"
+       sodipodi:linespacing="125%"
+       transform="translate(0,952.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan3792"
+         x="44.194176"
+         y="48.027653" /></text>
+    <g
+       style="font-size:65.80976868px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       id="text3794">
+      <g
+         id="g3033"
+         transform="matrix(0.3,0,0,0.29999999,1.0000001,735.65355)">
+        <path
+           transform="matrix(1.046518,0,0,1.0722521,-4.0200001,945.55706)"
+           d="m 95.812973,52.977398 c 0,23.821982 -19.786406,43.133514 -44.194176,43.133514 -24.407769,0 -44.1941754,-19.311532 -44.1941754,-43.133514 0,-23.821982 19.7864064,-43.1335145 44.1941754,-43.1335145 24.40777,0 44.194176,19.3115325 44.194176,43.1335145 z"
+           sodipodi:ry="43.133514"
+           sodipodi:rx="44.194176"
+           sodipodi:cy="52.977398"
+           sodipodi:cx="51.618797"
+           id="path3788"
+           style="fill:none;stroke:#000000;stroke-width:7.08010149;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:type="arc" />
+        <path
+           id="path3030"
+           style="font-weight:bold;-inkscape-font-specification:DejaVu Serif Bold"
+           d="m 43.23586,982.53185 c -6e-6,-1.73517 0.599822,-3.1919 1.799486,-4.37018 1.199648,-1.19961 2.667084,-1.79944 4.402313,-1.79949 1.69236,5e-5 3.127663,0.59988 4.305913,1.79949 1.19964,1.17828 1.799468,2.63501 1.799486,4.37018 -1.8e-5,1.69241 -0.599846,3.13843 -1.799486,4.33804 -1.17825,1.17828 -2.613553,1.76739 -4.305913,1.76736 -1.735229,3e-5 -3.202665,-0.58908 -4.402313,-1.76736 -1.199664,-1.17819 -1.799492,-2.6242 -1.799486,-4.33804 m 12.435733,39.94215 4.884318,0 0,3.8882 -21.111825,0 0,-3.8882 4.852185,0 0,-26.38174 -4.852185,0 0,-3.88818 16.227507,0 0,30.26992"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docbook/common_graphics/warning.svg b/docbook/common_graphics/warning.svg
new file mode 100644
index 0000000000..0c822fa2ee
--- /dev/null
+++ b/docbook/common_graphics/warning.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="warning.svg"
+   inkscape:export-filename="/Users/gerald/Development/wireshark/docbook/wsug_graphics/warning.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="26.090101"
+     inkscape:cy="14.331521"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="963"
+     inkscape:window-height="629"
+     inkscape:window-x="645"
+     inkscape:window-y="223"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="" />
+        <dc:description>Original font: DejaVu Serif</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:none;stroke:#000000;stroke-width:4.74805981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3776"
+       sodipodi:sides="3"
+       sodipodi:cx="35.001785"
+       sodipodi:cy="26.460896"
+       sodipodi:r1="40.87175"
+       sodipodi:r2="20.435875"
+       sodipodi:arg1="0.52359878"
+       sodipodi:arg2="1.5707963"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 70.397759,46.896771 -70.7919475,-1e-6 35.3959735,-61.307624 z"
+       transform="matrix(0.39199374,0,0,0.45263538,2.2795195,1029.0101)"
+       inkscape:transform-center-y="-15.416664" />
+    <g
+       style="font-size:67.27989197px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif Bold"
+       id="text3780"
+       transform="matrix(0.3,0,0,0.3,0.7,735.95354)">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 43.774638,1031.0876 c -8e-6,-1.7083 0.602269,-3.1756 1.806833,-4.4021 1.226445,-1.2264 2.693811,-1.8397 4.402103,-1.8397 1.708262,0 3.175628,0.6133 4.402102,1.8397 1.226436,1.2265 1.839664,2.6938 1.839685,4.4021 -2.1e-5,1.7302 -0.613249,3.2085 -1.839685,4.435 -1.226474,1.2264 -2.69384,1.8396 -4.402102,1.8396 -1.708292,0 -3.175658,-0.6132 -4.402103,-1.8396 -1.204564,-1.2265 -1.806841,-2.7048 -1.806833,-4.435 m 0.0657,-43.72536 12.319317,0 -3.90933,27.66096 0,6.2418 -4.56636,0 0,-6.2418 -3.843627,-27.66096"
+         id="path3818" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Helvetica"
+       x="-34.648232"
+       y="28.228661"
+       id="text2997"
+       sodipodi:linespacing="125%"
+       transform="translate(0,952.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan2999"
+         x="-34.648232"
+         y="28.228661"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif" /></text>
+  </g>
+</svg>
diff --git a/docbook/custom_layer_pdf.xsl b/docbook/custom_layer_pdf.xsl
index 44421e390e..b6b6ba0bd8 100644
--- a/docbook/custom_layer_pdf.xsl
+++ b/docbook/custom_layer_pdf.xsl
@@ -15,7 +15,7 @@
 <!-- use graphics for admons (note, tip, ...) -->
 <xsl:param name="admon.graphics" select="1"/>
 <xsl:param name="admon.graphics.path">wsug_graphics/</xsl:param>
-<xsl:param name="admon.graphics.extension" select="'.png'"/>
+<xsl:param name="admon.graphics.extension" select="'.svg'"/>
 
 <!-- use numbering for sections (not only for chapters) -->
 <xsl:param name="section.autolabel" select="1"/>
diff --git a/docbook/wsdg_graphics/note.png b/docbook/wsdg_graphics/note.png
deleted file mode 100644
index 3a20ba7b4f..0000000000
--- a/docbook/wsdg_graphics/note.png
+++ /dev/null
diff --git a/docbook/wsdg_graphics/tip.png b/docbook/wsdg_graphics/tip.png
deleted file mode 100644
index 2cb772353c..0000000000
--- a/docbook/wsdg_graphics/tip.png
+++ /dev/null
diff --git a/docbook/wsdg_graphics/warning.png b/docbook/wsdg_graphics/warning.png
deleted file mode 100644
index ffb7588080..0000000000
--- a/docbook/wsdg_graphics/warning.png
+++ /dev/null
diff --git a/docbook/wsug_graphics/note.png b/docbook/wsug_graphics/note.png
deleted file mode 100644
index 3a20ba7b4f..0000000000
--- a/docbook/wsug_graphics/note.png
+++ /dev/null
diff --git a/docbook/wsug_graphics/tip.png b/docbook/wsug_graphics/tip.png
deleted file mode 100644
index 2cb772353c..0000000000
--- a/docbook/wsug_graphics/tip.png
+++ /dev/null
diff --git a/docbook/wsug_graphics/warning.png b/docbook/wsug_graphics/warning.png
deleted file mode 100644
index ffb7588080..0000000000
--- a/docbook/wsug_graphics/warning.png
+++ /dev/null
diff --git a/docbook/wsug_src/WSUG_chapter_use.asciidoc b/docbook/wsug_src/WSUG_chapter_use.asciidoc
index 5243efbd91..5faed769d3 100644
--- a/docbook/wsug_src/WSUG_chapter_use.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_use.asciidoc
@@ -325,10 +325,10 @@ Enabling colorization will slow down the display of new packets while capturing
 Resizing may take a significant amount of time, especially if a large capture file is loaded.
 
 |menu:Displayed Columns[]                           |                   |This menu items folds out with a list of all configured columns. These columns can now be shown or hidden in the packet list.
-|menu:Expand Subtrees[]                             |kbd:[Shift+&#2192;]|This menu item expands the currently selected subtree in the packet details tree.
-|menu:Collapse Subtrees[]                           |kbd:[Shift+&#2190;]|This menu item collapses the currently selected subtree in the packet details tree.
-|menu:Expand All[]                                  |kbd:[Ctrl+&#2192;] |Wireshark keeps a list of all the protocol subtrees that are expanded, and uses it to ensure that the correct subtrees are expanded when you display a packet. This menu item expands all subtrees in all packets in the capture.
-|menu:Collapse All[]                                |kbd:[Ctrl+&#2190;] |This menu item collapses the tree view of all packets in the capture list.
+|menu:Expand Subtrees[]                             |kbd:[Shift+&#x2192;]|This menu item expands the currently selected subtree in the packet details tree.
+|menu:Collapse Subtrees[]                           |kbd:[Shift+&#x2190;]|This menu item collapses the currently selected subtree in the packet details tree.
+|menu:Expand All[]                                  |kbd:[Ctrl+&#x2192;] |Wireshark keeps a list of all the protocol subtrees that are expanded, and uses it to ensure that the correct subtrees are expanded when you display a packet. This menu item expands all subtrees in all packets in the capture.
+|menu:Collapse All[]                                |kbd:[Ctrl+&#x2190;] |This menu item collapses the tree view of all packets in the capture list.
 |menu:Colorize Conversation[]                       |                   |This menu item brings up a submenu that allows you to color packets in the packet list pane based on the addresses of the currently selected packet. This makes it easy to distinguish packets belonging to different conversations. <<ChCustColorizationSection>>.
 |menu:Colorize Conversation[Color 1-10]             |                   |These menu items enable one of the ten temporary color filters based on the currently selected conversation.
 |menu:Colorize Conversation[Reset coloring]         |                   |This menu item clears all temporary coloring rules.
@@ -851,4 +851,4 @@ unexpected results. For a detailed description, see
 
 ++++++++++++++++++++++++++++++++++++++
 <!-- End of WSUG Chapter 3 -->
-++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
+++++++++++++++++++++++++++++++++++++++