Update the menu screenshots and descriptions.

svn path=/trunk/; revision=35441

14 files changed, 96 insertions, 102 deletions

diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index b8568b1b71..fc02db271e 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -187,8 +187,9 @@ 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 WiresharkTelephonyMenu SYSTEM "./wsug_graphics/ws-telephony-menu.png" NDATA PNG>
+  <!ENTITY WiresharkToolsMenu SYSTEM "./wsug_graphics/ws-tools-menu.png" NDATA PNG>
   <!ENTITY WiresharkHelpMenu SYSTEM "./wsug_graphics/ws-help-menu.png" NDATA PNG>
   <!ENTITY WiresharkPacketPanePopupMenu SYSTEM "./wsug_graphics/ws-packet-pane-popup-menu.png" NDATA PNG>
   <!ENTITY WiresharkDetailsPanePopupMenu SYSTEM "./wsug_graphics/ws-details-pane-popup-menu.png" NDATA PNG>
diff --git a/docbook/wsug_graphics/ws-analyze-menu.png b/docbook/wsug_graphics/ws-analyze-menu.png
index c9c5ad2ce6..a9b52f0882 100644
--- a/docbook/wsug_graphics/ws-analyze-menu.png
+++ b/docbook/wsug_graphics/ws-analyze-menu.png
diff --git a/docbook/wsug_graphics/ws-capture-menu.png b/docbook/wsug_graphics/ws-capture-menu.png
index 37fc254cab..7b33d10e76 100644
--- a/docbook/wsug_graphics/ws-capture-menu.png
+++ b/docbook/wsug_graphics/ws-capture-menu.png
diff --git a/docbook/wsug_graphics/ws-edit-menu.png b/docbook/wsug_graphics/ws-edit-menu.png
index 578703656e..c9a0a113e1 100644
--- a/docbook/wsug_graphics/ws-edit-menu.png
+++ b/docbook/wsug_graphics/ws-edit-menu.png
diff --git a/docbook/wsug_graphics/ws-file-menu.png b/docbook/wsug_graphics/ws-file-menu.png
index 727954ac22..298f3fe7a2 100644
--- a/docbook/wsug_graphics/ws-file-menu.png
+++ b/docbook/wsug_graphics/ws-file-menu.png
diff --git a/docbook/wsug_graphics/ws-go-menu.png b/docbook/wsug_graphics/ws-go-menu.png
index ed009be0d8..e4a0027754 100644
--- a/docbook/wsug_graphics/ws-go-menu.png
+++ b/docbook/wsug_graphics/ws-go-menu.png
diff --git a/docbook/wsug_graphics/ws-help-menu.png b/docbook/wsug_graphics/ws-help-menu.png
index 696899643d..42a568a98a 100644
--- a/docbook/wsug_graphics/ws-help-menu.png
+++ b/docbook/wsug_graphics/ws-help-menu.png
diff --git a/docbook/wsug_graphics/ws-main-toolbar.png b/docbook/wsug_graphics/ws-main-toolbar.png
index fbf1b2f9ea..8e2cbaa042 100644
--- a/docbook/wsug_graphics/ws-main-toolbar.png
+++ b/docbook/wsug_graphics/ws-main-toolbar.png
diff --git a/docbook/wsug_graphics/ws-main.png b/docbook/wsug_graphics/ws-main.png
index 6a858ff1ad..707017fd7a 100644
--- a/docbook/wsug_graphics/ws-main.png
+++ b/docbook/wsug_graphics/ws-main.png
diff --git a/docbook/wsug_graphics/ws-statistics-menu.png b/docbook/wsug_graphics/ws-statistics-menu.png
index e57a1749c5..d7f03f5c30 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
index 6d136a992f..d7359aa952 100644
--- a/docbook/wsug_graphics/ws-telephony-menu.png
+++ b/docbook/wsug_graphics/ws-telephony-menu.png
diff --git a/docbook/wsug_graphics/ws-tools-menu.png b/docbook/wsug_graphics/ws-tools-menu.png
new file mode 100644
index 0000000000..8e54708e6b
--- /dev/null
+++ b/docbook/wsug_graphics/ws-tools-menu.png
diff --git a/docbook/wsug_graphics/ws-view-menu.png b/docbook/wsug_graphics/ws-view-menu.png
index a57b1a40f1..1d4e749dfe 100644
--- a/docbook/wsug_graphics/ws-view-menu.png
+++ b/docbook/wsug_graphics/ws-view-menu.png
diff --git a/docbook/wsug_src/WSUG_chapter_use.xml b/docbook/wsug_src/WSUG_chapter_use.xml
index 2cc9d4c384..d47e369eea 100644
--- a/docbook/wsug_src/WSUG_chapter_use.xml
+++ b/docbook/wsug_src/WSUG_chapter_use.xml
@@ -424,7 +424,7 @@
 			It is discussed in more detail in <xref linkend="ChIOMergeSection"/>.
 		  </para></entry>
 	      </row>
