User Guide: Fixes and tweaks to touch documentation.

Fixes #2661.

diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
index 7895a85..f04e537 100644 (file)
--- a/user_docs/en/userGuide.t2t
+++ b/user_docs/en/userGuide.t2t
@@ -158,7 +158,7 @@ Although most laptops do not have a physical numberpad, some laptops can emulate
 If your laptop can not do this, or does not allow you to turn numlock off, you may want to switch to the Laptop layout instead.\r
 \r
 ++ NVDA Touch Gestures ++\r
-If you are running NVDA on a device with a touch screen, and its running Windows 8 or higher, you can also control NVDA directly via the touch screen.\r
+If you are running NVDA on a device with a touch screen and running Windows 8 or higher, you can also control NVDA directly via the touch screen.\r
 While NVDA is running, all touch input will go directly to NVDA. \r
 Therefore, actions that can be performed normally without NVDA will not work.\r
 \r
@@ -168,50 +168,51 @@ To do this, place one finger anywhere on the screen.
 You can also keep your finger on the screen and move it around to read other controls and text that your finger moves over.\r
 \r
 +++ Touch Gestures +++\r
-When NVDA commands are described further along in this user guide, they may list a touch gesture which can be used to activate that command with the touch screen.\r
-Following are some instructions on how to perform the various touch gestures required to perform  NVDA commands with a touch screen.\r
+When NVDA commands are described later in this user guide, they may list a touch gesture which can be used to activate that command with the touch screen.\r
+Following are some instructions on how to perform the various touch gestures.\r
+\r
 ==== Taps ====\r
 Tap the screen quickly with one or more fingers.\r
 \r
 Tapping once with one  finger is simpley known as a tap.\r
-Tapping with 2 fingers at the same time is a 2-finger tap, and so on.\r
+Tapping with 2 fingers at the same time is a 2-finger tap and so on.\r
 \r
-If the same tap is performed one or more times again in quick succession, NVDA will instead see a special multi-tap gesture.\r
+If the same tap is performed one or more times again in quick succession, NVDA will instead treat this as a multi-tap gesture.\r
 Tapping twice will result in a double tap.\r
-Tapping 3 times will result in a tripple tap, and so on.\r
-Of course these multi-tap gestures also recognize how many fingers were used, so its possible to have gestures like a 2-finger tripple tap, or a 4-finger tap, etc. \r
- \r
- ==== Flicks ====\r
+Tapping 3 times will result in a triple tap and so on.\r
+Of course, these multi-tap gestures also recognize how many fingers were used, so it's possible to have gestures like a 2-finger triple tap, a 4-finger tap, etc. \r
+\r
+==== Flicks ====\r
 Quickly swipe your finger across the screen.\r
 \r
-There are 4 possible flick gestures depending on the direction: flick left, flick right, flick up, and flick down.\r
+There are 4 possible flick gestures depending on the direction: flick left, flick right, flick up and flick down.\r
 \r
 Just like taps, more than one finger can be used to perform the gesture.\r
-Therefore gestures such as 2-finger flick up or 4-finger flick left are all possible.\r
+Therefore, gestures such as 2-finger flick up and 4-finger flick left are all possible.\r
 \r
 +++ Touch Modes +++\r
-As there are many more NVDA commands then there are possible touch gestures, NVDA has several touch modes you can switch between, which makes certain subsets of commands available.\r
-The two modes that exist for now are text mode and object mode. \r
+As there are many more NVDA commands than possible touch gestures, NVDA has several touch modes you can switch between which make certain subsets of commands available.\r
+The two modes are text mode and object mode. \r
 Certain NVDA commands listed in this document may have a touch mode listed in brackets after the touch gesture.\r
-For example: flick up (text mode) means that the command will be performed if you flick up, but only while in text mode.\r
-If the command does not have a mode associated with it, it will work in any mode.\r
+For example, flick up (text mode) means that the command will be performed if you flick up, but only while in text mode.\r
+If the command does not have a mode listed, it will work in any mode.\r
 \r
 %kc:beginInclude\r
 To toggle touch modes, perform a 3-finger tap.\r
 %kc:endInclude\r
 \r
