3 files changed, 83 insertions, 67 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index a429b63d21..c1d0f3b8bf 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -13,18 +13,19 @@
   extension. To load a bookmark, select the bookmark file and then select
   the bookmark to load. There are other ways to load a bookmarks mentioned
   below.
-  
+
   \note{Bookmarking only works when tracks are launched from the file browser,
         and does not work for tracks launched via the
-        database. In addition, they do not work with dynamic
-        playlists.}
+        database. In addition, they do not work with dynamic (i.e. modified but not saved)
+        playlists. If making a bookmark is not available, saving the playlist
+        is sufficient to allow a bookmark to be made.}
 
   \begin{description}
 
   \item [Bookmark on Stop.]
     This option controls whether Rockbox creates a bookmark when playback is
     stopped manually.
-    \begin{description}    
+    \begin{description}
       \item[No.]
             Do not create bookmarks.
       \item[Yes.]
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index c618f33603..951eded31c 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -10,7 +10,7 @@ change to customise your listening experience.
   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.
-  \nopt{iriverh100,iriverh300,ondavx777}{%
+  \nopt{iriverh100,iriverh300,ondavx777,erosqnative}{%
       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
@@ -28,11 +28,27 @@ change to customise your listening experience.
   \opt{gigabeatf,vibe500}{minimum of -74~dB to a maximum of +6~dB.}%
   \opt{fuzeplus}{minimum of -100~dB to a maximum of +6~dB.}
   \opt{samsungyh}{minimum of -128~dB to a maximum of 0~dB.}
+  \opt{erosqnative}{minimum of -74~dB (mute) to a maximum of -2~dB.}
   \opt{ipodvideo}{\\Remark: Lowering the volume below -57~dB will also affect the line-out
   and the recording gain.}
   \opt{cowond2}{\\Remark: Lowering the volume below -57~dB will also affect the line-out.}
+  \opt{erosqnative}{\note{When the Line Out is used without anything connected to the
+      Headphone port, the volume is fixed. The value is user-configurable; see \setting{Volume Limit}, \reference{ref:volume_limit}.
+      If the Headphone port is connected, the volume once again uses the normal \setting{Volume} setting,
+      regardless of whether the Line Out is in use.}}
 
 \nopt{gigabeats}{
+\section{\label{ref:volume_limit}Volume Limit}
+  This setting adjusts the maximum volume of your music. The setting is by
+  default set to the maximum volume the \dap{} supports. To set a volume
+  limit, select a volume from the list and the maximum volume will be limited to
+  the selected value all over the system.
+  \opt{xduoox3}{This setting also applies to the Line Out of the \dap{}, as at full scale the \dap{} overdrives the signal.}
+  \opt{erosqnative}{On the \playertype{}, when using the Line Out without anything connected to the Headphone port,
+      the volume is fixed to the \setting{Volume Limit} value.
+      \note{On the \playertype{}, the Line Out level at -2~dB is approximately +7~dBV, -4~dB is approximately +4~dBu,
+      and -18~dB is approximately -10~dBV.}}
+
 \section{Bass}
   This setting emphasises
   \nopt{iriverh100,iriverh300}{or suppresses}
@@ -45,13 +61,6 @@ change to customise your listening experience.
   \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500,fuzeplus%
       ,samsungyh}{The minimum setting is -24~dB and the maximum is 24~dB.}
 
-\section{\label{ref:volume_limit}Volume Limit}
-  This setting adjusts the maximum volume of your music. The setting is by
-  default set to the maximum volume which equals to no limit. To set a volume
-  limit, select a volume from the list and the maximum volume will be limited to
-  the selected value all over the system.
-  \opt{xduoox3}{This setting also applies to the Line Out of the \dap{}, as at full scale the \dap{} overdrives the signal.}
-
 \opt{ipodvideo}{
 \section{Bass Cutoff}
   This setting controls the frequency below which the bass adjustment applies.
@@ -353,7 +362,7 @@ change to customise your listening experience.
           ,GIGABEAT_S_PAD,SANSA_C200_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
           ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
           ,SAMSUNG_YH820_PAD}{\ButtonRight}
-      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
+      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD,AIGO_EROSQ_PAD}{\ButtonScrollFwd}
       \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
       \opt{PBELL_VIBE500_PAD}{\ButtonUp}
       \opt{MPIO_HD200_PAD,XDUOO_X3_PAD}{\ButtonVolUp}
@@ -371,7 +380,7 @@ change to customise your listening experience.
           ,GIGABEAT_S_PAD,SANSA_C200_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
           ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
           ,SAMSUNG_YH820_PAD}{\ButtonLeft}
