autoresume: Manual: Clarify precedence rules for resume positions

Resume positions stored in bookmarks take precedence over autoresume.

Technically, the resume position for the "Resume Playback" function
(which is also saved across power-off/power-on) also takes precedence
over autoresume.  However, there is no way for a user to tell as it is
identical to the autoresume position for the last-played track, so
don't highlight it in the manual.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29548 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 2 deletions

diff --git a/manual/configure_rockbox/autoresume.tex b/manual/configure_rockbox/autoresume.tex
index 3042f3b04e..10398fd2c3 100644
--- a/manual/configure_rockbox/autoresume.tex
+++ b/manual/configure_rockbox/autoresume.tex
@@ -9,8 +9,10 @@ database has been initialized.
 When automatic resume is enabled, manually selected tracks resume
 playback at their last playback position.  It does not matter in which
 way you start the track; tracks are resumed whether they are navigated
-to through the database browser or file browser, from a playlist or
-bookmark, or by skipping through tracks in a playlist.
+to through the database browser or file browser, by starting a
+playlist, or by skipping through tracks in the current playlist.  (As
+an exception, when a track is resumed by loading a bookmark, the
+playback position saved in the bookmark takes precedence.)
 
 Optionally, you can also enable automatic resume for automatic track
 transitions.  In this case, the next track will be resumed as well