-	      <row>
+	      <!--<row>
 		<entry><command>Import...</command></entry>
 		<entry></entry>
 		<entry><para>
@@ -432,7 +432,7 @@
 		    allows you to import a text file into a new temporary capture.
 			It is discussed in more detail in <xref linkend="ChIOImportSection"/>.
 		  </para></entry>
-	      </row>
+	      </row>-->
 	      <row>
 		<entry><command>Close</command></entry>
 		<entry>Ctrl+W</entry>
@@ -519,77 +519,16 @@
 		<entry></entry>
 	      </row>
 	      <row>
-		<entry><command>Export > as "Plain Text" file...</command></entry>
-		<entry></entry>
-		<entry><para>
-		    This menu item allows you to export all (or some) of the packets in
-		    the capture file to a plain ASCII text file.
-			It pops up the Wireshark Export dialog box (which is discussed further in
-		    <xref linkend="ChIOExportPlainDialog"/>).
-		  </para></entry>
-	      </row>
-	      <row>
-		<entry><command>Export > as "PostScript" file...</command></entry>
-		<entry></entry>
-		<entry><para>
-		    This menu item allows you to export all (or some) of the packets in
-		    the capture file to a PostScript file.
-			It pops up the Wireshark Export dialog box (which is discussed further in
-		    <xref linkend="ChIOExportPSDialog"/>).
-		  </para></entry>
-	      </row>
-	      <row>
-		<entry><command>Export > as "CSV" (Comma Separated Values packet summary) file...</command></entry>
-		<entry></entry>
-		<entry><para>
-		    This menu item allows you to export all (or some) of the packet summaries in
-		    the capture file to a .csv file (e.g. used by spreadsheet programs).
-			It pops up the Wireshark Export dialog box (which is discussed further in
-		    <xref linkend="ChIOExportCSVDialog"/>).
-		  </para></entry>
-	      </row>
-	      <row>
-		<entry><command>Export > as "C Arrays" (packet bytes) file...</command></entry>
-		<entry></entry>
-		<entry><para>
-		      This menu item allows you to export all (or some) of the packet bytes in 
-		      the capture file to a .c file so you can import the stream data into your
-		      own C program.
-			It pops up the Wireshark Export dialog box (which is discussed further in
-		    <xref linkend="ChIOExportCArraysDialog"/>).
-		</para></entry>
-	      </row>
-	      <row>
-		<entry><command>------</command></entry>
-		<entry></entry>
-		<entry></entry>
-	      </row>
-	      <row>
-		<entry><command>Export > as "PSML" file...</command></entry>
-		<entry></entry>
-		<entry><para>
-		    This menu item allows you to export all (or some) of the packets in
-		    the capture file to a PSML (packet summary markup language) XML file.
-			It pops up the Wireshark Export dialog box (which is discussed further in
-		    <xref linkend="ChIOExportPSMLDialog"/>).
-		  </para></entry>
-	      </row>
-	      <row>
-		<entry><command>Export > as "PDML" file...</command></entry>
+		<entry><command>Export > File...</command></entry>
 		<entry></entry>
 		<entry><para>
 		    This menu item allows you to export all (or some) of the packets in
-		    the capture file to a PDML (packet details markup language) XML file.
-			It pops up the Wireshark Export dialog box (which is discussed further in
-		    <xref linkend="ChIOExportPDMLDialog"/>).
+		    the capture file to file.
+		    It pops up the Wireshark Export dialog box (which is discussed further in
+		    <xref linkend="ChIOExportSection"/>).
 		  </para></entry>
 	      </row>
 	      <row>
