9 files changed, 21 insertions, 21 deletions

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index ae50eb9527..5fa771aa8d 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -53,8 +53,8 @@ file find the instructions on the Rockbox website:
   and the menus. The backdrop image must be a \fname{.bmp} file of the exact
   same dimensions as the display in your \dap{} (\genericimg{} with the last
   number giving the colour depth in bits). To use an image as a backdrop browse
-  to it in the \setting{File Browser} and open the \setting{File Menu}
-  (see \reference{ref:Filemenu}) on it and select the option
+  to it in the \setting{File Browser} and open the \setting{Context Menu}
+  (see \reference{ref:Contextmenu}) on it and select the option
   \setting{Set As Backdrop}. If you want rockbox to remember your
   backdrop the next time you start your \dap{} the backdrop must be placed in
   the \fname{/.rockbox/backdrops} directory.
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 73e9124e15..b12f5cc80d 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -2,7 +2,7 @@
 \screenshot{main_menu/images/ss-recording-settings}{The recording settings screen}{}
 
 \note{To change the location where recordings are stored open the
-      \setting{File Menu} (see \reference{ref:Filemenu}) on the directory
+      \setting{Context Menu} (see \reference{ref:Contextmenu}) on the directory
       where you want to store them in the \setting{File Browser} and select
       \setting{Set As Recording Directory}.}
 
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 418421e075..56c4b7f32d 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -120,7 +120,7 @@ to recording. The details of this menu are covered in detail in
   This menu allows you to work with playlists. Playlists can be created in 
   three ways. Playing a file in a directory causes all the files in it
   to be placed in a playlist. Playlists can be created manually by
-  either using the  \setting{File Menu} (see \reference{ref:Filemenu}) or using
+  either using the  \setting{Context Menu} (see \reference{ref:Contextmenu}) or using
   the \setting{Playlist} menu. Both automatically and manually created
   playlists can be edited using this menu.
 
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 5a62138340..74b1008de9 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -10,7 +10,7 @@ them can be started from \setting{Browse Plugins} in the \setting{Main Menu}.
 
 Viewer plugins get started automatically by opening an associated file (i.e.
 text files, chip8 games), or from the \setting{Open with} option on the
-\setting{File Menu}.
+\setting{Context Menu}.
 
 \section{Games}
 \opt{HAVE_LCD_BITMAP}
diff --git a/manual/plugins/text_editor.tex b/manual/plugins/text_editor.tex
index 758cd443d6..aaa7f403de 100644
--- a/manual/plugins/text_editor.tex
+++ b/manual/plugins/text_editor.tex
@@ -1,7 +1,7 @@
 \subsection{Text Editor}
 This plugin allows you to view and edit simple text documents on your DAP.
 You can view files by using \setting{Open with} from the
-\setting{File Menu} (see \reference{ref:Filemenu}).
+\setting{Context Menu} (see \reference{ref:Contextmenu}).
 
 \subsubsection{Usage}
 If you start the Text Editor from the plugin browser you will be greeted with
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 8d6327470b..ada09092f1 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -3,7 +3,7 @@ This is a Viewer for text files with word wrap. Just open a .txt file to
 display it. The text viewer features controls to handle various styles of text
 formatting, has top{}-of{}-file and bottom{}-of{}-file buttons. You can view
 files without a \fname{.txt} extension by using \emph{Open with} from the
-\emph{File Menu} (see \reference{ref:Filemenu}).
+\emph{Context Menu} (see \reference{ref:Contextmenu}).
 
 \subsubsection{Mode settings}
 
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 41ee3cff67..0aa6e8951a 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -75,7 +75,7 @@ the \setting{Show Files} setting to all.
         }%
       %
       \ActionStdContext{}
-      & Enter the \setting{File Menu}\\
+      & Enter the \setting{Context Menu}\\
       %
       \ActionStdMenu{}
       & Enter the \setting{Main Menu}\\
@@ -99,19 +99,19 @@ the \setting{Show Files} setting to all.
   bottom of the screen.
 }
 
-\subsection{\label{ref:Filemenu}\label{ref:PartIISectionFM}File Menu}
-\screenshot{rockbox_interface/images/ss-file-menu}{The File Menu}{}
+\subsection{\label{ref:Contextmenu}\label{ref:PartIISectionFM}Context Menu}
+\screenshot{rockbox_interface/images/ss-file-menu}{The Context Menu}{}
 
-The \setting{File Menu} allows you to perform certain operations on files or 
-directories.  To access the \setting{File Menu}, position the selector over a file 
+The \setting{Context Menu} allows you to perform certain operations on files or 
+directories.  To access the \setting{Context Menu}, position the selector over a file 
 or directory and access the context menu with \ActionStdContext{}.
 
-\note{The \setting{File Menu} is a context sensitive menu.  If the 
-\setting{File Menu} is invoked on a file, it will display options available 
-for files.  If the \setting{File Menu} is invoked on a directory, 
+\note{The \setting{Context Menu} is a context sensitive menu.  If the 
+\setting{Context Menu} is invoked on a file, it will display options available 
+for files.  If the \setting{Context Menu} is invoked on a directory, 
 it will display options for directories.}
 
-The \setting{File Menu} contains the following options (unless otherwise noted, 
+The \setting{Context Menu} contains the following options (unless otherwise noted, 
 each option pertains both to files and directories):
 
 \begin{description}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index b233f08020..a775360d3f 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -197,7 +197,7 @@ album etc. To access this screen, %
   to move through the information.}%
 \subsubsection{Open With...}
 This \setting{Open With} function is the same as the \setting{Open With} 
-function in the \setting{File Context Menu}.
+function in the file browser's \setting{Context Menu}.
 
 \nopt{player}{
   \subsubsection{\label{sec:pitchscreen}Pitch}
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index f6c651dfd1..107126e25e 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -60,7 +60,7 @@ This will \emph{erase} any dynamic playlist.
 \subsubsection{\label{ref:playlist_catalog}By using the Playlist catalog}
 The \setting{Playlist catalog} makes it possible to modify and create playlists
 that are not currently playing. To do this select \setting{Playlist catalog}
-in the \setting{File Menu}. There you will have two choices,
+in the \setting{Context Menu}. There you will have two choices,
 \setting{Add to playlist} adds the selected track or directory to an existing
 playlist and \setting{Add to a new playlist} creates a new playlist containing
 the selected track or directory.
@@ -69,7 +69,7 @@ the selected track or directory.
   \fname{/Playlists} directory in the root of your \daps{} harddisk and
   playlists stored in other locations are not included in the catalog. It is
   however possible to move existing playlists there (see
-  \reference{ref:Filemenu}).}
+  \reference{ref:Contextmenu}).}
 
 \subsubsection{By using the Main Menu}
 To create a playlist containing all music on your \dap{}, you can use the
@@ -81,8 +81,8 @@ in the \setting{Main Menu}. The created playlist will be named
   
 \subsubsection{\label{ref:playlist_submenu}Adding music to a dynamic playlist}
 \screenshot{rockbox_interface/images/ss-playlist-menu}{The Playlist Submenu}{}
-The \setting{Playlist Submenu} is a submenu in the \setting{File Menu} (see
-\reference{ref:Filemenu}), it allows you to put tracks into a
+The \setting{Playlist Submenu} is a submenu in the \setting{Context Menu} (see
+\reference{ref:Contextmenu}), it allows you to put tracks into a
 ``dynamic playlist''. If there is no music currently playing, Rockbox will
 create a new dynamic playlist and put the selected track(s) into it.
 If there is music currently playing, Rockbox will put the