4 files changed, 14 insertions, 17 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index a6c6f86df8..5103f28d67 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -1,10 +1,9 @@
 % $Id$ %
 \section{\label{ref:Bookmarkconfigactual}Bookmarking}
   Bookmarks allow you to save your current position within a track so that 
-  you can return to it at a later time. Bookmarks are saved on a per folder
-  basis. In other words, all of the files in the same folder have their
-  bookmarks stored together in the folder where the files are located. You
-  can store multiple bookmarks for the same track.
+  you can return to it at a later time. Bookmarks are saved on a per directory
+  basis, they are stored in the same directory as the files they reference.
+  You can store multiple bookmarks for the same track.
   \begin{description}
   \item [Bookmark on Stop. ]This option controls whether Rockbox writes a
     bookmark to the disk when playback is stopped. Setting this to
diff --git a/manual/configure_rockbox/file_view.tex b/manual/configure_rockbox/file_view.tex
index 6e74719274..a36b142146 100644
--- a/manual/configure_rockbox/file_view.tex
+++ b/manual/configure_rockbox/file_view.tex
@@ -10,9 +10,9 @@ displays files.
   case letters.  If this option is set to NO, then case will be ignored when 
   sorting files.
 \item[Sort Directories:]
-  This option controls how Rockbox sorts folders.  The default is to sort 
-  them alphabetically. \setting{By date} sorts them with the oldest folder first. 
-  \setting{By newest date} sorts them with the newest folder first.
+  This option controls how Rockbox sorts directories.  The default is to sort 
+  them alphabetically. \setting{By date} sorts them with the oldest directory first. 
+  \setting{By newest date} sorts them with the newest directory first.
   
 \item[Sort Files:]
   This option controls how Rockbox sorts files.  All of the options for 
@@ -30,7 +30,7 @@ displays files.
     files supported by Rockbox (see \reference{ref:Supportedfileformats}).
     Files and directories starting with \fname{.} (\emph{dot}) or with the 
     \emph{hidden} flag set are hidden.
-  \item[Music:] The \setting{File Browser} displays only folders, playlists and
+  \item[Music:] The \setting{File Browser} displays only directories, playlists and
     the supported \emph{audio} file formats. Extensions are stripped. Files and
     directories starting with \fname{.} or with the ``hidden'' flag set are
     hidden.
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index ad307e419f..5c32ffd67a 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -12,16 +12,14 @@ related to audio playback.
   \nopt{ondiosp,ondiofm}{\setting{/A-B}}:
   \begin{description}
     %
-  \item[Off. ]The current directory or playlist will not repeat
-    when it is finished.
+  \item[Off. ]The current playlist will not repeat when it is finished.
     \note{If you have the \setting{Auto change directory} option set to
       \setting{Yes}, Rockbox will move on to the next directory on your
       hard drive. If the \setting{Auto Change Directory} option is set to
       \setting{No}, playback will stop when the current directory or
       playlist is finished.}
     %
-  \item[All. ]The current directory or playlist will repeat when it is
-    finished.
+  \item[All. ]The current playlist will repeat when it is finished.
     \note{This option does \emph{not} shuffle all files on your \dap.
       Rockbox is playlist oriented. When you play a song, a directory, or
       an album, Rockbox creates a playlist and plays it. Thus, to shuffle
@@ -31,8 +29,8 @@ related to audio playback.
     %
   \item[One. ]Repeat one track over and over.
     %
-  \item[Shuffle. ]When the current directory or playlist has finished
-    playing, it will be shuffled and then repeated.
+  \item[Shuffle. ]When the current playlist has finished playing, it will
+    be shuffled and then repeated.
     %
     \nopt{ondiosp,ondiofm}{
     \item[A-B. ]Repeats between two user defined points within a track,
@@ -228,7 +226,7 @@ related to audio playback.
   of a directory. If \setting{Auto-Change Directory} is set to \setting{Yes},
   Rockbox will continue to the next directory. If
   \setting{Auto-Change Directory} is set to \setting{No}, playback will stop at
-  the end of the current directory.
+  the end of the current playlist.
   \note{You must have the \setting{Repeat} option set to \setting{No} for
     \setting{Auto-Change Directory} to function properly.}
 
@@ -267,7 +265,7 @@ related to audio playback.
   start the logging. The log-file is called 
   \opt{CONFIG_RTC}{\fname{.scrobbler.log},}%
   \nopt{CONFIG_RTC}{\fname{.scrobbler-timeless.log},}%
-  and is to be found in  the root directory of your \dap{}. 
+  and is to be found in the root directory of your \dap{}.
   \note{See \wikilink{LastFMLog} for a further description, and for tools you 
     can use to submit your Last.fm log.}
 
diff --git a/manual/configure_rockbox/playlist_options.tex b/manual/configure_rockbox/playlist_options.tex
index dbddad03e6..880d0c6359 100644
--- a/manual/configure_rockbox/playlist_options.tex
+++ b/manual/configure_rockbox/playlist_options.tex
@@ -5,7 +5,7 @@ related to playlists.
 \begin{description}
 \item[Recursively Insert Directories. ]
   If set to \setting{On}, then when a directory is inserted or queued into a 
-  dynamic playlist, all sub-directories will also be inserted. If set to \setting{Ask},
+  dynamic playlist, all subdirectories will also be inserted. If set to \setting{Ask},
   Rockbox will prompt the user about whether to include sub-directories.
 
 \item[Warn When Erasing Dynamic Playlist. ]