WSUG: Fixup the "Internals" section.

The Internals menu items were moved under the View menu a while back.
Fix an internals dialog title.

Change-Id: I78d61bf4f52bf9eb86cf7ff59fc036b9f7e846f5
Reviewed-on: https://code.wireshark.org/review/29228
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>

diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 15cda5a2154bb8567b168ffbcdbffced14df00af..d1ed0fa4067be70f05b61266dddbddd4a2acff2e 100644 (file)
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -229,7 +229,6 @@ set(WSUG_GRAPHICS
        wsug_graphics/ws-gui-layout-preferences.png
        wsug_graphics/ws-gui-preferences.png
        wsug_graphics/ws-help-menu.png
-       wsug_graphics/ws-internals-menu.png
        wsug_graphics/ws-list-pane.png
        wsug_graphics/ws-logo.png
        wsug_graphics/ws-main-toolbar.png

diff --git a/docbook/wsug_graphics/ws-internals-menu.png b/docbook/wsug_graphics/ws-internals-menu.png
deleted file mode 100644 (file)
index a0513c2..0000000
Binary files a/docbook/wsug_graphics/ws-internals-menu.png and /dev/null differ

diff --git a/docbook/wsug_src/WSUG_chapter_use.asciidoc b/docbook/wsug_src/WSUG_chapter_use.asciidoc
index 0349898ff2f2e85b0703c3ef6b585faa17495d45..8487d8e0e76e42fd23a21c867e2c37f91b060d94 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_use.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_use.asciidoc
@@ -450,10 +450,22 @@ Resizing may take a significant amount of time, especially if a large capture fi
 |menu:Colorize Conversation[Reset coloring]         |                   |This menu item clears all temporary coloring rules.
 |menu:Colorize Conversation[New Coloring Rule...]   |                   |This menu item opens a dialog window in which a new permanent coloring rule can be created based on the currently selected conversation.
 |menu:Coloring Rules...[]                           |                   |This menu item brings up a dialog box that allows you to color packets in the packet list pane according to filter expressions you choose. It can be very useful for spotting certain types of packets, see <<ChCustColorizationSection>>.
+|menu:Internals[]                                   |                   |Information about various internal data structures. See <<ChUseInternals>> below for more information.
 |menu:Show Packet in New Window[]                   |                   |This menu item brings up the selected packet in a separate window. The separate window shows only the tree view and byte view panes.
 |menu:Reload[]                                      |kbd:[Ctrl+R]       |This menu item allows you to reload the current capture file.
 |===============
 
+[[ChUseInternals]]
+.Internals menu items
+[options="header",cols="3,5"]
+|===============
+|Menu Item|Description
+|menu:Conversation Hash Tables[]| Shows the tuples (address and port combinations) used to identify each conversation.
+|menu:Dissector Tables[]| Shows tables of subdissector relationships.
+|menu:Supported Protocols[]| Displays supported protocols and protocol fields.
+|===============
+
+
 [[ChUseGoMenuSection]]
 
 === The “Go” Menu
@@ -601,22 +613,22 @@ All menu items will bring up a new window showing specific telephony related sta
 |===============
 |Menu Item|Accelerator|Description
 |menu:VoIP Calls...[]||See <<ChTelVoipCalls>>
-|menu:[ANSI]||See <<ChTelANSI>>
-|menu:[GSM]||See <<ChTelGSM>>
-|menu:[IAX2 Stream Analysis]||See <<ChTelIAX2Analysis>>
-|menu:[ISUP Messages]||See <<ChTelISUPMessages>>
-|menu:[LTE]||See <<ChTelLTE>>
-|menu:[MTP3]||See <<ChTelMTP3>>
-|menu:[Osmux]||See <<ChTelOsmux>>
-|menu:[RTP]||See <<ChTelRTPAnalysis>>
-|menu:[RTSP]||See <<ChTelRTSP>>
-|menu:[SCTP]||See <<ChTelSCTP>>
-|menu:[SMPP Operations]||See <<ChTelSMPPOperations>>
-|menu:[UCP Messages]||See <<ChTelUCPMessages>>
-|menu:[H.225]||See <<ChTelH225>>
-|menu:[SIP Flows]||See <<ChTelSIPFlows>>
-|menu:[SIP Statistics]||See <<ChTelSIPStatistics>>
-|menu:[WAP-WSP Packet Counter]||See <<ChTelWAPWSPPacketCounter>>
+|menu:ANSI[]||See <<ChTelANSI>>
+|menu:GSM[]||See <<ChTelGSM>>
+|menu:IAX2 Stream Analysis[]||See <<ChTelIAX2Analysis>>
+|menu:ISUP Messages[]||See <<ChTelISUPMessages>>
+|menu:LTE[]||See <<ChTelLTE>>
+|menu:MTP3[]||See <<ChTelMTP3>>
+|menu:Osmux[]||See <<ChTelOsmux>>
+|menu:RTP[]||See <<ChTelRTPAnalysis>>
+|menu:RTSP[]||See <<ChTelRTSP>>
+|menu:SCTP[]||See <<ChTelSCTP>>
+|menu:SMPP Operations[]||See <<ChTelSMPPOperations>>
+|menu:UCP Messages[]||See <<ChTelUCPMessages>>
+|menu:H.225[]||See <<ChTelH225>>
+|menu:SIP Flows[]||See <<ChTelSIPFlows>>
+|menu:SIP Statistics[]||See <<ChTelSIPStatistics>>
+|menu:WAP-WSP Packet Counter[]||See <<ChTelWAPWSPPacketCounter>>
 
 |===============
 
@@ -642,25 +654,6 @@ It is assumed that the rules will be applied to an outside interface.
 |menu:Lua[]|| These options allow you to work with the Lua interpreter optionally build into Wireshark. See the “Lua Support in Wireshark” in the Wireshark Developer’s Guide.
 |===============
 
-[[ChUseInternalsMenuSection]]
-
-=== The “Internals” Menu
-
-The Wireshark Internals menu contains the fields shown in <<ChUseInternals>>.
-
-[[ChUseWiresharkInternalsMenu]]
-.The “Internals” Menu
-image::wsug_graphics/ws-internals-menu.png[{screenshot-attrs}]
-
-[[ChUseInternals]]
-.Internals menu items
-[options="header",cols="3,2,5"]
-|===============
-|Menu Item|Accelerator|Description
-|menu:Dissector tables[]|| This menu item brings up a dialog box showing the tables with subdissector relationships.
-|menu:Supported Protocols (slow!)[]|| This menu item brings up a dialog box showing the supported protocols and protocol fields.
-|===============
-
 [[ChUseHelpMenuSection]]
 
 === The “Help” Menu

diff --git a/ui/qt/conversation_hash_tables_dialog.cpp b/ui/qt/conversation_hash_tables_dialog.cpp
index 63f4f0f99ea45dbc2da1af18b36a71e6b6dc7eef..a026564c960a34c9ce4df1bd08730897bc715051 100644 (file)
--- a/ui/qt/conversation_hash_tables_dialog.cpp
+++ b/ui/qt/conversation_hash_tables_dialog.cpp
@@ -27,7 +27,7 @@ ConversationHashTablesDialog::ConversationHashTablesDialog(QWidget *parent) :
     ui->setupUi(this);
     if (parent) loadGeometry(parent->width() * 3 / 4, parent->height() * 3 / 4);
     setAttribute(Qt::WA_DeleteOnClose, true);
-    setWindowTitle(wsApp->windowTitleString(tr("Dissector Tables")));
+    setWindowTitle(wsApp->windowTitleString(tr("Conversation Hash Tables")));
 
     QString html;