Update the User Guide to show the current menu.

svn path=/trunk/; revision=31317

5 files changed, 87 insertions, 35 deletions

diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index 8e6b457072..7084ef6473 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -186,6 +186,7 @@ FILE SECTION
   <!ENTITY WiresharkGoMenu SYSTEM "./wsug_graphics/ws-go-menu.png" NDATA PNG>
   <!ENTITY WiresharkCaptureMenu SYSTEM "./wsug_graphics/ws-capture-menu.png" NDATA PNG>
   <!ENTITY WiresharkAnalyzeMenu SYSTEM "./wsug_graphics/ws-analyze-menu.png" NDATA PNG>
+  <!ENTITY WiresharkTelephonyMenu SYSTEM "./wsug_graphics/ws-telephony-menu.png" NDATA PNG>
   <!ENTITY WiresharkStatisticsMenu SYSTEM "./wsug_graphics/ws-statistics-menu.png" NDATA PNG>
   <!ENTITY WiresharkHelpMenu SYSTEM "./wsug_graphics/ws-help-menu.png" NDATA PNG>
   <!ENTITY WiresharkPacketPanePopupMenu SYSTEM "./wsug_graphics/ws-packet-pane-popup-menu.png" NDATA PNG>
diff --git a/docbook/wsug_graphics/ws-menu.png b/docbook/wsug_graphics/ws-menu.png
index 35f3a986f0..d94c6c846f 100644
--- a/docbook/wsug_graphics/ws-menu.png
+++ b/docbook/wsug_graphics/ws-menu.png
diff --git a/docbook/wsug_graphics/ws-statistics-menu.png b/docbook/wsug_graphics/ws-statistics-menu.png
index f701446e85..6c3a07b2fa 100644
--- a/docbook/wsug_graphics/ws-statistics-menu.png
+++ b/docbook/wsug_graphics/ws-statistics-menu.png
diff --git a/docbook/wsug_graphics/ws-telephony-menu.png b/docbook/wsug_graphics/ws-telephony-menu.png
new file mode 100644
index 0000000000..f0e16f18a5
--- /dev/null
+++ b/docbook/wsug_graphics/ws-telephony-menu.png
diff --git a/docbook/wsug_src/WSUG_chapter_use.xml b/docbook/wsug_src/WSUG_chapter_use.xml
index c28447beac..734241f58f 100644
--- a/docbook/wsug_src/WSUG_chapter_use.xml
+++ b/docbook/wsug_src/WSUG_chapter_use.xml
@@ -50,11 +50,11 @@
 	<note><title>Note!</title>
 	<para>
 	In the following chapters, a lot of screenshots from Wireshark will be shown.
-	As Wireshark runs on many different platforms and there are different
-	versions of the underlying GUI toolkit (GTK 1.x / 2.x) used, your
-	screen might look different from the provided screenshots. But as there
-	are no real differences in functionality, these screenshots should still
-	be well understandable.
+	As Wireshark runs on many different platforms with many different window
+	managers, different styles applied and there are different versions of the
+	underlying GUI toolkit used, your screen might look different from the provided
+	screenshots. But as there are no real differences in functionality, these
+	screenshots should still be well understandable.
 	</para>
 	</note>
 	</para>
@@ -319,6 +319,16 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
+	<varlistentry><term><command>Telephony</command></term>
+	  <listitem>
+	    <para>
+	      This menu contains items to display various telephony related
+		  statistic windows, including a media analysis, flow diagrams,
+		  display protocol hierarchy statistics and much more.
+		  See <xref linkend="ChUseTelephonyMenuSection"/>.
+	    </para>
+	  </listitem>
+	</varlistentry>
 	<varlistentry><term><command>Tools</command></term>
 	  <listitem>
 	    <para>
@@ -1572,6 +1582,11 @@
 		  </para></entry>
 	      </row>
 	      <row>
+		<entry><command>Packet Lengths...</command></entry>
+		<entry></entry>
+		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
+	      </row>
+	      <row>
 		<entry><command>IO Graphs</command></entry>
 		<entry></entry>
 		<entry><para>
