5 files changed, 20 insertions, 15 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index 257e884e6..36af96216 100644
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -47,6 +47,7 @@
 
 		#include "Descriptors.h"
 		#include "BootloaderAPI.h"
+		#include "Config/AppConfig.h"
 
 		#include <LUFA/Drivers/USB/USB.h>
 		#include <LUFA/Drivers/Board/LEDs.h>
diff --git a/Bootloaders/CDC/BootloaderCDC.txt b/Bootloaders/CDC/BootloaderCDC.txt
index 618b95d25..9abd7b2f8 100644
--- a/Bootloaders/CDC/BootloaderCDC.txt
+++ b/Bootloaders/CDC/BootloaderCDC.txt
@@ -133,25 +133,25 @@
  *   </tr>
  *   <tr>
  *    <td>NO_BLOCK_SUPPORT</td>
- *    <td>Makefile LUFA_OPTS</td>
+ *    <td>AppConfig.h</td>
  *    <td>Define to disable memory block read/write support in the bootloader, requiring all reads and writes to be made
  *        using the byte-level commands.</td>
  *   </tr>
  *   <tr>
  *    <td>NO_EEPROM_BYTE_SUPPORT</td>
- *    <td>Makefile LUFA_OPTS</td>
+ *    <td>AppConfig.h</td>
  *    <td>Define to disable EEPROM memory byte read/write support in the bootloader, requiring all EEPROM reads and writes
  *        to be made using the block-level commands.</td>
  *   </tr>
  *   <tr>
  *    <td>NO_FLASH_BYTE_SUPPORT</td>
- *    <td>Makefile LUFA_OPTS</td>
+ *    <td>AppConfig.h</td>
  *    <td>Define to disable FLASH memory byte read/write support in the bootloader, requiring all FLASH reads and writes
  *        to be made using the block-level commands.</td>
  *   </tr>
  *   <tr>
  *    <td>NO_LOCK_BYTE_WRITE_SUPPORT</td>
- *    <td>Makefile LUFA_OPTS</td>
+ *    <td>AppConfig.h</td>
  *    <td>Define to disable lock byte write support in the bootloader, preventing the lock bits from being set programmatically.</td>
  *   </tr>
  *  </table>
diff --git a/Bootloaders/CDC/Config/AppConfig.h b/Bootloaders/CDC/Config/AppConfig.h
index ae3e50e1d..9f9b1ce25 100644
--- a/Bootloaders/CDC/Config/AppConfig.h
+++ b/Bootloaders/CDC/Config/AppConfig.h
@@ -29,22 +29,25 @@
 */
 
 /** \file
- *  \brief LUFA Library Configuration Header File
+ *  \brief Application Configuration Header File
  *
  *  This is a header file which is be used to configure LUFA's
  *  compile time options, as an alternative to the compile time
  *  constants supplied through a makefile.
  *
- *  For information on what each token does, refer to the LUFA
- *  manual section "Summary of Compile Tokens".
+ *  For information on what each token does, refer to the 
+ *  \ref Sec_Options section of the application documentation.
  */
 
 #ifndef _APP_CONFIG_H_
 #define _APP_CONFIG_H_
 
-	#define NO_BLOCK_SUPPORT
-	#define NO_EEPROM_BYTE_SUPPORT
-	#define NO_FLASH_BYTE_SUPPORT
-	#define NO_LOCK_BYTE_WRITE_SUPPORT
+//	#define NO_BLOCK_SUPPORT
+
+//	#define NO_EEPROM_BYTE_SUPPORT
+
+//	#define NO_FLASH_BYTE_SUPPORT
+
+//	#define NO_LOCK_BYTE_WRITE_SUPPORT
 
 #endif
 \ No newline at end of file
diff --git a/Bootloaders/CDC/Config/LUFAConfig.h b/Bootloaders/CDC/Config/LUFAConfig.h
index c5a01c2fa..15ab0599f 100644
--- a/Bootloaders/CDC/Config/LUFAConfig.h
+++ b/Bootloaders/CDC/Config/LUFAConfig.h
@@ -31,9 +31,9 @@
 /** \file
  *  \brief LUFA Library Configuration Header File
  *
- *  This is a header file which is be used to configure LUFA's
- *  compile time options, as an alternative to the compile time
- *  constants supplied through a makefile.
+ *  This header file is used to configure LUFA's compile time options,
+ *  as an alternative to the compile time constants supplied through
+ *  a makefile.
  *
  *  For information on what each token does, refer to the LUFA
  *  manual section "Summary of Compile Tokens".
diff --git a/Bootloaders/CDC/Doxygen.conf b/Bootloaders/CDC/Doxygen.conf
index a5b4bd683..2c655dcff 100644
--- a/Bootloaders/CDC/Doxygen.conf
+++ b/Bootloaders/CDC/Doxygen.conf
@@ -1531,7 +1531,8 @@ INCLUDE_FILE_PATTERNS  =
 # instead of the = operator.
 
 PREDEFINED             = __DOXYGEN__ \
-                         PROGMEM
+                         PROGMEM \
+						 ATTR_NO_INIT
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.