More work on consistent usage of units in the manual. Use non-breaking spaces if applicable.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25649 a1c6a512-1295-4272-9138-f99709370657

11 files changed, 104 insertions, 105 deletions

diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index 99bc626cfa..fe0ffe97e8 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -73,7 +73,7 @@ The recording hardware (the MAS) does not allow us to do this
   The mp3{}-decoding hardware cannot decode OGG. It can be reprogrammed, but 
   there is too little memory for OGG and we have no documentation on how to 
   program the MAS' DSP. Doing the conversion with the CPU is impossible, since 
-  a 12 MHz SH1 is far too slow for this daunting task.
+  a 12~MHz SH1 is far too slow for this daunting task.
 \item Archos Multimedia support.\\
   The Archos Multimedia is a completely different beast. It is an entirely 
   different architecture, different CPU and upgrading the software is done 
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 17e9cb79b6..84bbdf30ab 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -45,7 +45,7 @@
     play selected   & on, off           & N/A\\
     party mode      & on, off           & N/A\\
     scan min step   & 1, 2, 3, 4, 5, 6, 8, 10, 15, 20, 25, 30, 45, 60
-                                        & seconds\\
+                                        & s\\
     seek acceleration & very fast, fast, normal, slow, very slow & N/A\\
     antiskip        & 5s, 15s, 30s, 1min, 2min, 3min, 5min, 10min & N/A\\
     volume fade     & on, off           & N/A\\
@@ -76,15 +76,15 @@
     contrast        & 0 to 63           & N/A\\
     backlight timeout
                     & off, on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30,
-                      45, 60, 90, 120        & seconds\\
+                      45, 60, 90, 120        & s\\
     backlight timeout plugged
                     & off, on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30,
-                      45, 60, 90, 120        & seconds\\
+                      45, 60, 90, 120        & s\\
     backlight filters first keypress & on, off & N/A\\
     backlight on button hold & normal, off, on & N/A\\
     caption backlight & on, off & N/A\\
     brightness      & \fixme{devise a way to get ranges from config-*.h} & N/A\\
-    disk spindown   & 3 to 254          & seconds\\
+    disk spindown   & 3 to 254          & s\\
     battery capacity & \fixme{devise a way to get ranges from config-*.h} & mAh\\
     \opt{battery_types}{
       battery type  & alkaline, nimh    & N/A\\
@@ -101,7 +101,7 @@
                     & multimedia, presentation, browser\opt{usb_hid_mouse}{, mouse}& N/A\\
     }
     idle poweroff   & off, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 30, 45, 60
-                                        & minutes\\
+                                        & min\\
     max files in playlist & 1000 - 32000 & N/A\\
     max files in dir & 50 - 10000       & N/A\\
     lang            & /path/filename.lng & N/A\\
@@ -113,7 +113,7 @@
     use most-recent-bookmarks
                     & off, on           & N/A\\
     pause on headphone unplug & off, pause, pause and resume & N/A\\
-    rewind duration on pause & 0 to 15  & seconds\\
+    rewind duration on pause & 0 to 15  & s\\
     disable autoresume if phones not present & off, on & N/A\\
     Last.fm Logging & off, on           & N/A\\
     talk dir        & off, number, spell& N/A\\
@@ -141,14 +141,14 @@
             90s, 2min, 3min, 5min, 10min, 15min & N/A\\
     prevent track skip
                     & on, off           & N/A\\