@@ -1616,117 +1631,153 @@
 		<entry></entry>
 	      </row>
 	      <row>
-		<entry><command>ANSI</command></entry>
+		<entry><command>BOOTP-DHCP...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>Fax T38 Analysis...</command></entry>
+		<entry><command>Compare...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>GSM</command></entry>
+		<entry><command>Flow Graph...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>H.225...</command></entry>
+		<entry><command>HTTP</command></entry>
 		<entry></entry>
-		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
+		<entry><para>HTTP request/response statistics, see <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>LTE MAC</command></entry>
+		<entry><command>IP Addresses...</command></entry>
 		<entry></entry>
-		<entry><para>See <xref linkend="ChStatLTEMACTraffic"/></para></entry>
+		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>MTP3</command></entry>
+		<entry><command>IP Destinations...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>RTP</command></entry>
+		<entry><command>IP Protocol Types...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>SCTP</command></entry>
+		<entry><command>ISUP Messages</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>SIP</command></entry>
+		<entry><command>ONC-RPC Programs</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>VoIP Calls...</command></entry>
+		<entry><command>TCP Stream Graph</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>WAP-WSP...</command></entry>
+		<entry><command>UDP Multicast Streams</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>------</command></entry>
-		<entry></entry>
+		<entry><command>WLAN Traffic</command></entry>
 		<entry></entry>
+		<entry><para>See <xref linkend="ChStatWLANTraffic"/></para></entry>
+	      </row>
+	    </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <section id="ChUseTelephonyMenuSection"><title>The "Telephony" menu</title>
+    <para>
+      The Wireshark Telephony menu contains the fields shown in
+      <xref linkend="ChUseTelephony"/>.
+    </para>
+    <figure id="ChUseWiresharkTelephonyMenu">
+      <title>The "Telephony" Menu</title>
+      <graphic entityref="WiresharkTelephonyMenu" format="PNG"/>
+    </figure>
+    <para>
+	All menu items will bring up a new window showing specific telephony
+	related statistical information.
+    </para>
+    <table id="ChUseTelephony" frame="none">
+      <title>Telephony menu items</title>
+      <tgroup cols="3">
+	<colspec colnum="1" colwidth="72pt"/>
+	  <colspec colnum="2" colwidth="80pt"/>
+	    <thead>
+	      <row>
+		<entry>Menu Item</entry>
+		<entry>Accelerator</entry>
+		<entry>Description</entry>
 	      </row>
+	    </thead>
+	    <tbody>
 	      <row>
-		<entry><command>BOOTP-DHCP...</command></entry>
+		<entry><command>ANSI</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>Flow Graph...</command></entry>
+		<entry><command>Fax T38 Analysis...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>HTTP</command></entry>
+		<entry><command>GSM</command></entry>
 		<entry></entry>
-		<entry><para>HTTP request/response statistics, see <xref linkend="ChStatXXX"/></para></entry>
+		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>IP Addresses...</command></entry>
+		<entry><command>H.225...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>IP Destinations...</command></entry>
+		<entry><command>IAX2</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>IP Protocol Types...</command></entry>
+		<entry><command>ISUP Messages...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>ISUP Messages</command></entry>
+		<entry><command>LTE MAC...</command></entry>
+		<entry></entry>
+		<entry><para>See <xref linkend="ChStatLTEMACTraffic"/></para></entry>
+	      </row>
+	      <row>
+		<entry><command>MTP3</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>ONC-RPC Programs</command></entry>
+		<entry><command>RTP</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>Packet Lengths...</command></entry>
+		<entry><command>SCTP</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>SMPP Operations...</command></entry>
+		<entry><command>SIP...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>TCP Stream Graph</command></entry>
+		<entry><command>SMPP Operations...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
@@ -1736,14 +1787,14 @@
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>UDP Multicast Streams</command></entry>
+		<entry><command>VoIP Calls...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>WLAN Traffic</command></entry>
+		<entry><command>WAP-WSP...</command></entry>
 		<entry></entry>
-		<entry><para>See <xref linkend="ChStatWLANTraffic"/></para></entry>
+		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	    </tbody>
       </tgroup>