Update the AsciiDoc button macro name.

Change the name of the button macro to "btn" in order to be compatible
with AsciiDoctor.

Change-Id: I673e0fe0ae7b343abeb1afba0b9b11402efdf0d6
Reviewed-on: https://code.wireshark.org/review/23187
Reviewed-by: Gerald Combs <gerald@wireshark.org>

6 files changed, 120 insertions, 120 deletions

diff --git a/docbook/wsug_src/WSUG_chapter_capture.asciidoc b/docbook/wsug_src/WSUG_chapter_capture.asciidoc
index 7b4038bb38..635756221b 100644
--- a/docbook/wsug_src/WSUG_chapter_capture.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_capture.asciidoc
@@ -66,7 +66,7 @@ The following methods can be used to start capturing packets with Wireshark:
   Interfaces'' dialog box (menu:Capture[Options...]). See
   <<ChCapCaptureInterfacesDialogWin32>> or <<ChCapCaptureInterfacesDialog>> for
   more information. You can start a capture from this dialog box using the
-  button:[Start] button.
+  btn:[Start] button.
 
 * You can immediately start a capture using your current settings by selecting
   menu:Capture[Start] or by cliking the first toolbar button.
@@ -227,14 +227,14 @@ selected interfaces will inherit the filter. Capture filters are discussed in
 more details in <<ChCapCaptureFilterSection>>. It defaults to empty, or no
 filter.
 +
-You can also click on the button:[Capture Filter] button and Wireshark will
+You can also click on the btn:[Capture Filter] button and Wireshark will
 bring up the Capture Filters dialog box and allow you to create and/or select a
 filter. Please see <<ChWorkDefineFilterSection>>
 
 _Compile selected BPFs_::
 This button allows you to compile the capture filter into BPF code and pop up a
 window showing you the resulting pseudo code. This can help in understanding the
-working of the capture filter you created. The button:[Compile Selected BPFs] button
+working of the capture filter you created. The btn:[Compile Selected BPFs] button
 leads you to <<ChCapCompileSelectedBpfsDialog>>.
 
 [TIP]
@@ -251,7 +251,7 @@ link:{sysfs-main-url}[sysfsutils].
 ====
 
 _Manage Interfaces_::
-The button:[Manage Interfaces] button opens the <<ChCapManageInterfacesDialog>>
+The btn:[Manage Interfaces] button opens the <<ChCapManageInterfacesDialog>>
 where pipes can be defined, local interfaces scanned or hidden, or remote
 interfaces added (Windows only).
 
@@ -345,7 +345,7 @@ addresses into protocols. See <<ChAdvNameResolutionSection>>.
 ==== Buttons
 
 Once you have set the values you desire and have selected the options you need,
-simply click on button:[Start] to commence the capture or button:[Cancel] to
+simply click on btn:[Start] to commence the capture or btn:[Cancel] to
 cancel the capture.
 
 // XXX ChCapRunningSection currently disabled
@@ -436,7 +436,7 @@ This field allows you to specify a capture filter. Capture filters are discussed
 in more details in <<ChCapCaptureFilterSection>>. It defaults to empty, or no
 filter.
 +
-You can also click on the button:[Capture Filter] button and Wireshark will
+You can also click on the btn:[Capture Filter] button and Wireshark will
 bring up the ``Capture Filters'' dialog box and allow you to create and/or
 select a filter. Please see <<ChWorkDefineFilterSection>>
 