-		<entry><command>------</command></entry>
-		<entry></entry>
-		<entry></entry>
-	      </row>
-	      <row>
 		<entry><command>Export > Selected Packet Bytes...</command></entry>
 		<entry>Ctrl+H</entry>
 		<entry><para>
@@ -600,7 +539,7 @@
 		  </para></entry>
 	      </row>
 	      <row>
-		<entry><command>Objects > HTTP</command></entry>
+		<entry><command>Export > Objects > HTTP</command></entry>
 		<entry></entry>
 		<entry><para>
 		    This menu item allows you to export all or some of the captured HTTP objects
@@ -609,6 +548,15 @@
 		</para></entry>
 	      </row>
 	      <row>
+		<entry><command>Export > Objects > DICOM</command></entry>
+		<entry></entry>
+		<entry><para>
+		    This menu item allows you to export all or some of the captured DICOM objects
+		    into local files. It pops up the Wireshark DICOM object list (which is discussed
+		    further in <xref linkend="ChIOExportObjectsDialog"/>)
+		</para></entry>
+	      </row>
+	      <row>
 		<entry><command>------</command></entry>
 		<entry></entry>
 		<entry></entry>
@@ -892,6 +840,14 @@
 		  </para></entry>
 	      </row>
 	      <row>
+		<entry><command>Wireless Toolbar (Windows only)</command></entry>
+		<entry></entry>
+		<entry><para>
+		    This menu item hides or shows the wireless toolbar. See
+		    the AirPcap documentation for more information.
+		  </para></entry>
+	      </row>
+	      <row>
 		<entry><command>Statusbar</command></entry>
 		<entry></entry>
 		<entry><para>
@@ -960,6 +916,15 @@
 		  </para></entry>
 	      </row>
 	      <row>
+		<entry><command>Time Display Format > Seconds Since Epoch (1970-01-01):  1234567890.123456</command></entry>
+		<entry></entry>
+		<entry><para>
+	      Selecting this tells Wireshark to display time stamps in
+	      seconds since 1970-01-01 00:00:00, see
+		  <xref linkend="ChWorkTimeFormatsSection"/>.
+		  </para></entry>
+	      </row>
+	      <row>
 		<entry><command>Time Display Format > Seconds Since Beginning of Capture:  123.123456</command></entry>
 		<entry></entry>
 		<entry><para>
@@ -987,15 +952,6 @@
 		  </para></entry>
 	      </row>
 	      <row>
-		<entry><command>Time Display Format > Seconds Since Epoch (1970-01-01):  1234567890.123456</command></entry>
-		<entry></entry>
-		<entry><para>
-	      Selecting this tells Wireshark to display time stamps in
-	      seconds since 1970-01-01 00:00:00, see
-		  <xref linkend="ChWorkTimeFormatsSection"/>.
-		  </para></entry>
-	      </row>
-	      <row>
 		<entry><command>Time Display Format > ------</command></entry>
 		<entry></entry>
 		<entry></entry>
@@ -1026,11 +982,20 @@
 		<entry><command>Time Display Format > ...seconds:  0....</command></entry>
 		<entry></entry>
 		<entry><para>
-	      Selecting this tells Wireshark to display time stamps with a precision of one second, decisecond, centisecond, millisecond, microsecond or nanosecond, see
+	      Selecting this tells Wireshark to display time stamps with a precision of one second,
+	      decisecond, centisecond, millisecond, microsecond or nanosecond, see
 		  <xref linkend="ChWorkTimeFormatsSection"/>.
 		  </para></entry>
 	      </row>
 	      <row>
+		<entry><command>Time Display Format > Display Seconds with hours and minutes</command></entry>
+		<entry></entry>
+		<entry><para>
+	      Selecting this tells Wireshark to display time stamps in seconds,
+	      with hours and minutes.
+		  </para></entry>
+	      </row>
+	      <row>
 		<entry><command>Name Resolution > Resolve Name</command></entry>
 		<entry></entry>
 		<entry><para>
