aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsug_src/WSUG_chapter_io.adoc
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-10-29 09:13:53 -0700
committerRoland Knall <rknall@gmail.com>2019-11-03 13:15:33 +0000
commit530c30e8a8e7c1fd5f33d086877e2c562a505948 (patch)
treebeb2735838d2b75e8bc5fe8644a91fb5b6a2e051 /docbook/wsug_src/WSUG_chapter_io.adoc
parent148120160fe67e77d0c728f26b07efa40c6c2a62 (diff)
Docs: Try to make our "drag and drop" usage more consistent.
Apple uses "drag and drop" and "drag-and-drop": https://developer.apple.com/design/human-interface-guidelines/macos/user-interaction/drag-and-drop/ https://support.apple.com/guide/mac-help/drag-and-drop-items-mh35852/mac https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/DragandDrop/DragandDrop.html So does Microsoft: https://docs.microsoft.com/en-us/windows/win32/com/drag-and-drop Qt and KDE use "drag and drop": https://doc.qt.io/qt-5/dnd.html https://docs.kde.org/stable5/en/applications/konsole/drag-and-drop.html GTK+ and GNOME uses "drag-and-drop" https://developer.gnome.org/gtk-tutorial/stable/c1899.html Wikipedia uses "drag and drop" and "drag-and-drop" https://en.wikipedia.org/wiki/Drag_and_drop Let's go with "drag and drop" (and "dragging and dropping") in the release notes and User's Guide. Change-Id: I5010478e5d15928a3a8a7528296c3f5cdc98f3ab Reviewed-on: https://code.wireshark.org/review/34921 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'docbook/wsug_src/WSUG_chapter_io.adoc')
-rw-r--r--docbook/wsug_src/WSUG_chapter_io.adoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/docbook/wsug_src/WSUG_chapter_io.adoc b/docbook/wsug_src/WSUG_chapter_io.adoc
index 4b80d7a6c1..db317d3956 100644
--- a/docbook/wsug_src/WSUG_chapter_io.adoc
+++ b/docbook/wsug_src/WSUG_chapter_io.adoc
@@ -29,10 +29,10 @@ select the menu:File[Open] menu or toolbar item. Wireshark will then pop up
the “File Open” dialog box, which is discussed in more detail in <<ChIOOpen>>.
[TIP]
-.It’s convenient to use drag-and-drop
+.You can use drag and drop to open files
====
You can open a file by simply dragging it in your file manager and dropping it
-onto Wireshark’s main window. However, drag-and-drop may not be available in all
+onto Wireshark’s main window. However, drag and drop may not be available in all
desktop environments.
====
@@ -359,7 +359,7 @@ There are three ways to merge capture files using Wireshark:
<<ChIOMergeDialog>>. This menu item will be disabled unless you have loaded a
capture file.
-* Use _drag-and-drop_ to drop multiple files on the main window. Wireshark will
+* Use _drag and drop_ to drop multiple files on the main window. Wireshark will
try to merge the packets in chronological order from the dropped files into a
newly created temporary file. If you drop only a single file it will simply
replace the existing capture.