@@ -476,13 +476,13 @@ image::wsug_graphics/ws-capture-options-manage-interfaces.png[{screenshot-attrs}
 image::wsug_graphics/ws-capture-options-manage-interfaces-pipes.png[{screenshot-attrs}]
 
 To successfully add a pipe, this pipe must have already been created. Click the
-button:[New] button and type the name of the pipe including its path.
-Alternatively, the button:[Browse] button can be used to locate the pipe. With
-the button:[Save] button the pipe is added to the list of available interfaces.
+btn:[New] button and type the name of the pipe including its path.
+Alternatively, the btn:[Browse] button can be used to locate the pipe. With
+the btn:[Save] button the pipe is added to the list of available interfaces.
 Afterwards, other pipes can be added.
 
 To remove a pipe from the list of interfaces it first has to be selected. Then
-click the button:[Delete] button.
+click the btn:[Delete] button.
 
 ==== Add or hide local interfaces
 
@@ -499,7 +499,7 @@ scanning for a change in the list of available interfaces. To renew the list a
 rescan can be done.
 
 One way to hide an interface is to change the preferences. If the ``Hide''
-checkbox is activated and the button:[Apply] button clicked, the interface will
+checkbox is activated and the btn:[Apply] button clicked, the interface will
 not be seen in the lists of the ``Capture Interfaces'' dialog box any more. The
 changes are also saved in the `preferences` file.
 
@@ -514,7 +514,7 @@ interfaces can be hidden. In contrast to the local interfaces they are not saved
 in the `preferences` file.
 
 To remove a host including all its interfaces from the list, it has to be
-selected. Then click the button:[Delete] button.
+selected. Then click the btn:[Delete] button.
 
 For a detailed description see <<ChCapInterfaceRemoteSection>>
 
@@ -547,7 +547,7 @@ default.
 ====
 
 To access the Remote Capture Interfaces dialog use the ``Add New Interfaces -
-Remote'' dialog. See <<ChCapManageInterfacesRemoteDialog>> and select button:[Add].
+Remote'' dialog. See <<ChCapManageInterfacesRemoteDialog>> and select btn:[Add].
 
 ==== Remote Capture Interfaces
 
@@ -579,7 +579,7 @@ needed to connect to the Remote Packet Capture Protocol service.
 ==== Remote Capture Settings
 
 The remote capture can be further fine tuned to match your situation. The
-button:[Remote Settings] button in <<ChCapEditInterfacesSettingsDialog>> gives
+btn:[Remote Settings] button in <<ChCapEditInterfacesSettingsDialog>> gives
 you this option. It pops up the dialog shown in
 <<ChCapInterfaceRemoteSettingsDialog>>.
 
@@ -911,7 +911,7 @@ dialog'' option in the Capture Options dialog box.
 
 A running capture session will be stopped in one of the following ways:
 
-. Using the button:[Stop] button from the ``Capture Info'' dialog box.
+. Using the btn:[Stop] button from the ``Capture Info'' dialog box.
 
 [NOTE]
 ====
@@ -921,7 +921,7 @@ dialog'' option is used.
 
 . Using the menu:Capture[Stop] menu item.
 
-. Using the button:[Stop] toolbar button.
+. Using the btn:[Stop] toolbar button.
 
 . Pressing kbd:[Ctrl+E].
 
@@ -942,7 +942,7 @@ ways:
 
 . Using the menu:Capture[Restart] menu item.
 
-. Using the button:[Restart] toolbar button.
+. Using the btn:[Restart] toolbar button.
 
 ++++++++++++++++++++++++++++++++++++++
 <!-- End of WSUG Chapter Capture -->
diff --git a/docbook/wsug_src/WSUG_chapter_customize.asciidoc b/docbook/wsug_src/WSUG_chapter_customize.asciidoc
index 618303529a..c1d660fd6f 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_customize.asciidoc
@@ -508,13 +508,13 @@ for DNS may not be applied (DNS is typically carried over UDP and the UDP rule
 will match first).
 ====
 
-You can create a new rule by clicking on the button:[+] button. You can delete
-one or more rules by clicking the button:[-] button. The ``copy'' button will
+You can create a new rule by clicking on the btn:[+] button. You can delete
+one or more rules by clicking the btn:[-] button. The ``copy'' button will
 duplicate a rule.
 
 You can edit a rule by double-clicking on its name or filter. In
 <<ChCustColoringRulesDialog>> the name of the rule ``Checksum Errors'' is being
-edited. Clicking on the button:[Foreground] and button:[Background] buttons will
+edited. Clicking on the btn:[Foreground] and btn:[Background] buttons will
 open a color chooser (<<ChCustChooseColorDialog>>) for the foreground (text) and
 background colors respectively.
 
@@ -524,7 +524,7 @@ image::wsug_graphics/ws-choose-color-rule.png[{small-screenshot-attrs}]
 
 The color chooser appearance depends on your operating system. The macOS color
 picker is shown. Select the color you desire for the selected packets and click
-button:[OK].
+btn:[OK].
 
 <<ChCustColorFilterMany>> shows an example of several color filters being used
 in Wireshark. Note that the frame detail shows that the ``Bad TCP'' rule rule
@@ -583,25 +583,25 @@ letters of the protocol name when the Enabled Protocols dialog box is active
 will temporarily open a search text box and automatically select the first
 matching protocol name (if it exists).
 
-You must use the button:[Save] button to save your settings. The button:[OK] or
-button:[Apply] buttons will not save your changes permanently and they will be
+You must use the btn:[Save] button to save your settings. The btn:[OK] or
+btn:[Apply] buttons will not save your changes permanently and they will be
 lost when Wireshark is closed.
 
 You can choose from the following actions:
 
-. button:[Enable All]: Enable all protocols in the list.
+. btn:[Enable All]: Enable all protocols in the list.
 
-. button:[Disable All]: Disable all protocols in the list.
+. btn:[Disable All]: Disable all protocols in the list.
 
-. button:[Invert]: Toggle the state of all protocols in the list.
+. btn:[Invert]: Toggle the state of all protocols in the list.
 
-. button:[OK]: Apply the changes and close the dialog box.
+. btn:[OK]: Apply the changes and close the dialog box.
 
-. button:[Apply]: Apply the changes and keep the dialog box open.
+. btn:[Apply]: Apply the changes and keep the dialog box open.
 
-. button:[Save]: Save the settings to the disabled_protos, see <<AppFiles>> for details.
+. btn:[Save]: Save the settings to the disabled_protos, see <<AppFiles>> for details.
 
-. button:[Cancel]: Cancel the changes and close the dialog box.
+. btn:[Cancel]: Cancel the changes and close the dialog box.
 
 [[ChAdvDecodeAs]]
 
@@ -624,23 +624,23 @@ These settings will be lost if you quit Wireshark or change profile unless you
 save the entries in the _Show User Specified Decodes..._ windows
 (<<ChAdvDecodeAsShow>>).
 
-. button:[Decode]: Decode packets the selected way.
+. btn:[Decode]: Decode packets the selected way.
 
-. button:[Do not decode]: Do not decode packets the selected way.
+. btn:[Do not decode]: Do not decode packets the selected way.
 
-. button:[Link/Network/Transport]: Specify the network layer at which ``Decode
+. btn:[Link/Network/Transport]: Specify the network layer at which ``Decode
   As'' should take place. Which of these pages are available depends on the
   content of the selected packet when this dialog box is opened.
 
-. button:[Show Current]: Open a dialog box showing the current list of user
+. btn:[Show Current]: Open a dialog box showing the current list of user
   specified decodes.
 
-. button:[OK]: Apply the currently selected decode and close the dialog box.
+. btn:[OK]: Apply the currently selected decode and close the dialog box.
 
-. button:[Apply]: Apply the currently selected decode and keep the dialog box
+. btn:[Apply]: Apply the currently selected decode and keep the dialog box
   open.
 
-. button:[Cancel]: Cancel the changes and close the dialog box.
+. btn:[Cancel]: Cancel the changes and close the dialog box.
 
 [[ChAdvDecodeAsShow]]
 
@@ -653,11 +653,11 @@ can be saved into current profile for later session.
 .The ``Decode As: Show'' dialog box
 image::wsug_graphics/ws-decode-as-show.png[{screenshot-attrs}]
 
-. button:[OK]: Close this dialog box.
+. btn:[OK]: Close this dialog box.
 
-. button:[Save]: Save the entries in the table into current profile.
+. btn:[Save]: Save the entries in the table into current profile.
 
-. button:[Clear]: Removes all user specified decodes without updating the profile.
+. btn:[Clear]: Removes all user specified decodes without updating the profile.
 
 [[ChCustPreferencesSection]]
 
@@ -669,11 +669,11 @@ Wireshark will pop up the Preferences dialog box as shown in
 <<ChCustGUIPrefPage>>, with the ``User Interface'' page as default. On the left
 side is a tree where you can select the page to be shown.
 
-* The button:[OK] button will apply the preferences settings and close the dialog.
+* The btn:[OK] button will apply the preferences settings and close the dialog.
 
-* The button:[Apply] button will apply the preferences settings and keep the dialog open.
+* The btn:[Apply] button will apply the preferences settings and keep the dialog open.
 
-* The button:[Cancel] button will restore all preferences settings to the last saved state.
+* The btn:[Cancel] button will restore all preferences settings to the last saved state.
 
 [[ChCustGUIPrefPage]]
 .The preferences dialog box
@@ -685,7 +685,7 @@ image::wsug_graphics/ws-gui-preferences.png[{screenshot-attrs}]
 
 In the ``Capture'' preferences it is possible to configure several options for the
 interfaces available on your computer. Select the ``Capture'' pane and press the
-button:[Edit] button. In this window it is possible to change the default
+btn:[Edit] button. In this window it is possible to change the default
 link-layer header type for the interface, add a comment or choose to hide a
 interface from other parts of the program.
 
@@ -817,19 +817,19 @@ contain any of the following characters: `&#x5c;', `&#x2f;', `:', `&#x2a;',
 cannot contain the `&#x2f;' character.
 --
 
-button:[OK]::
+btn:[OK]::
 This button saves all changes, applies the selected profile and closes the
 dialog.
 
-button:[Apply]::
+btn:[Apply]::
 This button saves all changes, applies the selected profile and keeps the dialog
 open.
 
-button:[Cancel]::
+btn:[Cancel]::
 Close this dialog. This will discard unsaved settings, new profiles will not be
 added and deleted profiles will not be deleted.
 
-button:[Help]::
+btn:[Help]::
 Show this help page.
 
 [[ChUserTable]]
diff --git a/docbook/wsug_src/WSUG_chapter_io.asciidoc b/docbook/wsug_src/WSUG_chapter_io.asciidoc
index 9e49b437d4..7d4ba05921 100644
--- a/docbook/wsug_src/WSUG_chapter_io.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_io.asciidoc
@@ -60,20 +60,20 @@ Common dialog behaviour on all systems:
 
 * Select files and directories.
 
-* Click the button:[Open] or button:[OK] button to accept your selected file and
+* Click the btn:[Open] or btn:[OK] button to accept your selected file and
   open it.
 
-* Click the button:[Cancel] button to go back to Wireshark and not load a capture file.
+* Click the btn:[Cancel] button to go back to Wireshark and not load a capture file.
 
 Wireshark extensions to the standard behaviour of these dialogs:
 
 * View file preview information such as the filesize and the number of packets
   in a selected a capture file.
 
-* Specify a display filter with the button:[Filter] button and filter field.
+* Specify a display filter with the btn:[Filter] button and filter field.
   This filter will be used when opening the new file. The text field background
   becomes green for a valid filter string and red for an invalid one. Clicking
-  on the button:[Filter] button causes Wireshark to pop up the ``Filters''
+  on the btn:[Filter] button causes Wireshark to pop up the ``Filters''
   dialog box (which is discussed further in <<ChWorkDisplayFilterSection>>).
 +
 // XXX - we need a better description of these read filters
@@ -100,7 +100,7 @@ This is the common Windows file open dialog - plus some Wireshark extensions.
 
 Specific for this dialog:
 
-* The button:[Help] button will lead you to this section of this ``User's Guide''.
+* The btn:[Help] button will lead you to this section of this ``User's Guide''.
 
 [[ChIOOpenFileDialog]]
 
@@ -111,15 +111,15 @@ This is the common Gimp/GNOME file open dialog plus some Wireshark extensions.
 
 Specific for this dialog:
 
-* The button:[+] button allows you to add a directory selected in the
+* The btn:[+] button allows you to add a directory selected in the
   right-hand pane to the favorites list on the left. These changes are
   persistent.
 
-* The button:[-] button allows you to remove a selected directory from the list.
+* The btn:[-] button allows you to remove a selected directory from the list.
   Some items (such as ``Desktop'') cannot be removed from the favorites list.
 
 * If Wireshark doesn't recognize the selected file as a capture file it will
-  grey out the button:[Open] button.
+  grey out the btn:[Open] button.
 
 // XXX Add macOS
 
@@ -283,12 +283,12 @@ You can convert capture files from one format to another by reading in a capture
 file and writing it out using a different format.
 ====
 
-. Click the button:[Save] or button:[OK] button to accept your selected file and
+. Click the btn:[Save] or btn:[OK] button to accept your selected file and
   save to it. If Wireshark has a problem saving the captured packets to the file
-  you specified it will display an error dialog box. After clicking button:[OK]
+  you specified it will display an error dialog box. After clicking btn:[OK]
   on that error dialog box you can try again.
 
-. Click on the button:[Cancel] button to go back to Wireshark without saving any
+. Click on the btn:[Cancel] button to go back to Wireshark without saving any
   packets.
 
 [[ChIOOutputFormatsSection]]
@@ -528,7 +528,7 @@ You may not be interested in the full frames from the text file, just the first
 part. Here you can define how much data from the start of the frame you want to
 import. If you leave this open the maximum is set to 65535 bytes.
 
-Once all input and import parameters are setup click button:[OK] to start the
+Once all input and import parameters are setup click btn:[OK] to start the
 import. If your current data wasn't saved before you will be asked to save it
 first.
 
@@ -569,10 +569,10 @@ with file sets in a convenient way:
 *  The ``List Files'' dialog box will list the files Wireshark has recognized as
    being part of the current file set.
 
-*  button:[Next File] closes the current and opens the next file in the file
+*  btn:[Next File] closes the current and opens the next file in the file
    set.
 
-*  button:[Previous File] closes the current and opens the previous file in the
+*  btn:[Previous File] closes the current and opens the previous file in the
    file set.
 
 [[ChIOFileSetListDialog]]
@@ -600,7 +600,7 @@ the files in the file set can be found.
 The content of this dialog box is updated each time a capture file is
 opened/closed.
 
-The button:[Close] button will, well, close the dialog box.
+The btn:[Close] button will, well, close the dialog box.
 
 [[ChIOExportSection]]
 
@@ -872,8 +872,8 @@ function.
 .The ``Packet Range'' frame
 image::wsug_graphics/ws-packet-range.png[{screenshot-attrs}]
 
-If the button:[Captured] button is set (default), all packets from the selected rule
-will be processed. If the button:[Displayed] button is set, only the currently
+If the btn:[Captured] button is set (default), all packets from the selected rule
+will be processed. If the btn:[Displayed] button is set, only the currently
 displayed packets are taken into account to the selected rule.
 
 * _All packets_ will process all packets.
diff --git a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc b/docbook/wsug_src/WSUG_chapter_statistics.asciidoc
index d2ea5f382a..3644e38be7 100644
--- a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_statistics.asciidoc
@@ -84,7 +84,7 @@ statistical values of one protocol. Two of the columns (_Percent Packets_ and
 _Percent Bytes_) serve double duty as bar graphs. If a display filter is set it
 will be shown at the bottom.
 
-The button:[Copy] button will let you copy the window contents as CSV or YAML.
+The btn:[Copy] button will let you copy the window contents as CSV or YAML.
 
 .Protocol hierarchy columns
 
@@ -159,12 +159,12 @@ between relative (``Rel Start'') and absolute (``Abs Start'') times. Relative st
 times match the ``Seconds Since Beginning of Capture'' time display format in the
 packet list and absolute start times match the ``Time of Day'' display format.
 
-The button:[Copy] button will copy the list values to the clipboard in CSV
-(Comma Separated Values) or YAML format. The button:[Follow Stream...] button
+The btn:[Copy] button will copy the list values to the clipboard in CSV
+(Comma Separated Values) or YAML format. The btn:[Follow Stream...] button
 will show the stream contents as described in <<ChAdvFollowStream>> dialog. The
-button:[Graph...] button will show a graph as described in <<ChStatIOGraphs>>.
+btn:[Graph...] button will show a graph as described in <<ChStatIOGraphs>>.
 
-button:[Conversation Types] lets you choose which traffic type tabs are shown.
+btn:[Conversation Types] lets you choose which traffic type tabs are shown.
 See <<ChStatEndpoints>> for a list of endpoint types. The enabled types
 are saved in your profile settings.
 
@@ -263,11 +263,11 @@ page). _Limit to display filter_ will only show conversations matching the
 current display filter. Note that in this example we have GeoIP configured which
 gives us extra geographic columns. See <<ChGeoIPDbPaths>> for more information.
 
-The button:[Copy] button will copy the list values to the clipboard in CSV
-(Comma Separated Values) or YAML format. The button:[Map] button will show the
+The btn:[Copy] button will copy the list values to the clipboard in CSV
+(Comma Separated Values) or YAML format. The btn:[Map] button will show the
 endpoints mapped in your web browser.
 
-button:[Endpoint Types] lets you choose which traffic type tabs are shown. See
+btn:[Endpoint Types] lets you choose which traffic type tabs are shown. See
 <<ChStatEndpoints>> above for a list of endpoint types. The enabled
 types are saved in your profile settings.
 
@@ -317,10 +317,10 @@ The user can configure the following things:
 
   - __Scale__: the scale for the y unit (Logarithmic,Auto,10,20,50,100,200,500,...)
 
-The button:[Save] button will save the currently displayed portion of the graph as one
+The btn:[Save] button will save the currently displayed portion of the graph as one
 of various file formats.
 
-The button:[Copy] button will copy values from selected graphs to the clipboard in CSV
+The btn:[Copy] button will copy values from selected graphs to the clipboard in CSV
 (Comma Separated Values) format.
 
 
@@ -449,7 +449,7 @@ the MAC layer.
 _Only show existing networks_ will exclude probe requests with a SSID not
 matching any network from the list.
 
-The button:[Copy] button will copy the list values to the clipboard in CSV (Comma
+The btn:[Copy] button will copy the list values to the clipboard in CSV (Comma
 Separated Values) format.
 
 
diff --git a/docbook/wsug_src/WSUG_chapter_use.asciidoc b/docbook/wsug_src/WSUG_chapter_use.asciidoc
index 5bc294f928..955b70d1c6 100644
--- a/docbook/wsug_src/WSUG_chapter_use.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_use.asciidoc
@@ -710,36 +710,36 @@ image::wsug_graphics/ws-main-toolbar.png[{screenshot-attrs}]
 [options="header",cols="1,2,2,4"]
 |===============
 |Toolbar Icon|Toolbar Item|Menu Item|Description
-|image:wsug_graphics/toolbar/capture_interfaces_24.png[{toolbar-icon-attrs}] |button:[Interfaces...]|menu:Capture[Interfaces...]| This item brings up the Capture Interfaces List dialog box (discussed further in <<ChCapCapturingSection>>).
-|image:wsug_graphics/toolbar/capture_options_24.png[{toolbar-icon-attrs}]    |button:[Options...]|menu:Capture[Options...]| This item brings up the Capture Options dialog box (discussed further in <<ChCapCapturingSection>>) and allows you to start capturing packets.
-|image:wsug_graphics/toolbar/capture_start_24.png[{toolbar-icon-attrs}]      |button:[Start]|menu:Capture[Start]| This item starts capturing packets with the options from the last time.
-|image:wsug_graphics/toolbar/capture_stop_24.png[{toolbar-icon-attrs}]       |button:[Stop]|menu:Capture[Stop]| This item stops the currently running live capture process <<ChCapCapturingSection>>).
-|image:wsug_graphics/toolbar/capture_restart_24.png[{toolbar-icon-attrs}]    |button:[Restart]|menu:Capture[Restart]| This item stops the currently running live capture process and restarts it again, for convenience.
-|image:wsug_graphics/toolbar/stock_open_24.png[{toolbar-icon-attrs}]         |button:[Open...]|menu:File[Open...]| This item brings up the file open dialog box that allows you to load a capture file for viewing. It is discussed in more detail in <<ChIOOpen>>.
-|image:wsug_graphics/toolbar/stock_save_as_24.png[{toolbar-icon-attrs}]      |button:[Save As...]|menu:File[Save As...]| This item allows you to save the current capture file to whatever file you would like. It pops up the Save Capture File As dialog box (which is discussed further in <<ChIOSaveAs>>).
+|image:wsug_graphics/toolbar/capture_interfaces_24.png[{toolbar-icon-attrs}] |btn:[Interfaces...]|menu:Capture[Interfaces...]| This item brings up the Capture Interfaces List dialog box (discussed further in <<ChCapCapturingSection>>).
+|image:wsug_graphics/toolbar/capture_options_24.png[{toolbar-icon-attrs}]    |btn:[Options...]|menu:Capture[Options...]| This item brings up the Capture Options dialog box (discussed further in <<ChCapCapturingSection>>) and allows you to start capturing packets.
+|image:wsug_graphics/toolbar/capture_start_24.png[{toolbar-icon-attrs}]      |btn:[Start]|menu:Capture[Start]| This item starts capturing packets with the options from the last time.
+|image:wsug_graphics/toolbar/capture_stop_24.png[{toolbar-icon-attrs}]       |btn:[Stop]|menu:Capture[Stop]| This item stops the currently running live capture process <<ChCapCapturingSection>>).
+|image:wsug_graphics/toolbar/capture_restart_24.png[{toolbar-icon-attrs}]    |btn:[Restart]|menu:Capture[Restart]| This item stops the currently running live capture process and restarts it again, for convenience.
+|image:wsug_graphics/toolbar/stock_open_24.png[{toolbar-icon-attrs}]         |btn:[Open...]|menu:File[Open...]| This item brings up the file open dialog box that allows you to load a capture file for viewing. It is discussed in more detail in <<ChIOOpen>>.
+|image:wsug_graphics/toolbar/stock_save_as_24.png[{toolbar-icon-attrs}]      |btn:[Save As...]|menu:File[Save As...]| This item allows you to save the current capture file to whatever file you would like. It pops up the Save Capture File As dialog box (which is discussed further in <<ChIOSaveAs>>).
 
 If you currently have a temporary capture file, the Save icon  will be shown instead.
 
-|image:wsug_graphics/toolbar/stock_close_24.png[{toolbar-icon-attrs}]        |button:[Close]|menu:File[Close]|This item closes the current capture. If you have not saved the capture, you will be asked to save it first.
-|image:wsug_graphics/toolbar/stock_refresh_24.png[{toolbar-icon-attrs}]      |button:[Reload]|menu:View[Reload]| This item allows you to reload the current capture file.
-|image:wsug_graphics/toolbar/stock_print_24.png[{toolbar-icon-attrs}]        |button:[Print...]|menu:File[Print...]| This item allows you to print all (or some of) the packets in the capture file. It pops up the Wireshark Print dialog box (which is discussed further in <<ChIOPrintSection>>).
-|image:wsug_graphics/toolbar/stock_search_24.png[{toolbar-icon-attrs}]       |button:[Find Packet...]|menu:Edit[Find Packet...]|This item brings up a dialog box that allows you to find a packet. There is further information on finding packets in <<ChWorkFindPacketSection>>.
-|image:wsug_graphics/toolbar/stock_left_arrow_24.png[{toolbar-icon-attrs}]   |button:[Go Back]|menu:Go[Go Back]|This item jumps back in the packet history. Hold down the Alt key (Option on macOS) to go back in the selection history.
-|image:wsug_graphics/toolbar/stock_right_arrow_24.png[{toolbar-icon-attrs}]  |button:[Go Forward]|menu:Go[Go Forward]|This item jumps forward in the packet history. Hold down the Alt key (Option on macOS) to go forward in the selection history.
-|image:wsug_graphics/toolbar/stock_jump_to_24.png[{toolbar-icon-attrs}]      |button:[Go to Packet...]|menu:Go[Go to Packet...]| This item brings up a dialog box that allows you to specify a packet number to go to that packet.
-|image:wsug_graphics/toolbar/stock_top_24.png[{toolbar-icon-attrs}]          |button:[Go To First Packet]|menu:Go[First Packet]| This item jumps to the first packet of the capture file.
-|image:wsug_graphics/toolbar/stock_bottom_24.png[{toolbar-icon-attrs}]       |button:[Go To Last Packet]|menu:Go[Last Packet]| This item jumps to the last packet of the capture file.
-|image:wsug_graphics/toolbar/colorize_24.png[{toolbar-icon-attrs}]           |button:[Colorize]|menu:View[Colorize]| Colorize the packet list (or not).
-|image:wsug_graphics/toolbar/autoscroll_24.png[{toolbar-icon-attrs}]         |button:[Auto Scroll in Live Capture]|menu:View[Auto Scroll in Live Capture]| Auto scroll packet list while doing a live capture (or not).
-|image:wsug_graphics/toolbar/stock_zoom_in_24.png[{toolbar-icon-attrs}]      |button:[Zoom In]|menu:View[Zoom In]| Zoom into the packet data (increase the font size).
-|image:wsug_graphics/toolbar/stock_zoom_in_24.png[{toolbar-icon-attrs}]      |button:[Zoom Out]|menu:View[Zoom Out]| Zoom out of the packet data (decrease the font size).
-|image:wsug_graphics/toolbar/stock_zoom_1_24.png[{toolbar-icon-attrs}]       |button:[Normal Size]|menu:View[Normal Size]| Set zoom level back to 100%.
-|image:wsug_graphics/toolbar/resize_columns_24.png[{toolbar-icon-attrs}]     |button:[Resize Columns]|menu:View[Resize Columns]| Resize columns, so the content fits into them.
-|image:wsug_graphics/toolbar/capture_filter_24.png[{toolbar-icon-attrs}]     |button:[Capture Filters...]|menu:Capture[Capture Filters...]| This item brings up a dialog box that allows you to create and edit capture filters. You can name filters, and you can save them for future use. More detail on this subject is provided in <<ChWorkDefineFilterSection>>.
-|image:wsug_graphics/toolbar/display_filter_24.png[{toolbar-icon-attrs}]     |button:[Display Filters...]|menu:Analyze[Display Filters...]| This item brings up a dialog box that allows you to create and edit display filters. You can name filters, and you can save them for future use. More detail on this subject is provided in <<ChWorkDefineFilterSection>>.
-|image:wsug_graphics/toolbar/stock_colorselector_24.png[{toolbar-icon-attrs}]|button:[Coloring Rules...]|menu:View[Coloring Rules...]| This 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. More detail on this subject is provided in <<ChCustColorizationSection>>.
-|image:wsug_graphics/toolbar/stock_preferences_24.png[{toolbar-icon-attrs}]  |button:[Preferences...]|menu:Edit[Preferences]| This item brings up a dialog box that allows you to set preferences for many parameters that control Wireshark.  You can also save your preferences so Wireshark will use them the next time you start it. More detail is provided in <<ChCustPreferencesSection>>
-|image:wsug_graphics/toolbar/stock_help_24.png[{toolbar-icon-attrs}]         |button:[Help]|menu:Help[Contents]| This item brings up help dialog box.
+|image:wsug_graphics/toolbar/stock_close_24.png[{toolbar-icon-attrs}]        |btn:[Close]|menu:File[Close]|This item closes the current capture. If you have not saved the capture, you will be asked to save it first.
+|image:wsug_graphics/toolbar/stock_refresh_24.png[{toolbar-icon-attrs}]      |btn:[Reload]|menu:View[Reload]| This item allows you to reload the current capture file.
+|image:wsug_graphics/toolbar/stock_print_24.png[{toolbar-icon-attrs}]        |btn:[Print...]|menu:File[Print...]| This item allows you to print all (or some of) the packets in the capture file. It pops up the Wireshark Print dialog box (which is discussed further in <<ChIOPrintSection>>).
+|image:wsug_graphics/toolbar/stock_search_24.png[{toolbar-icon-attrs}]       |btn:[Find Packet...]|menu:Edit[Find Packet...]|This item brings up a dialog box that allows you to find a packet. There is further information on finding packets in <<ChWorkFindPacketSection>>.
+|image:wsug_graphics/toolbar/stock_left_arrow_24.png[{toolbar-icon-attrs}]   |btn:[Go Back]|menu:Go[Go Back]|This item jumps back in the packet history. Hold down the Alt key (Option on macOS) to go back in the selection history.
+|image:wsug_graphics/toolbar/stock_right_arrow_24.png[{toolbar-icon-attrs}]  |btn:[Go Forward]|menu:Go[Go Forward]|This item jumps forward in the packet history. Hold down the Alt key (Option on macOS) to go forward in the selection history.
+|image:wsug_graphics/toolbar/stock_jump_to_24.png[{toolbar-icon-attrs}]      |btn:[Go to Packet...]|menu:Go[Go to Packet...]| This item brings up a dialog box that allows you to specify a packet number to go to that packet.
+|image:wsug_graphics/toolbar/stock_top_24.png[{toolbar-icon-attrs}]          |btn:[Go To First Packet]|menu:Go[First Packet]| This item jumps to the first packet of the capture file.
+|image:wsug_graphics/toolbar/stock_bottom_24.png[{toolbar-icon-attrs}]       |btn:[Go To Last Packet]|menu:Go[Last Packet]| This item jumps to the last packet of the capture file.
+|image:wsug_graphics/toolbar/colorize_24.png[{toolbar-icon-attrs}]           |btn:[Colorize]|menu:View[Colorize]| Colorize the packet list (or not).
+|image:wsug_graphics/toolbar/autoscroll_24.png[{toolbar-icon-attrs}]         |btn:[Auto Scroll in Live Capture]|menu:View[Auto Scroll in Live Capture]| Auto scroll packet list while doing a live capture (or not).
+|image:wsug_graphics/toolbar/stock_zoom_in_24.png[{toolbar-icon-attrs}]      |btn:[Zoom In]|menu:View[Zoom In]| Zoom into the packet data (increase the font size).
+|image:wsug_graphics/toolbar/stock_zoom_in_24.png[{toolbar-icon-attrs}]      |btn:[Zoom Out]|menu:View[Zoom Out]| Zoom out of the packet data (decrease the font size).
+|image:wsug_graphics/toolbar/stock_zoom_1_24.png[{toolbar-icon-attrs}]       |btn:[Normal Size]|menu:View[Normal Size]| Set zoom level back to 100%.
+|image:wsug_graphics/toolbar/resize_columns_24.png[{toolbar-icon-attrs}]     |btn:[Resize Columns]|menu:View[Resize Columns]| Resize columns, so the content fits into them.
+|image:wsug_graphics/toolbar/capture_filter_24.png[{toolbar-icon-attrs}]     |btn:[Capture Filters...]|menu:Capture[Capture Filters...]| This item brings up a dialog box that allows you to create and edit capture filters. You can name filters, and you can save them for future use. More detail on this subject is provided in <<ChWorkDefineFilterSection>>.
+|image:wsug_graphics/toolbar/display_filter_24.png[{toolbar-icon-attrs}]     |btn:[Display Filters...]|menu:Analyze[Display Filters...]| This item brings up a dialog box that allows you to create and edit display filters. You can name filters, and you can save them for future use. More detail on this subject is provided in <<ChWorkDefineFilterSection>>.
+|image:wsug_graphics/toolbar/stock_colorselector_24.png[{toolbar-icon-attrs}]|btn:[Coloring Rules...]|menu:View[Coloring Rules...]| This 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. More detail on this subject is provided in <<ChCustColorizationSection>>.
+|image:wsug_graphics/toolbar/stock_preferences_24.png[{toolbar-icon-attrs}]  |btn:[Preferences...]|menu:Edit[Preferences]| This item brings up a dialog box that allows you to set preferences for many parameters that control Wireshark.  You can also save your preferences so Wireshark will use them the next time you start it. More detail is provided in <<ChCustPreferencesSection>>
+|image:wsug_graphics/toolbar/stock_help_24.png[{toolbar-icon-attrs}]         |btn:[Help]|menu:Help[Contents]| This item brings up help dialog box.
 |===============
 
 [[ChUseFilterToolbarSection]]
@@ -759,7 +759,7 @@ image::wsug_graphics/ws-filter-toolbar.png[{screenshot-attrs}]
 [options="header",cols="1,2,4"]
 |===============
 |Toolbar Icon|Toolbar Item|Description
-|image:wsug_graphics/toolbar/display_filter_24.png[{toolbar-icon-attrs}]|button:[Filter:]|Brings up the filter construction dialog, described in <<FiltersDialog>>.
+|image:wsug_graphics/toolbar/display_filter_24.png[{toolbar-icon-attrs}]|btn:[Filter:]|Brings up the filter construction dialog, described in <<FiltersDialog>>.
 ||_Filter input_|The area to enter or edit a display filter string, see <<ChWorkBuildDisplayFilterSection>>. A syntax check of your filter string is done while you are typing. The background will turn red if you enter an incomplete or invalid string, and will become green when you enter a valid string. You can click on the pull down arrow to select a previously-entered filter string from a list. The entries in the pull down list will remain available even after a program restart.
 
 After you've changed something in this field, don't forget to press the Apply
@@ -767,9 +767,9 @@ button (or the Enter/Return key), to apply this filter string to the display.
 
 This field is also where the current filter in effect is displayed.
 
-|image:wsug_graphics/toolbar/stock_add_24.png[{toolbar-icon-attrs}]     |button:[Expression...]|The middle button labeled "Add Expression..." opens a dialog box that lets you edit a display filter from a list of protocol fields, described in <<ChWorkFilterAddExpressionSection>>
-|image:wsug_graphics/toolbar/stock_clear_24.png[{toolbar-icon-attrs}]   |button:[Clear]|Reset the current display filter and clears the edit area.
-|image:wsug_graphics/toolbar/stock_apply_20.png[{toolbar-icon-attrs}]   |button:[Apply]|Apply the current value in the edit area as the new display filter.
+|image:wsug_graphics/toolbar/stock_add_24.png[{toolbar-icon-attrs}]     |btn:[Expression...]|The middle button labeled "Add Expression..." opens a dialog box that lets you edit a display filter from a list of protocol fields, described in <<ChWorkFilterAddExpressionSection>>
+|image:wsug_graphics/toolbar/stock_clear_24.png[{toolbar-icon-attrs}]   |btn:[Clear]|Reset the current display filter and clears the edit area.
+|image:wsug_graphics/toolbar/stock_apply_20.png[{toolbar-icon-attrs}]   |btn:[Apply]|Apply the current value in the edit area as the new display filter.
 
 Applying a display filter on large capture files might take quite a long time.
 
@@ -804,21 +804,21 @@ be selected by preference settings, see <<ChCustPreferencesSection>>.
 
 The default columns will show:
 
-* button:[No.] The number of the packet in the capture file. This number won't
+* btn:[No.] The number of the packet in the capture file. This number won't
   change, even if a display filter is used.
 
-* button:[Time] The timestamp of the packet. The presentation format of this
+* btn:[Time] The timestamp of the packet. The presentation format of this
   timestamp can be changed, see <<ChWorkTimeFormatsSection>>.
 
-* button:[Source] The address where this packet is coming from.
+* btn:[Source] The address where this packet is coming from.
 
-* button:[Destination] The address where this packet is going to.
+* btn:[Destination] The address where this packet is going to.
 
-* button:[Protocol] The protocol name in a short (perhaps abbreviated) version.
+* btn:[Protocol] The protocol name in a short (perhaps abbreviated) version.
 
-* button:[Length] The length of each packet.
+* btn:[Length] The length of each packet.
 
-* button:[Info] Additional information about the packet content.
+* btn:[Info] Additional information about the packet content.
 
 The first column shows how each packet is related to the selected packet. For
 example, in the image above the first packet is selected, which is a DNS
diff --git a/docbook/wsug_src/WSUG_chapter_work.asciidoc b/docbook/wsug_src/WSUG_chapter_work.asciidoc
index 819d7601b5..ff15c423c3 100644
--- a/docbook/wsug_src/WSUG_chapter_work.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_work.asciidoc
@@ -240,7 +240,7 @@ from the IP address 192.168.0.1, use `ip.addr==192.168.0.1`.
 
 [NOTE]
 ====
-To remove the filter, click on the button:[Clear] button  to the right of the filter field.
+To remove the filter, click on the btn:[Clear] button  to the right of the filter field.
 ====
 
 [[ChWorkBuildDisplayFilterSection]]
@@ -526,12 +526,12 @@ _Range_::
 A range of integers or a group of ranges, such as `1-12` or `39-42,98-2000`.
 
 _OK_::
-When you have built a satisfactory expression click button:[OK] and a filter string
+When you have built a satisfactory expression click btn:[OK] and a filter string
 will be built for you.
 
 _Cancel_::
 You can leave the ``Add Expression...'' dialog box without any effect by
-clicking the button:[Cancel] button.
+clicking the btn:[Cancel] button.
 
 [[ChWorkDefineFilterSection]]
 
@@ -552,8 +552,8 @@ will be marked as such.
 
 [WARNING]
 ====
-You must use button:[Save] to save your filters permanently. button:[OK] or
-button:[Apply] will not save the filters and they will be lost when you close
+You must use btn:[Save] to save your filters permanently. btn:[OK] or
+btn:[Apply] will not save the filters and they will be lost when you close
 Wireshark.
 ====
 
@@ -702,7 +702,7 @@ Go forward in the packet history, works much like the page history in  current w
 .The ``Go To Packet'' dialog box
 image::wsug_graphics/ws-goto-packet.png[{screenshot-attrs}]
 
-This dialog box will let you enter a packet number. When you press button:[OK],
+This dialog box will let you enter a packet number. When you press btn:[OK],
 Wireshark will jump to that packet.
 
 ==== The ``Go to Corresponding Packet'' command