3 files changed, 24 insertions, 43 deletions

diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 06eac603e1..583b4c91c7 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -209,20 +209,13 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
 }
 \subsection{The first contact}
 
-After you have  first started the \dap{} you'll be presented by the
-\setting{File Browser}. With the default settings only supported files are
-shown. Rockbox' default view is the \setting{File Browser}, similar to Windows'
-Explorer. If you don't have audio files on your \dap{}, or created folders you
-will only see a blank screen with the statusbar at the top. If this is your
-case, now is a good time to connect your \dap{} to a computer and transfer some
-audio files to it.
-
-When you have files on your \dap{} you'll see the supported ones now. Of
-course you can change this view later. You can also completely switch to
-a view that is based on the meta-data\footnote{ID3 Tags, Vorbis comments, etc.}
-of your audio files. This view is called Database (see
-\reference{ref:database}). Now you can start browsing the folder structure of
-your \dap{}.
+After you have first started the \dap{} you'll be presented by the
+\setting{Main Menu}. From this menu you can reach every function of Rockbox,
+for more information (see \reference{ref:main_menu}). To browse the files
+on you \dap{} select \setting{Files} (see\reference{ref:file_browser}), and to
+browse in a view that is based on the meta-data\footnote{ID3 Tags, Vorbis
+comments, etc.} of your audio files, select \setting{Database} (see
+\reference{ref:database}).
 
 \subsection{Basic controls}
 When browsing files and moving through menus you usually get a list view
@@ -239,20 +232,9 @@ be extended or modified while playing. This is also known as
 To go back to the \setting{File Browser} stop the playback with the
 \ActionWpsStop{} button or return to the file browser while keeping playback
 running using \ActionWpsBrowse{}.
-In list views you can go back one step with \ActionStdCancel{}. The file
-browser is a bit different in this case as pressing \ActionWpsStop{}
-stops the playback instead of going up a level.
+In list views you can go back one step with \ActionTreeParentDirectory.
 
 \subsection{Basic concepts}
-\subsubsection{Main Screen}
-Rockbox' main screen is the \setting{File Browser}. This is pretty different to
-most other players that use the ``While Playing Screen'' as their main screen.
-In Rockbox' view this doesn't make any sense as when you are not playing a
-file, information about the currently playing file isn't available and therefore
-useless. Because of this the \dap{} switches to the \setting{File Browser} when
-playback gets stopped. There is no point showing the WPS when playback is
-stopped, so this is not and will not be possible.
-
 \subsubsection{Playlists}
 Rockbox is playlist oriented. This means that every time you play an audio file,
 a so-called ``dynamic playlist'' is generated, unless you play a saved
diff --git a/manual/rockbox_interface/playback.tex b/manual/rockbox_interface/playback.tex
index aa77a1773d..ac9499c111 100644
--- a/manual/rockbox_interface/playback.tex
+++ b/manual/rockbox_interface/playback.tex
@@ -11,16 +11,17 @@ The \setting{Database Browser}, on the other hand, allows you to navigate
 through the music on your player using categories like album, artist, genre,
 etc.
 
-You can select whether to browse using the \setting{File Browser} or the 
-\setting{Database Browser} by adjusting the \setting{Show Files} setting.  
-If you choose the \setting{File Browser}, the \setting{Show Files} setting also
-lets you select what types of files you wish to view.  See 
+You can select whether to browse using the \setting{File Browser} or the
+\setting{Database Browser} by selecting either \setting{Files} or
+\setting{Database} in the \setting{Main Menu}.
+If you choose the \setting{File Browser}, the \setting{Show Files} setting
+lets you select what types of files you wish to view. See
 \reference{ref:ShowFiles} for more information on the \setting{Show Files}
 setting.
 
 \note{The \setting{File Browser} allows you to manipulate your files in ways
 that are not available within the \setting{Database Browser}. Read more about
-\setting{Database} in \reference{ref:database}.  The remainder of this section
+\setting{Database} in \reference{ref:database}. The remainder of this section
 deals with the \setting{File Browser}.}
 
 \opt{ondio}{
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 161c8447ff..044ed41139 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -11,7 +11,7 @@ files on your player and allows you to browse them by Artist, Album and Genre.
 \subsection{Initializing the database}
 Before you use the database for the first time, you must initialize it by using
 the \setting{Initialize Now} function in the \setting{Database Menu}
-(\setting{General Settings $\rightarrow$ File View $\rightarrow$ Database})
+(\setting{Settings $\rightarrow$ General Settings $\rightarrow$ Database})
 , which is described in the following section.
 
 \subsection{\label{ref:databasemenu}The Database Menu}
@@ -35,10 +35,10 @@ the \setting{Initialize Now} function in the \setting{Database Menu}
   boots, the database will automatically be updated.
   \opt{SWCODEC}{
     \note{The \setting{Auto Update} will only check for deleted files if the
-      \setting{Directory Cache} (\setting{General Settings $\rightarrow$
-      System Options $\rightarrow$ Disk $\rightarrow$ Directory Cache}) is
-      enabled. \setting{Update now} includes that check whether dircache has
-      been enabled or not.}
+      \setting{Directory Cache} (\setting{Settings $\rightarrow$ General
+      Settings $\rightarrow$ System $\rightarrow$ Disk $\rightarrow$
+      Directory Cache}) is enabled. \setting{Update now} includes that check
+      whether dircache has been enabled or not.}
   }%
   \opt{MASCODEC}{\setting{Auto Update} does not detect deleted files. To remove
     deleted files from the database you need to run \setting{Update Now}.}%
@@ -89,15 +89,13 @@ the \setting{Initialize Now} function in the \setting{Database Menu}
 
 \subsection{Using the database}
 Once the database has been initialised, you can browse your music by Artist, 
-Album, Genre and Song Name. To use the database, change the 
-\setting{Show Files} show mode by changing the \setting{General Settings 
-$\rightarrow$ File View $\rightarrow$ Show files} option to 
-\setting{Database}. This disables the \setting{File Browser} and instead
-allows you to view files using the information in the database.\\
+Album, Genre and Song Name. To use the database, go to the \setting{Main Menu}
+and select \setting{Database}.\\
 
 \note{You may need to increase the value of the \setting{Max files in dir 
-browser} setting (\setting{General Settings $\rightarrow$ System $\rightarrow$ 
-Limits}) in order to view long lists of tracks in the ID3 database browser.\\
+browser} setting (\setting{Settings $\rightarrow$ General Settings
+$\rightarrow$ System $\rightarrow$ Limits}) in order to view long lists of
+tracks in the ID3 database browser.\\
 
 There is no option to turn off database completely. If you do not want
 to use it just don't do the initial build of the database and do not load it