3 files changed, 18 insertions, 0 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index f6c95652a9..43f6aea203 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -95,6 +95,11 @@
     \opt{accessory_supply}{
       accessory power supply & on, off & N/A\\
     }
+    \opt{usb_hid}{
+        usb hid & on, off & N/A\\
+        usb keypad mode
+                    & 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\\
     max files in playlist & 1000 - 32000 & N/A\\
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 6a98b32a20..0651d61f7d 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -183,6 +183,14 @@ this option \setting{On}. If it is not required, then turning this setting
   }
 }
 \opt{usb_hid}{
+  \subsection{USB HID}
+  \label{ref:USB_HID}
+    This option turns the USB HID feature \setting{On} and \setting{Off}.
+    When this feature is enabled, the \dap{} enumerates as a Human Interface
+    Device (HID), composed of several HID sub devices.
+    Since the \dap{} also enumerates as a Mass Storage Device, it becomes a USB
+    Composite Device, which contains both these devices.
+
   \subsection{USB Keypad Mode}
     This setting control the keypad mode when the \dap{} is attached to a
     computer through USB. Pressing a key on the \dap{} sends a keystroke the
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index d992fdea97..834a039053 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -580,6 +580,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   }
 \subsection{Putting music on your \dap{}}
 
+\note{Due to a bug in some OS X versions, the \dap{} can not be mounted, unless
+    the USB HID feature is disabled. See \reference{ref:USB_HID} for more
+    information.\newline
+}
+
 With the \dap{} connected to the computer as an MSC/UMS device (like a
 USB Drive), music files can be put on the player via any standard file
 transfer method that you would use to copy files between drives (e.g. Drag 'n' Drop).