-    start in screen & previous, root, files, db, wps, menu,
+    start in screen & previous, root, files, dB, wps, menu,
       \opt{recording}{recording, }
       \opt{radio}{radio, }
       bookmarks                         & N/A\\
     playlist catalog directory & /path/to/dir & N/A\\
     \nopt{wheel_acceleration}{
       list\_accel\_start\_delay & 0 to 10  & ms\\
-      list\_accel\_wait        & 1 to 10  & seconds\\
+      list\_accel\_wait        & 1 to 10  & s\\
     }
 %
     \opt{swcodec}{
@@ -158,36 +158,36 @@
       replaygain noclip
                     & on, off           & N/A\\
       replaygain preamp
-                    & -120 to 120       & 0.1 dB\\
+                    & -120 to 120       & 0.1~dB\\
 %
       \opt{crossfade}{
       crossfade     & off, auto track change, man track skip, shuffle,
                     shuffle or man track skip, always
                                         & N/A\\
       crossfade fade in delay
-                    & 0 to 7            & seconds\\
+                    & 0 to 7            & s\\
       crossfade fade out delay
-                    & 0 to 7            & seconds\\
+                    & 0 to 7            & s\\
       crossfade fade in duration
-                    & 0 to 15           & seconds\\
+                    & 0 to 15           & s\\
       crossfade fade out duration
-                    & 0 to 15           & seconds\\
+                    & 0 to 15           & s\\
       crossfade fade out mode
                     & crossfade, mix    & N/A\\
       }
 %
       crossfeed     & on, off           & N/A\\
       crossfeed direct gain
-                    & 0 to 60           & 0.1 dB\\
+                    & 0 to 60           & 0.1~dB\\
       crossfeed cross gain
-                    & 30 to 120         & 0.1 dB\\
+                    & 30 to 120         & 0.1~dB\\
       crossfeed hf attenuation
-                    & 60 to 240         & 0.1 dB\\
+                    & 60 to 240         & 0.1~dB\\
       crossfeed hf cutoff
                     & 500 to 2000       & Hz\\
 %
       eq enabled    & on, off           & N/A\\
-      eq precut     & 0 to 240          & 0.1 dB\\
+      eq precut     & 0 to 240          & 0.1~dB\\
       eq band 0 cutoff & 0 to 32768     & Hz\\
       eq band 1 cutoff & 0 to 32768     & Hz\\
       eq band 2 cutoff & 0 to 32768     & Hz\\
@@ -198,23 +198,23 @@
       eq band 2 q   & 0 to 64           & N/A\\
       eq band 3 q   & 0 to 64           & N/A\\
       eq band 4 q   & 0 to 64           & N/A\\
-      eq band 0 gain & -240 to 240      & 0.1 dB\\
-      eq band 1 gain & -240 to 240      & 0.1 dB\\
-      eq band 2 gain & -240 to 240      & 0.1 dB\\
-      eq band 3 gain & -240 to 240      & 0.1 dB\\
-      eq band 4 gain & -240 to 240      & 0.1 dB\\
+      eq band 0 gain & -240 to 240      & 0.1~dB\\
+      eq band 1 gain & -240 to 240      & 0.1~dB\\
+      eq band 2 gain & -240 to 240      & 0.1~dB\\
+      eq band 3 gain & -240 to 240      & 0.1~dB\\
+      eq band 4 gain & -240 to 240      & 0.1~dB\\
 %
       dithering enabled & on, off       & N/A\\
 %
       timestretch enabled & on, off     & N/A\\
 %
-      compressor threshold      & 0 to -24      & -3dB\\
+      compressor threshold      & 0 to -24      & -3~dB\\
       compressor makeup gain    & off, auto     & N/A\\
       compressor ratio          & 2:1, 4:1, 6:1, 10:1, limit
                                                 & N/A\\
       compressor knee           & hard knee, soft knee
                                                 & N/A\\
-      compressor release time   & 100 to 1000   & 100 ms\\
+      compressor release time   & 100 to 1000   & 100~ms\\
 %
       beep          & off, weak, moderate, strong & N/A\\
       keyclick      & off, weak, moderate, strong & N/A\\
@@ -226,8 +226,8 @@
     \opt{masf}{
       loudness      & 0 to 17           & N/A\\
       superbass     & on, off           & N/A\\
-      auto volume   & off, 20 ms, 2 s, 4 s, 8 s
-                                        & seconds\\
+      auto volume   & off, 20ms, 2s, 4s, 8s
+                                        & N/A\\
       mdb enable    & on,off            & N/A\\
       mdb strength  & 0 to 127          & dB\\
       mdb harmonics & 0 to 100          & \%\\
@@ -301,10 +301,10 @@
                 & on, off               & N/A\\
       remote backlight timeout
                 & off, on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25,
-                  30, 45, 60, 90        & seconds\\
+                  30, 45, 60, 90        & s\\
       remote backlight timeout plugged
                 & off, on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25,
-                  30, 45, 60, 90        & seconds\\
+                  30, 45, 60, 90        & s\\
       remote caption backlight
                 & on, off               & N/A\\
       remote scroll speed
@@ -343,7 +343,7 @@
                 & off, 0:05, 0:10, 0:15, 0:30, 1:00, 2:00, 4:00, 6:00,
                   8:00, 16:00, 24:00    & h:mm\\
      pre-recording time
-                & off, 1 to 30          & seconds\\
+                & off, 1 to 30          & s\\
      rec directory & /path/to/dir       & N/A\\
     }%
     \opt{spdif_power}{
@@ -357,7 +357,7 @@
       jump scroll
                 & 0 to 5                & N/A\\
       jump scroll delay
-                & 0 to 250              & 0.01 s\\
+                & 0 to 250              & 0.01~s\\
     }%
 
     \bottomrule
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index a35c973200..0b4c5f3e6e 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -164,7 +164,7 @@ produce the information for the next file to be played.
   \opt{swcodec}{
     \config{\%xf} & Crossfade setting, in the order: Off, Auto Skip, Man Skip,
            Shuffle, Shuffle and Man Skip, Always\\
-    \config{\%rg} & ReplayGain value in use (x.y dB). If used as a conditional,
+    \config{\%rg} & ReplayGain value in use (x.y~dB). If used as a conditional,
            Replaygain type in use: \config{\%?rg{\textless}Off{\textbar}Track%
            {\textbar}Album{\textbar}TrackShuffle{\textbar}AlbumShuffle%
            {\textbar}No tag{\textgreater}}\\
@@ -255,7 +255,7 @@ when used with conditional viewports.
 Example: \config{\%?mv2.5{\textless}Volume changing{\textbar}\%pv{\textgreater}}
 
 The example above will display the text ``Volume changing'' if the volume is
-being changed and 2.5 secs after the volume button has been released. After
+being changed and 2.5 seconds after the volume button has been released. After
 that, it will display the volume value.
 
 \section{Settings}
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index b4b6b662ab..b78a155b82 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -33,14 +33,14 @@
         The amount of time that the backlight will take to fade from off to on
         after a button is pressed. If set to \setting{Off} the backlight will
         turn on immediately, with no fade in. Can also be set to 
-        \setting{500 ms}, \setting{1 s} or \setting{2 s}.
+        \setting{500ms}, \setting{1s} or \setting{2s}.
         \item[Backlight Fade Out.]
         Like Backlight fade in, this controls the amount of time that the
         backlight will take to fade from on to off after a button is pressed. If
         set to \setting{Off} the backlight will turn off immediately, with no
-        fade out. Other valid values: \setting{500 ms}, \setting{1 s},
-        \setting{2 s}, \setting{3 s}, \setting{4 s}, \setting{5 s} or 
-        \setting{10 s}.
+        fade out. Other valid values: \setting{500ms}, \setting{1s},
+        \setting{2s}, \setting{3s}, \setting{4s}, \setting{5s} or 
+        \setting{10s}.
       }
       \opt{backlight_fade_bool}{
         \item[Backlight Fade In.]
@@ -200,10 +200,10 @@
       \item[Peak Release.]
         This determines how fast the bar shrinks when the music becomes
         softer. Lower values make the peak meter look smoother.
-        Expressed in scale units per 10 ms.
+        Expressed in scale units per 10~ms.
       \item[Peak Hold Time.]
         Specifies the time after which the peak indicator will reset.
-        For example, if you set this value to 5 s, the peak indicator displays
+        For example, if you set this value to 5~s, the peak indicator displays
         the loudest volume value that occurred within the last 5 seconds.
         Larger values are useful if you want to find the peak level of a song,
         which might be of interest when copying music from the \dap\ via the
@@ -229,8 +229,8 @@
       \item[Minimum and maximum range.]
         These two options define the full value range that the peak meter
         displays. Recommended values for the \setting{Logarithmic} (dB) setting
-        are {}-40 dB for minimum and 0 dB for maximum. Recommended values
-        for \setting{Linear} display are 0 and 100\%. Note that {}-40 dB is
+        are {}-40~dB for minimum and 0~dB for maximum. Recommended values
+        for \setting{Linear} display are 0 and 100\%. Note that {}-40~dB is
         approximately 1\% in linear value, but if you change the minimum
         setting in linear mode slightly and then change to the dB scale,
         there will be a large change. You can use these values for `zooming'
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 3aa22fd950..d9e8e78426 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -194,7 +194,7 @@ you to configure settings related to audio playback.
         much, so here you can compensate for that. Please note that a
         (large) positive pre-amp setting can cause clipping, unless
         prevent clipping is enabled.  The pre-amp can be set to any
-        decibel (dB) value between -12 dB and +12 dB, in increments of 0.5 dB.
+        decibel (dB) value between -12~dB and +12~dB, in increments of 0.5~dB.
       \end{description}
 
   \section{Track Skip Beep}
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 5b2c1d2d68..aa469aca03 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -21,10 +21,10 @@
   \begin{table}[h!]
       \begin{rbtabular}{0.75\textwidth}{lX}%
         {\emph{Frequency} & \emph{Bitrate} (Kbit/s) -- quality 0$\rightarrow$7}{}{}
-        44100 Hz stereo   & 75, 80, 90, 100, 120, 140, 160, 170 \\
-        22050 Hz stereo   & 39, 41, 45, 50,  60,  80,  110, 130 \\
-        44100 Hz mono     & 65, 68, 73, 80,  90,  105, 125, 140 \\
-        22050 Hz mono     & 35, 38, 40, 45,  50,  60,  75,  90 \\
+        44100~Hz stereo   & 75, 80, 90, 100, 120, 140, 160, 170 \\
+        22050~Hz stereo   & 39, 41, 45, 50,  60,  80,  110, 130 \\
+        44100~Hz mono     & 65, 68, 73, 80,  90,  105, 125, 140 \\
+        22050~Hz mono     & 35, 38, 40, 45,  50,  60,  75,  90 \\
       \end{rbtabular}
   \end{table}
 }
@@ -44,30 +44,30 @@
   \section{Frequency}
    \nopt{sansa}{
     Choose the recording frequency (sample rate).
-    \opt{masf}{48 kHz, 44.1 kHz, 32 kHz, 24 kHz, 22.05 kHz, 16 kHz}
-    \opt{h100,h300}{44.1 kHz, 22.05 kHz and 11.025 kHz}
-    \opt{x5}{88.2 kHz, 44.1 kHz, 22.05 kHz and 11.025 kHz}
-    \opt{sansaAMS}{96 kHz, 88.2 kHz, 64 kHz, 48 kHz, 44.1 kHz, 32 kHz, 24 kHz, %
-        22.05 kHz, 16 kHz, 12 kHz, 11.025 kHz and 8 kHz}
-    \opt{gigabeats}{48 kHz, 44.1 kHz, 32 kHz, 24 kHz, 22.05 kHz, 16 kHz, 12 kHz, %
-        11.025 kHz and 8 kHz}
+    \opt{masf}{48~kHz, 44.1~kHz, 32~kHz, 24~kHz, 22.05~kHz, 16~kHz}
+    \opt{h100,h300}{44.1~kHz, 22.05~kHz and 11.025~kHz}
+    \opt{x5}{88.2~kHz, 44.1~kHz, 22.05~kHz and 11.025~kHz}
+    \opt{sansaAMS}{96~kHz, 88.2~kHz, 64~kHz, 48~kHz, 44.1~kHz, 32~kHz, 24~kHz, %
+        22.05~kHz, 16~kHz, 12~kHz, 11.025~kHz and 8~kHz}
+    \opt{gigabeats}{48~kHz, 44.1~kHz, 32~kHz, 24~kHz, 22.05~kHz, 16~kHz, 12~kHz, %
+        11.025~kHz and 8~kHz}
     are available. Higher sample rates use up more disk space, but give better
     sound quality.
-    \opt{swcodec}{\note{The 11.025 kHz setting is not available when using %
+    \opt{swcodec}{\note{The 11.025~kHz setting is not available when using %
       \setting{MPEG Layer 3} format.}
     }%
     \opt{masf}{
       The frequency setting also determines which version of the MPEG standard
       the sound is recorded using:\\
-      MPEG v1 for 48 kHz, 44.1 kHz and 32 kHz.\\
-      MPEG v2 for 24 kHz, 22.05 kHz and 16 kHz.\\
+      MPEG v1 for 48~kHz, 44.1~kHz and 32~kHz.\\
+      MPEG v2 for 24~kHz, 22.05~kHz and 16~kHz.\\
     }
     \opt{recorder,recorderv2fm,h100}
       {\note{You cannot change the sample rate for digital recordings.}
     }
    } % nopt sansa
    \opt{sansa}{
-       Recordings can only be made at a 22.05 kHz frequency (sample rate)
+       Recordings can only be made at a 22.05~kHz frequency (sample rate)
          on this \dap. 
     } % opt sansa
 
@@ -121,7 +121,7 @@
       Set the time to record between each split, if time is used as
       \setting{Split Measure}.\\
       Options (hours:minutes between splits): Off, 00:05, 00:10, 00:15, 00:30,
-      1:00, 1:14 (74 minute  CD), 1:20 (80 minute CD), 2:00, 4:00, 8:00, 10:00,
+      1:00, 1:14 (74 minute CD), 1:20 (80 minute CD), 2:00, 4:00, 8:00, 10:00,
       12:00, 18:00, 24:00.
 
     \item[Split Filesize.]
@@ -242,25 +242,25 @@ More information can be found at \wikilink{VolumeTriggeredRecording}.
     automatically controlling the gain while recording.
     \begin{description}
       \item[Safety (clip).]
-        This preset will lower the gain when the levels get too high (-1 dB)
+        This preset will lower the gain when the levels get too high (-1~dB)
         and will never increase gain.
         
       \item[Live (slow).]
         This preset is designed to be used for recording of live shows and has
         quite large headroom for loud parts. It heads for a nominal target peak
-        level of -9 dB and will slowly increase or decrease gain to reach it.
+        level of -9~dB and will slowly increase or decrease gain to reach it.
         
       \item[DJ-Set (slow).]
-        This preset heads for a nominal target peak level of -5 dB and will
+        This preset heads for a nominal target peak level of -5~dB and will
         slowly increase or decrease gain to reach it.
         
       \item[Medium.]
-        This preset heads for a nominal target peak level of -6 dB and will
+        This preset heads for a nominal target peak level of -6~dB and will
         increase or decrease gain to reach it.
 
       \item[Voice (fast).]
         This preset is designed to be used for voice recording and heads for a
-        nominal target peak level of -7 dB and will quickly increase or
+        nominal target peak level of -7~dB and will quickly increase or
         decrease gain to reach it.
     \end{description}
 
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 13577b2db1..467a90c582 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -7,40 +7,40 @@ change to customise your listening experience.
 \section{\label{ref:volume}Volume}
   This setting adjusts the volume of your music. Like most professional
   audio gear and many consumer audio products, Rockbox uses a decibel scale
-  where 0 dB is a reference that indicates the maximum volume that the \dap{}
+  where 0~dB is a reference that indicates the maximum volume that the \dap{}
   can produce without possible distortion (clipping). All values lower than
   this reference will be negative and yield a progressively softer volume.
   \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodnano2g,ipodvideo,
        ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf}{
-  Values higher than 0 dB are available and can be used to raise the
+  Values higher than 0~dB are available and can be used to raise the
   volume more than would otherwise be possible. These volume levels will
   ordinarily lead to distorted sound, but might work nicely for music that has
   an otherwise low volume level.}
   The volume can be adjusted from a
-  \opt{player}{minimum of -78 dB to a maximum of +18 dB.}%
-  \opt{recorder,recorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
-  \opt{h100,h300}{minimum of -84 dB to a maximum of 0 dB.}%
-  \opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
-  \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}%
-  \opt{ipodvideo}{minimum of -89 dB to a maximum of +6 dB.}%
+  \opt{player}{minimum of -78~dB to a maximum of +18~dB.}%
+  \opt{recorder,recorderv2fm,ondio}{minimum of -100~dB to a maximum of +12~dB.}%
+  \opt{h100,h300}{minimum of -84~dB to a maximum of 0~dB.}%
+  \opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73~dB to a maximum of +6~dB.}%
+  \opt{ipodnano}{minimum of -72~dB to a maximum of +6~dB.}%
+  \opt{ipodvideo}{minimum of -89~dB to a maximum of +6~dB.}%
   \opt{ipodnano2g,ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of 
-  -74 dB to a maximum of +6 dB.}%
-  \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}%
-  \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}%
-  \opt{ipodvideo}{\\Remark: Lowering the volume below -57 dB will also affect the line-out 
+  -74~dB to a maximum of +6~dB.}%
+  \opt{gigabeats}{minimum of -90~dB to a maximum of +6~dB.}%
+  \opt{gigabeatf}{minimum of -74~dB to a maximum of +6~dB.}%
+  \opt{ipodvideo}{\\Remark: Lowering the volume below -57~dB will also affect the line-out 
   and the recording gain.}
   
 \section{Bass}
   This setting emphasises
   \nopt{h100,h300}{or suppresses}
-  the lower (bass) frequencies in the sound. A value of 0 dB means that bass
+  the lower (bass) frequencies in the sound. A value of 0~dB means that bass
   sounds are unaltered (flat response).
-  \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
-  \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
-  \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
-  \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{masd}{The minimum setting is -15~dB and the maximum is 15~dB.}%
+  \opt{masf}{The minimum setting is -12~dB and the maximum is 12~dB.}%
+  \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 24~dB.}%
+  \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6~dB and the maximum is 9~dB.}%
+  \opt{ipodvideo}{The minimum setting is -12~dB and the maximum is 12~dB.}%
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
 \section{Bass Cutoff}
@@ -53,14 +53,14 @@ change to customise your listening experience.
 \section{Treble}
   This setting emphasises
   \nopt{h100,h300}{or suppresses}
-  the higher (treble) frequencies in the sound. A value of 0 dB means that
+  the higher (treble) frequencies in the sound. A value of 0~dB means that
   treble sounds are unaltered (flat response).
-  \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
-  \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
-  \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
-  \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{masd}{The minimum setting is -15~dB and the maximum is 15~dB.}%
+  \opt{masf}{The minimum setting is -12~dB and the maximum is 12~dB.}%
+  \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 6~dB.}%
+  \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6~dB and the maximum is 9~dB.}%
+  \opt{ipodvideo}{The minimum setting is -12~dB and the maximum is 12~dB.}%
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
 \section{Treble Cutoff}
@@ -138,7 +138,7 @@ change to customise your listening experience.
   Auto volume is a feature that automatically lowers the volume on loud parts,
   and then slowly restores the volume to the previous level over a time
   interval. This setting allows this time interval to be configured. Short
-  values like 20 ms are useful for ensuring a constant volume for in-car use and
+  values like 20~ms are useful for ensuring a constant volume for in-car use and
   other applications where background noise makes a constant loudness desirable.
   A longer timeout means that the change in volume back to the previous level
   will be smoother, so there will be fewer sharp changes in volume level.
@@ -149,7 +149,7 @@ change to customise your listening experience.
   This setting changes the threshold at which bass frequencies are affected by
   the \setting{Loudness} setting, making the sound of drums and bass guitar
   louder in comparison to the rest of the sound.  This setting only has an
-  effect if \setting{Loudness} is set to a value larger than 0 dB.
+  effect if \setting{Loudness} is set to a value larger than 0~dB.
 }
 
 \opt{masf}{
@@ -199,10 +199,10 @@ change to customise your listening experience.
     %
     \begin{table}[h!]
        \begin{rbtabular}{0.5\textwidth}{Xc}{Setting & Value}{}{}
-          MDB Strength & 50 dB \\
+          MDB Strength & 50~dB \\
           MDB Harmonics & 48\% \\
-          MDB Centre Frequency & 60 Hz \\
-          MDB Shape & 90 Hz \\
+          MDB Centre Frequency & 60~Hz \\
+          MDB Shape & 90~Hz \\
        \end{rbtabular}
     \end{table}
       
@@ -280,8 +280,8 @@ change to customise your listening experience.
         frequency limit, much like what a ``bass'' control found on ordinary
         stereo systems does.
         Adjust the ``cutoff'' frequency parameter to decide where the shelving
-        starts to take effect. For example, a cutoff frequency of 50 Hz will
-        adjust only very low frequencies. A cutoff frequency of 200 Hz, on the
+        starts to take effect. For example, a cutoff frequency of 50~Hz will
+        adjust only very low frequencies. A cutoff frequency of 200~Hz, on the
         other hand, will adjust a much wider range of bass frequencies.
         The ``gain'' parameter controls how much the loudness of the band is
         adjusted. Positive numbers make the EQ band louder, while negative
@@ -432,7 +432,7 @@ time-varying noise heard when not performing dithering.
 
 After dithering, noise shaping is performed. This basically just pushes the
 dithering noise to the parts of the frequency spectrum humans cannot hear so
-easily. In Rockbox' case, some of the noise is pushed up to above 10 kHz.
+easily. In Rockbox' case, some of the noise is pushed up to above 10~kHz.
 
 This setting will be put to its best use when listening to dynamic music with
 frequently occuring quiet parts, classical music being a typical example. It is
@@ -496,5 +496,5 @@ compressed.  Once the compressor determines that compression is necessary,
 the input signal is reduced appropriately, but the gain isn't allowed to
 immediately return to normal levels.  This is necessary to reduce artifacts
 such as "pumping."  Instead, the gain is allowed to return to normal at the
-chosen rate.  Release Time is the time for the gain to recover by 10 dB.
+chosen rate.  Release Time is the time for the gain to recover by 10~dB.
 }
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index af7695ed48..18209a87a2 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -95,9 +95,8 @@ Rockbox can be configured to turn off power after the unit has been idle for a
 defined number of minutes. The \dap{} is idle when playback is stopped or
 paused. It is not idle while the USB or charger is connected
 \opt{recording}{, or while recording}. 
-Settings are either \setting{Off} or \setting{1} to \setting{10}
-minutes in 1 minute steps. Then \setting{15,30,45} and \setting{60} minutes are
-available.
+Settings are either \setting{Off} or 1 to 10 minutes in 1 minute steps. Then 
+15, 30, 45 or 60 minutes are available.
 
 
 \subsection{Limits}
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index 5e92df5ca0..e5d4cc90ab 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -81,7 +81,7 @@ Display Options Menu
     video is full-screen this means it will get overwritten by the video and
     appear to flash once per second) the average number of frames decoded per
     second, the total number of frames skipped (see the Skip Frames option),
-    the current time (in 100 Hz ticks) and the time the current frame is due to
+    the current time (in 100~Hz ticks) and the time the current frame is due to
     be displayed.
 \item[Limit FPS] (default: on) With this option disabled, mpegplayer will
     display the video as fast as it can. Useful for benchmarking.
diff --git a/manual/plugins/split_editor.tex b/manual/plugins/split_editor.tex
index a38a49d5a8..dad5ca0d70 100644
--- a/manual/plugins/split_editor.tex
+++ b/manual/plugins/split_editor.tex
@@ -179,7 +179,7 @@ The values in the waveform are scaled according to the settings of the
 peak meter. These can be altered in the peak meter settings,
 see \reference{ref:Peakmetersetting}. If extreme minimum or
 maximum values are set the waveform might be cut off.  A minimum
-setting of {}-60 dB and a maximum setting of 0 dB are recommended.
+setting of {}-60~dB and a maximum setting of 0~dB are recommended.
 These settings should be capable of producing useful waveforms for very
 soft sounds in logarithmic mode (dB). When the editor is used on loud
 sounds (such as commercial rock or pop music) switching to the linear
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 0466e6e006..65c7cfd560 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -203,8 +203,8 @@ your WPS (While Playing Screen).
     Between the indicators of the right and left channel there are little dots.
     These dots represent important volume values. In linear mode each dot is a
     10\% mark. In dBFS mode the dots represent the following values (from right
-    to left): 0 dB, {}-3 dB, {}-6 dB, {}-9 dB, {}-12 dB, {}-18 dB, {}-24 dB, {}-30 dB,
-    {}-40 dB, {}-50 dB, {}-60 dB.
+    to left): 0~dB, {}-3~dB, {}-6~dB, {}-9~dB, {}-12~dB, {}-18~dB, {}-24~dB, {}-30~dB,
+    {}-40~dB, {}-50~dB, {}-60~dB.
   \end{description}
 }
 \subsection{\label{sec:contextmenu}The WPS Context Menu}