@@ -1127,6 +1092,15 @@
 		  </entry>
 	      </row>
 	      <row>
+		<entry><command>Displayed Columns</command></entry>
+		<entry></entry>
+		<entry><para>
+		  This menu items folds out with a list of all configured columns.
+		  These columns can now be shown or hidden in the packet list.
+		  </para>
+		  </entry>
+	      </row>
+	      <row>
 		<entry><command>------</command></entry>
 		<entry></entry>
 		<entry></entry>
@@ -1136,7 +1110,7 @@
 		<entry></entry>
 		<entry><para>
 		    This menu item expands the currently selected subtree in the
-			packet details tree.
+		    packet details tree.
 		  </para></entry>
 	      </row>
 	      <row>
@@ -1460,6 +1434,19 @@
 		  </para></entry>
 	      </row>
 	      <row>
+		<entry><command>------</command></entry>
+		<entry></entry>
+		<entry></entry>
+	      </row>
+	      <row>
+		<entry><command>Apply as Column</command></entry>
+		<entry></entry>
+		<entry><para>
+		    This menu item adds the selected protocol item in the packet details
+		    pane as a column to the packet list.
+		  </para></entry>
+	      </row>
+	      <row>
 		<entry><command>Apply as Filter > ...</command></entry>
 		<entry></entry>
 		<entry><para>
@@ -1681,11 +1668,21 @@
 		<entry></entry>
 	      </row>
 	      <row>
+		<entry><command>ANCP...</command></entry>
+		<entry></entry>
+		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
+	      </row>
+	      <row>
 		<entry><command>BOOTP-DHCP...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
+		<entry><command>Colledtd...</command></entry>
+		<entry></entry>
+		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
+	      </row>
+	      <row>
 		<entry><command>Compare...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
@@ -1716,11 +1713,6 @@
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>ISUP Messages</command></entry>
-		<entry></entry>
-		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
-	      </row>
-	      <row>
 		<entry><command>ONC-RPC Programs</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChStatXXX"/></para></entry>
@@ -1772,27 +1764,32 @@
 	    </thead>
 	    <tbody>
 	      <row>
-		<entry><command>ANSI</command></entry>
+		<entry><command>IAX2</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>Fax T38 Analysis...</command></entry>
+		<entry><command>SMPP Operations...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>GSM</command></entry>
+		<entry><command>SCTP</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>H.225...</command></entry>
+		<entry><command>ANSI</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>IAX2</command></entry>
+		<entry><command>GSM</command></entry>
+		<entry></entry>
+		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
+	      </row>
+	      <row>
+		<entry><command>H.225...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
 	      </row>
@@ -1822,21 +1819,11 @@
 		<entry><para>See <xref linkend="ChTelRTPAnalysis"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>SCTP</command></entry>
-		<entry></entry>
-		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
-	      </row>
-	      <row>
 		<entry><command>SIP...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
 	      </row>
 	      <row>
-		<entry><command>SMPP Operations...</command></entry>
-		<entry></entry>
-		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
-	      </row>
-	      <row>
 		<entry><command>UCP Messages...</command></entry>
 		<entry></entry>
 		<entry><para>See <xref linkend="ChTelXXX"/></para></entry>
@@ -1861,12 +1848,10 @@
       The Wireshark Tools menu contains the fields shown in
       <xref linkend="ChUseTools"/>.
     </para>
-<!--
     <figure id="ChUseWiresharkToolsMenu">
       <title>The "Tools" Menu</title>
       <graphic entityref="WiresharkToolsMenu" format="PNG"/>
     </figure>
--->
     <table id="ChUseTools" frame="none">
       <title>Tools menu items</title>
       <tgroup cols="3">
@@ -1893,6 +1878,14 @@
 			It is assumed that the rules will be applied to an outside interface.
 		  </para></entry>
 	      </row>
+	      <row>
+		<entry><command>Lua</command></entry>
+		<entry></entry>
+		<entry><para>
+		    These options allow you to work with the Lua interpreter optionally
+		    build into Wireshark, see <xref linkend="wsluarm_intro"/>.
+		  </para></entry>
+	      </row>
 	    </tbody>
       </tgroup>
     </table>