1 files changed, 44 insertions, 35 deletions

diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 1343957d87..7ade78d7df 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -2,10 +2,11 @@
 \section{\label{ref:tagcache}Tag Cache} 
 
 \subsection{Introduction}
-Tag Cache is the Rockbox music database system. Using the information 
-contained in the tags (ID3v1, ID3v2, Vorbis Comments, Apev2, etc.) in your 
-audio files, Rockbox builds and maintains a database of the music files on 
-your player and allows you to browse them by Artist, Album and Genre.
+Tag Cache is the Rockbox music database system. Using the information
+contained in the tags (ID3v1, ID3v2%
+  \opt{SWCODEC}{, Vorbis Comments, Apev2, etc.}%
+) in your audio files, Rockbox builds and maintains a database of the music
+files on your player and allows you to browse them by Artist, Album and Genre.
 
 \subsection{Initializing the Tag Cache}
 Before you use the Tag Cache for the first time, you must initialize it by using
@@ -23,40 +24,49 @@ described in the following section.
     option to \setting{No} keeps the tagcache on the disk, meaning slower 
     browsing but it does not use extra RAM and saves some battery on boot up. 
     
-    \note{If you use TagCache frequently, you should load to RAM, as this
-      will reduce the overall battery consumption because the disk will not
-      need to spin on each search.}
+    \note{If you browse your music frequently using Tag Cache, you should load
+      to RAM, as this will reduce the overall battery consumption because the
+      disk will not need to spin on each search.}
   }
   
 \item[Auto Update:  ]
   If \setting{Auto update} is set to \setting{on}, each time the \dap{}
-  boots, Tag Cache will automatically do everything that the 
-  \setting{Update now} setting does.  Note that the \setting{Auto
-    Update} will only check for deleted files if the Directory Cache
-  (\setting{General Settings $\rightarrow$ System $\rightarrow$
-    Disk $\rightarrow$ Directory Cache}) is enabled.  
-  \setting{Update now} includes that check whether dircache has been enabled or
-  not.
-  
+  boots, Tag Cache will automatically update the database.
+  \opt{SWCODEC}{
+    \note{The \setting{Auto Update} will only check for deleted files if the
+      \setting{Directory Cache} (\setting{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}.}%
+
 \item[Initialize Now:  ]
-  Before you use the Tag Cache for the first time, you must initialize it by 
-  using the \setting{Initialize Now} function in the \setting{Tag Cache 
-    Menu}.  \setting{Initialize Now} removes all database files (removing 
-  runtimedb data also) and rebuilds the database from scratch. This takes 
-  approximately 5 to 10 minutes, and may require a restart to allow the 
-  files to be committed to the cache. 
-  
-  The Tag Cache initialization happens in the background, so you can continue 
-  to listen to music while the Tag Cache is being initialized.  If you shut 
-  down your player during initialization, the database building process will 
+  Before you use the Tag Cache for the first time, you must initialize it by
+  using the \setting{Initialize Now} function in the \setting{Tag Cache
+    Menu}.
+  \warn{\setting{Initialize Now} removes all database files (removing
+    runtimedb data also) and rebuilds the database from scratch.}
+  This can take quite a while depending on the number of music files on your
+  \dap{}, and may require a restart to allow the files to be committed to the
+  cache.
+
+  The Tag Cache initialization happens in the background, so you can continue
+  to listen to music while the Tag Cache is being initialized. If you shut
+  down your player during initialization, the database building process will
   continue next time you turn it on.
   
 \item[Update Now:  ]
-  \setting{Update now} causes Tag Cache to detect new and deleted files 
-  Note that unlike the \setting{Auto Update} function, \setting{Update Now} 
-  will update the database regardless of whether the \setting{Directory Cache}
-  is enabled.  Thus, an update using \setting{Update now} may take a long
-  time.  Unlike \setting{Initialize Now}, the \setting{Update Now} function 
+  \setting{Update now} causes Tag Cache to detect new and deleted files
+  \opt{SWCODEC}{
+    \note{Unlike the \setting{Auto Update} function, \setting{Update Now}
+      will update the database regardless of whether the \setting{Directory Cache}
+      is enabled. Thus, an update using \setting{Update now} may take a long
+      time.
+    }
+  }
+  Unlike \setting{Initialize Now}, the \setting{Update Now} function
   does not remove runtime database information.
   
 \item[Gather Runtime Data (Experimental):  ]
@@ -66,8 +76,8 @@ described in the following section.
 \item[Export modifications:  ]
   This allows for the runtime data to be exported into \\
   \fname{/.rockbox/tagcache\_changelog.txt}, which backs up the runtime data in
-  ASCII format. This is needed when Tag Cache structures change, because new 
-  code cannot read old Tag Cache database code.  But, all modifications 
+  ASCII format. This is needed when Tag Cache structures change, because new
+  code cannot read old Tag Cache database code. But, all modifications
   exported to ASCII format should be readable by all Tag Cache versions.
   
 \item[Import modifications:  ]
@@ -79,10 +89,10 @@ described in the following section.
 
 \subsection{Using the Tag Cache}
 Once the Tag Cache has been initialized, you can browse your music by Artist, 
-Album, Genre and Song Name.  To use the Tag Cache, change the 
+Album, Genre and Song Name. To use the Tag Cache, change the 
 \setting{Show Files} show mode by changing the \setting{General Settings 
 $\rightarrow$ File View $\rightarrow$ Show files} option to 
-\setting{ID3 database}.  This disables the \setting{File Browser} and instead
+\setting{ID3 database}. This disables the \setting{File Browser} and instead
 allows you to view files using the information in the Tag Cache database.\\
 
 \note{You may need to increase the value of the \setting{Max files in dir 
@@ -111,4 +121,3 @@ to RAM.}
   \end{tabularx}
 \end{center}
 \end{table}
-