2 files changed, 13 insertions, 3 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index a746198981..bfe314bb6f 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -104,6 +104,9 @@
 
     idle poweroff   & off, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 30, 45, 60
                                         & min\\
+    sleeptimer duration   & 5 to 300 (in steps of 5)
+                                        & min\\
+    sleeptimer on startup & off, on     & N/A\\
     max files in playlist & 1000 - 32000 & N/A\\
     max files in dir & 50 - 10000       & N/A\\
     lang            & /path/filename.lng & N/A\\
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 76063e8fd6..b43cfb1a8f 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -203,7 +203,9 @@ pages of information.}
       \item[Sleep Timer:]
         The \setting{Sleep Timer} powers off your \dap{} after playing for a given
         time. It can be set from \setting{Off} to 5 hours in 5 minute steps.
-        The \setting{Sleep Timer} is reset on boot.
+        While the \setting{Sleep Timer} is reset on boot, the value selected is
+        retained and will be used as the default from then on.
+        If the sleep timer is currently active, \setting{Off} will be highlighted,
       \opt{alarm}{
         \item[Wake-Up Alarm:]
             This option will make the \dap{} start up at the specified time.
@@ -212,12 +214,13 @@ pages of information.}
             \ActionAlarmSet{} confirms the alarm, and \ActionAlarmCancel{} cancels setting
             an alarm. If the \dap{} is turned on again before the alarm occurs, the alarm
             will be cancelled.
-
         \opt{recording,radio}{
             \item[Alarm Wake Up Screen:]
             This option controls what the \dap{} does when it is woken up by the alarm.
         }%\opt{recording,radio}
       }%\opt{alarm}
+      \item[Start Sleep Timer On Boot:]
+          If set, a \setting{Sleep Timer} will be initiated when the device starts.
       \item [Time Format:] Choose 12 or 24 hour clock.
     \end{description}
 }%\opt{rtc}
@@ -241,7 +244,11 @@ pages of information.}
   \item[Sleep Timer:]
     The \setting{Sleep Timer} powers off your \dap{} after playing for a given
     time. It can be set from \setting{Off} to 5 hours in 5 minute steps.
-    The \setting{Sleep Timer} is reset on boot.
+    While the \setting{Sleep Timer} is reset on boot, the value selected is
+    retained and will be used as the default from then on.
+    If the sleep timer is currently active, \setting{Off} will be highlighted,
+  \item[Start Sleep Timer On Boot:]
+    If set, a \setting{Sleep Timer} will be initiated when the device starts.
 }
 
 \item[Running Time:]