1 files changed, 15 insertions, 16 deletions

diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index bc486c5c2d..218d38cfaa 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -18,7 +18,7 @@ the disk solely for the purpose of saving settings.  Instead, Rockbox will
 save settings when it spins up the disk the next time, for example when 
 refilling the MP3 buffer or navigating through the file browser. Changes to 
 settings may therefore not be saved unless the \dap\ is shut down safely 
-(see page \pageref{ref:Safeshutdown}).
+(see \rockref{ref:Safeshutdown}).
 
 \section{Navigating the Main Menu}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{
@@ -69,25 +69,25 @@ settings may therefore not be saved unless the \dap\ is shut down safely
   {The list bookmarks screen}{}
 If the \setting{Save a list of recently created bookmarks} option is enabled 
 then you can view a list of several recent bookmarks here and select one to 
-jump straight to that track. See page \pageref{ref:Bookmarkconfigactual} 
+jump straight to that track. See \rockref{ref:Bookmarkconfigactual} 
 for more details on configuring bookmarking in Rockbox.
 \note{This option is off by default.}
 
 \section{Sound Settings}
 The \setting{Sound Settings} menu offers a selection of sound properties you may 
 change to customize your listening experience.  The details of this menu are 
-covered in detail starting on page \pageref{ref:configure_rockbox_sound}. 
+covered in detail in \rockref{ref:configure_rockbox_sound}. 
 
 \section{General Settings}
 The \setting{General Settings} menu allows you to customize the way Rockbox looks 
-and the way it plays music.  The details of this menu are covered in detail 
-starting on page \pageref{ref:configure_rockbox_general}.
+and the way it plays music.  The details of this menu are covered in detail in 
+\rockref{ref:configure_rockbox_general}.
 
 \section{Manage Settings}
 The \setting{Manage Settings} option allows the saving and re-loading of user 
 configuration settings, browse the hard drive for alternate firmwares, and finally
 to reset your \dap\ back to initial configuration. The details of this menu are 
-covered in detail starting on page \pageref{ref:ManageSetting}.
+covered in detail in \rockref{ref:ManageSetting}.
 
 \section{Browse Themes}
 This option will display all the currently installed themes on the \dap, 
@@ -113,9 +113,8 @@ others will be full-blown themes.
 
 \note{Themes do not have to be purely visual.  It is quite possible to create
 a theme that switches between audio configurations for use in the car, with
-headphones and when connected to an external amplifier.  See the section on 
-``Making Your Own Settings File'' on page \pageref{ref:CreateYourOwnWPS} 
-for more details. 
+headphones and when connected to an external amplifier.  See 
+\rockref{ref:CreateYourOwnWPS} for more details.
 }
 
 \opt{CONFIG_TUNER}{\input{main_menu/fmradio.tex}}
@@ -126,7 +125,7 @@ for more details.
   This menu allows you to work with playlists. Playlists can either be created
 automatically by playing a file in a directory directly, which will cause all 
 of the files in that directory to be placed in the playlist, or they can be
-created by hand using the \setting{File Menu} (see page \pageref{ref:Filemenu}) 
+created by hand using the \setting{File Menu} (see \rockref{ref:Filemenu}) 
 or using the \setting{Playlist Options} menu.  Both  automatic and manually 
 created playlists can be edited using this menu.
 
@@ -142,7 +141,7 @@ from where you currently are.
 \item[Save Current Playlist:]
   Saves the current dynamic playlist, excluding queued tracks, to the 
 specified file. If no path is provided then playlist is saved to current 
-directory (see page \pageref{ref:Playlistsubmenu}).
+directory (see \rockref{ref:Playlistsubmenu}).
   
 \item[Recursively Insert Directories: ]
   If set to \setting{On}, then when a directory is inserted or queued into a 
@@ -160,8 +159,8 @@ directory (see page \pageref{ref:Playlistsubmenu}).
   With this option you can load and run various plugins that have been
 written for Rockbox. There are a wide variety of these supplied with
 Rockbox, including several games, some impressive demos and a number of
-utilities. A detailed description of the different plugins begins 
-on page \pageref{ref:plugins}.
+utilities. A detailed description of the different plugins is to be found in 
+\rockref{ref:plugins}.
 
 \section{\label{ref:Info}Info}
   This option shows RAM buffer size, battery voltage level and estimated time
@@ -192,7 +191,7 @@ battery status, hard disk size and the amount of free space on the disk.
   This menu option saves the Rockbox configuration and turns off the hard 
   drive before shutting down the machine. For maximum safety this procedure 
   is recommended when turning off the \dap. (There is a very small risk
-  of hard disk corruption otherwise.) See page \pageref{ref:Safeshutdown}
+  of hard disk corruption otherwise.) See \rockref{ref:Safeshutdown}
   for more details.
 }
 
@@ -207,6 +206,6 @@ battery status, hard disk size and the amount of free space on the disk.
     \opt{IPOD_4G_PAD,IPOD_VIDEO_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
    key, and it allows rapid access to the \setting{Shuffle} and \setting{Repeat} modes 
-  (Page \pageref{ref:PlaybackOptions})
-  and the \setting{Show Files} option (Page \pageref{ref:ShowFiles}).
+  (\rockref{ref:PlaybackOptions})
+  and the \setting{Show Files} option (\rockref{ref:ShowFiles}).
 }