-      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
+      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD,AIGO_EROSQ_PAD}{\ButtonScrollBack}
       \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
       \opt{PBELL_VIBE500_PAD}{\ButtonDown}
       \opt{MPIO_HD200_PAD,XDUOO_X3_PAD}{\ButtonVolDown}
@@ -388,7 +397,7 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
           ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
-          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
+          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,AIGO_EROSQ_PAD}{\ButtonUp}
       \opt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRew}
       \opt{touchscreen}{\ActionStdPrev}
           &
@@ -404,7 +413,7 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
           ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
-          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
+          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,AIGO_EROSQ_PAD}{\ButtonDown}
       \opt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF}
       \opt{touchscreen}{\ActionStdNext}
           &
@@ -419,7 +428,7 @@ change to customise your listening experience.
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD%
           ,SANSA_C200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,SANSA_E200_PAD%
-          ,SANSA_FUZE_PAD,MROBE100_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
+          ,SANSA_FUZE_PAD,MROBE100_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,AIGO_EROSQ_PAD}{\ButtonSelect}
       \opt{MPIO_HD200_PAD}{\ButtonFunc}
       \opt{MPIO_HD300_PAD}{\ButtonEnter}
       \opt{PBELL_VIBE500_PAD}{\ButtonOK}
@@ -444,7 +453,7 @@ change to customise your listening experience.
       \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD}{\ButtonLeft}
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
       \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
-      \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
+      \opt{SANSA_FUZEPLUS_PAD,AIGO_EROSQ_PAD}{\ButtonBack}
       \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
       \opt{touchscreen}{\TouchTopLeft
           \opt{COWON_D2_PAD}{/ \ButtonPower}}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 99ccde0265..5a95df27b1 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -7,48 +7,51 @@
   Options relating to the battery
   in the \dap.
   \begin{description}
