4 files changed, 21 insertions, 7 deletions
diff --git a/LUFA/ManPages/Author.jpg b/LUFA/ManPages/Author.jpg
index 71e1a08fb..e8f5541a0 100644
--- a/LUFA/ManPages/Author.jpg
+++ b/LUFA/ManPages/Author.jpg
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 3ad2097ab..0f582a657 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -49,6 +49,7 @@
   *  - Fixed MassStorage demo not clearing the reset flag when a Mass Storage Reset is issued while not processing a command
   *  - Fixed USB_Host_SendControlRequest() not re-suspending the USB bus when initial device ready-wait fails
   *  - Fixed USB Pad regulator not being disabled on some AVR models when the USB_OPT_REG_DISABLED option is used
+  *  - Fixed Host mode to Device mode UID change not causing a USB Disconnect event when a device was connected
   *
   *
   *  \section Sec_ChangeLog090605 Version 090605
diff --git a/LUFA/ManPages/ConfiguringApps.txt b/LUFA/ManPages/ConfiguringApps.txt
index bb6d185e4..fb9da7094 100644
--- a/LUFA/ManPages/ConfiguringApps.txt
+++ b/LUFA/ManPages/ConfiguringApps.txt
@@ -24,7 +24,9 @@
  *    - <b>BOARD</b>, the target board hardware
  *    - <b>F_CLOCK</b>, the target raw master clock frequency, before any prescaling is performed
  *    - <b>F_CPU</b>, the target AVR CPU master clock frequency, after any prescaling
- *    - <b>CDEFS</b>, the C preprocessor defines which configure the source code
+ *    - <b>CDEFS</b>, the C preprocessor defines which configure options the source code
+ *    - <b>LUFA_PATH</b>, the path to the LUFA library source code
+ *    - <b>LUFA_OPTS</b>, the compile time LUFA options which configure the library features
  *
  *  These values should be changed to reflect the build hardware.
  *
@@ -63,12 +65,23 @@
  *  library components will occur.
  *
  *  \section Sec_CDEFS The CDEFS Parameter
+ *  Many applications have features which can be controlled by the defining of specially named preprocessor tokens at the point of compilation - for example,
+ *  an application might use a compile time token to turn on or off optional or mutually exclusive portions of code. Preprocessor tokens can be
+ *  defined here by listing each one with the -D command line switch, and each token can optionally be defined to a specific value. When defined in the
+ *  project makefile, these behave as if they were defined in every source file via a normal preprocessor define statement.
+ *
  *  Most applications will actually have multiple CDEF lines, which are concatenated together with the "+=" operator. This ensures that large
  *  numbers of configuration options remain readable by splitting up groups of options into separate lines.
  *
- *  Normally, these options do not need to be altered to allow an application to compile and run correctly on a different board or AVR to the
- *  current configuration - if the options are incorrect, then the demo is most likely incompatible with the chosen USB AVR model and cannot be
- *  made to function through the altering of the makefile settings alone (or at all). Settings such as the USB mode (device, host or both), the USB
- *  interface speed (Low or Full speed) and other LUFA configuration options can be set here - refer to the library documentation for details on the
- *  configuration parameters.
+ *  \section Sec_LUFA_PATH The LUFA_PATH Parameter
+ *  As each LUFA program requires the LUFA library source code to compile correctly, the application must know where the LUFA library is located. This
+ *  value specifies the path to the LUFA library base relative to the path of the project makefile.
+ *
+ *  \section Sec_LUFA_OPTS The LUFA_OPTS Parameter
+ *  This value is similar to the CDEFS parameter listed elsewhere -- indeed, it is simply a convenient place to group LUFA related tokens away from the
+ *  application's compile time tokens. Normally, these options do not need to be altered to allow an application to compile and run correctly on a
+ *  different board or AVR to the current configuration - if the options are incorrect, then the demo is most likely incompatible with the chosen USB AVR
+ *  model and cannot be made to function through the altering of the makefile settings alone (or at all). Settings such as the USB mode (device, host or both),
+ *  the USB interface speed (Low or Full speed) and other LUFA configuration options can be set here - see \ref Page_TokenSummary documentation for details
+ *  on the available LUFA compile time configuration options.
  */
 \ No newline at end of file
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 1a2b7a031..59a279072 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -21,11 +21,11 @@
   *  - Add standardized descriptor names to device and host class driver structures
   *  - Remove USE_NONSTANDARD_DESCRIPTOR_NAMES, make all typedefs unions to allow either naming scheme to be used
   *  - Add in INTERRUPT_CONTROL_PIPE to use HSOFI to trigger calls to the host state machine
-  *  - Remove FAST_STREAM_TRANSFERS as they have little effect
   *  - Make Suspend host state suspend USB bus frames
   *  - Add in Stream functions for PROGMEM, EEPROM -- move to templated system
   *  - Debug mode for pipe/endpoint calls
   *  - Test and document new FAST_STREAM_TRANSFERS compile time option
+  *  - Demo hardware compatibility table/list
   *
   *  <b>Targeted for Future Releases:</b>
   *  - Remake AVRStudio project files