- ++ Input Help Mode ++\r
-Many key and touch commands are mentioned through out the rest of this user guide, but an easy way to explore all the different commands is to turn on input help.\r
+++ Input Help Mode ++\r
+Many NVDA commands are mentioned throughout the rest of this user guide, but an easy way to explore all the different commands is to turn on input help.\r
 \r
 To turn on input help, press NVDA+1.\r
 To turn it off, press NVDA+1 again.\r
-While in input help, pressing any key or performing any touch gesture will report the action and describe what it does (if indeed it does do something).\r
+While in input help, performing any input gesture (such as pressing a key or performing a touch gesture) will report the action and describe what it does (if anything).\r
 The actual  commands will not execute while in input help mode.\r
 \r
 ++ The NVDA menu ++\r
 The NVDA menu allows you to control NVDA's settings, access help, save/revert your configuration, Modify speech dictionaries, access additional tools and exit NVDA.\r
 \r
-To get to the NVDA menu from anywhere in Windows while NVDA is running, press NVDA+n on the keyboard, or perform a 2-finger double tap on a touch screen.\r
+To get to the NVDA menu from anywhere in Windows while NVDA is running, press NVDA+n on the keyboard or perform a 2-finger double tap on the touch screen.\r
 You can also get to the NVDA menu via the windows system tray.\r
 Either right-click on the NVDA icon located in the system tray, or access the system tray by pressing the windows logo key+B, DownArrow to the NVDA icon and press the applications key located next to the right control key on most keyboards.\r
 When the menu comes up, You can use the arrow keys to navigate the menu, and the enter key to activate an item.\r
@@ -219,7 +220,7 @@ When the menu comes up, You can use the arrow keys to navigate the menu, and the
 ++ Basic NVDA commands ++\r
 %kc:beginInclude\r
 || Name | Key | Touch | Description |\r
-| Stop speech | Control | | 2-finger tap | Instantly stops speaking |\r
+| Stop speech | Control | 2-finger tap | Instantly stops speaking |\r
 | Pause Speech | Shift | none | Instantly pauses speech. Pressing it again will continue speaking where it left off (if pausing is supported by the current synthesizer) |\r
 | NVDA Menu | NVDA+n | 2-finger double tap | Pops up the NVDA menu to allow you to access preferences, tools and help etc |\r
 | Toggle Speech Mode | NVDA+s | none | Toggles speech mode between speech, beeps and off. |\r
@@ -1458,18 +1459,22 @@ Each entry key can only be listed once per section, including None.
 Gesture identifiers ending in a comma must be enclosed in quotes (" or ').\r
 -\r
 \r
-Gesture identifiers consist of a two letter device code (kb for keyboard, br for braille display and ts for touch screen), a sub-device, layout or mode in brackets, a colon, and then a  type-specific string identifying one or mor keyboard or braille keys, or a touch gesture.\r
-For keyboard gestures, the part in brackets is the keyboard layout and is optional.\r
+Gesture identifiers consist of a two letter device code; a sub-device, layout or mode in brackets; a colon; and then a type-specific string identifying the actual input, such as key or touch gesture names.\r
+- For keyboard gestures, the device code is kb.\r
+The part in brackets is the keyboard layout and is optional.\r
 If not specified, the gesture will apply to all keyboard layouts.\r
 The string after the colon is one or more key names separated by a plus (+) sign.\r
-For braille display gestures, the part in brackets identifies the specific braille display and is mandatory.\r
+- For braille display gestures, the device code is br.\r
+The part in brackets identifies the specific braille display and is mandatory.\r
 The string after the colon is one or more key names separated by a plus (+) sign.\r
-For touch gestures, the part in brackets is the touch mode and is optional.\r
-The string after the colon is a touch gesture such as double_tap, 2fingerflickUp, or 3finger_tap as examples.\r
- \r
+- For touch gestures, the device code is ts.\r
+The part in brackets is the touch mode and is optional.\r
+The string after the colon is a touch gesture; e.g. double_tap, 2fingerflickUp or 3finger_tap.\r
+-\r
+\r
 In order to discover gesture identifiers, script names and the class and module in which they are contained, you can:\r
 + Turn on Input Help.\r
-+ Activate the gesture (press the key, touch the screen etc).\r
++ Activate the gesture (press the key, touch the screen, etc.).\r
 + Turn off input help.\r
 + Activate View log in the NVDA Tools menu.\r
 + Examine the recent log entries.\r