-    \item [Battery Capacity.] This setting can be used to tell Rockbox what
-      capacity (in mAh) the battery being used has. The default is
-      \opt{vibe500}{1000~mAh}%
-      \opt{iriverh100,iriverh300}{1300~mAh}%
-      \opt{mpiohd200}{850~mAh}%
-      \opt{ipodmini}{400~mAh (1G) or 630~mAh (2G)}%
-      \opt{ipodcolor}{700~mAh}%
-      \opt{ipodnano}{300~mAh}%
-      \opt{ipodvideo}{400~mAh (30~GB) or 600~mAh (60~GB and 80~GB)}%
-      \opt{ipod4g}{630~mAh}%
-      \opt{ipod3g}{630~mAh}%
-      \opt{ipod1g2g}{1200~mAh}%
-      \opt{iaudiom3,iaudiom5,iaudiox5}{950~mAh}%
-      \opt{gigabeatf}{2000~mAh}%
-      \opt{gigabeats}{700~mAh}%
-      \opt{cowond2}{1600~mAh}%
-      \opt{mrobe100}{720~mAh}%
-      \opt{samsungyh920,samsungyh925}{900~mAh}%
-      \opt{samsungyh820}{650~mAh}%
-      \opt{xduoox3}{2000~mAh}%
-      , which is the capacity value for the standard battery shipped with the \dap.
-        Rockbox uses this value for runtime estimation, not battery percentage
-        calculation. Changing this setting has no effect whatsoever on
-        actual battery life. This setting only affects the accuracy of the
-        runtime estimation as shown on screen.
-      \opt{iaudiom3,iaudiom5,iaudiox5}{Rockbox does not automatically distinguish
-        between the ``L'' models and the ``simple'' models which determine the
-        default value. If your \dap{} is an
-            \opt{iaudiom3}{M3L}%
-            \opt{iaudiom5}{M5L}%
-            \opt{iaudiox5}{X5L}
-        set the value to 2250~mAh for more accuracy in the runtime estimation.}
-      \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
-        family at present, and work is on-going into finding a better way to
-        determine battery life.}
-
-      \opt{battery_types}{
-      \item [Battery Type.] This setting tells Rockbox which type of battery
-        is currently used in the \dap{}.
-       \nopt{xduoox3}{The two supported battery types are ``Alkaline'' or ``NiMH''.}
-       \opt{xduoox3}{Older \playerman{} \playertype{} units shipped with a 1500mAh battery, while newer units ships with a 2000mAh battery.  If you are not sure which type you have, older units have a button marked ``ESC''.}
-        }
+    \nopt{erosqnative}
+    {
+      \item [Battery Capacity.] This setting can be used to tell Rockbox what
+        capacity (in mAh) the battery being used has. The default is
+        \opt{vibe500}{1000~mAh}%
+        \opt{iriverh100,iriverh300}{1300~mAh}%
+        \opt{mpiohd200}{850~mAh}%
+        \opt{ipodmini}{400~mAh (1G) or 630~mAh (2G)}%
+        \opt{ipodcolor}{700~mAh}%
+        \opt{ipodnano}{300~mAh}%
+        \opt{ipodvideo}{400~mAh (30~GB) or 600~mAh (60~GB and 80~GB)}%
+        \opt{ipod4g}{630~mAh}%
+        \opt{ipod3g}{630~mAh}%
+        \opt{ipod1g2g}{1200~mAh}%
+        \opt{iaudiom3,iaudiom5,iaudiox5}{950~mAh}%
+        \opt{gigabeatf}{2000~mAh}%
+        \opt{gigabeats}{700~mAh}%
+        \opt{cowond2}{1600~mAh}%
+        \opt{mrobe100}{720~mAh}%
+        \opt{samsungyh920,samsungyh925}{900~mAh}%
+        \opt{samsungyh820}{650~mAh}%
+        \opt{xduoox3}{2000~mAh}%
+        , which is the capacity value for the standard battery shipped with the \dap.
+          Rockbox uses this value for runtime estimation, not battery percentage
+          calculation. Changing this setting has no effect whatsoever on
+          actual battery life. This setting only affects the accuracy of the
+          runtime estimation as shown on screen.
+        \opt{iaudiom3,iaudiom5,iaudiox5}{Rockbox does not automatically distinguish
+          between the ``L'' models and the ``simple'' models which determine the
+          default value. If your \dap{} is an
+              \opt{iaudiom3}{M3L}%
+              \opt{iaudiom5}{M5L}%
+              \opt{iaudiox5}{X5L}
+          set the value to 2250~mAh for more accuracy in the runtime estimation.}
+        \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
+          family at present, and work is on-going into finding a better way to
+          determine battery life.}
+
+        \opt{battery_types}{
+        \item [Battery Type.] This setting tells Rockbox which type of battery
+          is currently used in the \dap{}.
+         \nopt{xduoox3}{The two supported battery types are ``Alkaline'' or ``NiMH''.}
+         \opt{xduoox3}{Older \playerman{} \playertype{} units shipped with a 1500mAh battery, while newer units ships with a 2000mAh battery.  If you are not sure which type you have, older units have a button marked ``ESC''.}
+          }
+    }
 
       \opt{usb_charging_enable}{
       \item [Charge During USB Connection.] This option lets you control whether
@@ -119,13 +122,16 @@ This sub menu relates to limits in the Rockbox operating system.
     Entries in File Browser} or \setting{Max Playlist Size} to take effect
     while \setting{Glyphs To Cache} will affect the next font load.}
 % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
-  \subsection{Line In} This option activates the line-in port on \dap, which is
-    off by default. This is useful for such applications as:
-    \begin{itemize}
-    \item Game boy $\rightarrow$ \dap $\rightarrow$ human
-    \item laptop $\rightarrow$ \dap $\rightarrow$ human
-    \item LAN party computer $\rightarrow$ \dap $\rightarrow$ human
-    \end{itemize}
+  \nopt{erosqnative}
+  {
+    \subsection{Line In} This option activates the line-in port on \dap, which is
+      off by default. This is useful for such applications as:
+      \begin{itemize}
+      \item Game boy $\rightarrow$ \dap $\rightarrow$ human
+      \item laptop $\rightarrow$ \dap $\rightarrow$ human
+      \item LAN party computer $\rightarrow$ \dap $\rightarrow$ human
+      \end{itemize}
+  }
 \opt{quickscreen}{
   \subsection{Use Shortcuts Menu Instead of Quick Screen} This option
   activates the shortcuts menu instead of opening the quick screen when enabled.