; Improve recently installed documentation

* etc/NEWS: Fix a typo.

* doc/lispref/commands.texi (Touchscreen Events): Fix wording and
indexing.

diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 136fa56987b3b317a10aa05b1b158501ac296268..0a324a642fe4a2cd00e3fed02ab2495ca4c3bc84 100644 (file)
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1842,18 +1842,18 @@ as the mouse cursor remains pointing to the same glyph in the text.
 @cindex support for touchscreens
 
 Some window systems provide support for input devices that react to
-the user's finger, and translate those finger movements into points at
-an on-screen position.  These input devices are known as touchscreens,
-and Emacs reports the movements they generate as @dfn{touchscreen
-events}.
+the user's touching the screen and moving fingers while touching the
+screen.  These input devices are known as touchscreens, and Emacs
+reports the events they generate as @dfn{touchscreen events}.
 
 Most individual events generated by a touchscreen only have meaning as
 part of a larger sequence of other events: for instance, the simple
 operation of tapping the touchscreen involves the user placing and
-releasing a finger on the touchscreen, and swiping the display to
+raising a finger on the touchscreen, and swiping the display to
 scroll it involves placing a finger, moving it many times upwards or
-downwards, and then releasing the finger.
+downwards, and then raising the finger.
 
+@cindex touch point, in touchscreen events
 While a simplistic model consisting of one finger is adequate for taps
 and scrolling, more complicated gestures require support for keeping
 track of multiple fingers, where the position of each finger is
@@ -1864,7 +1864,6 @@ positions of their individual points determine the amount by which to
 zoom the display, and the center of an imaginary line between those
 positions determines where to pan the display after zooming.
 
-@cindex touch point representation
 The low-level touchscreen events described below can be used to
 implement all the touch sequences described above.  In those events,
 each point is represented by a cons of an arbitrary number identifying
@@ -1879,15 +1878,15 @@ finger against the touchscreen.
 
 @cindex @code{touchscreen-update} event
 @item (touchscreen-update @var{points})
-This event is sent when an point on the touchscreen has changed
-position.  @var{points} is a list of touchpoints containing the
-up-to-date positions of each touchpoint currently on the touchscreen.
+This event is sent when a point on the touchscreen has changed
+position.  @var{points} is a list of touch points containing the
+up-to-date positions of each touch point currently on the touchscreen.
 
 @cindex @code{touchscreen-end} event
 @item (touchscreen-end @var{point})
 This event is sent when @var{point} is no longer present on the
 display, because another program took the grab, or because the user
-released the finger.
+raised the finger from the touchscreen.
 @end table
 
 @node Focus Events

diff --git a/etc/NEWS b/etc/NEWS
index 61e1cd12af9a5d58072d14e36d8f5abab037301b..bd1ed4da00c3ca0ad7946f5129bb48bf9eec4d58 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1164,7 +1164,7 @@ assumes a time of 00:00 instead of signaling an error.
 
 +++
 ** New events for taking advantage of touchscreen devices.
-The events 'touchscreen-down', 'touchscreen-update' and
+The events 'touchscreen-begin, 'touchscreen-update', and
 'touchscreen-end' have been added to take better advantage of
 touch-capable display panels.