diff --git a/Bootloaders/CDC/BootloaderCDC.txt b/Bootloaders/CDC/BootloaderCDC.txt
index 859284a1cef..4f48a6eac51 100644
--- a/Bootloaders/CDC/BootloaderCDC.txt
+++ b/Bootloaders/CDC/BootloaderCDC.txt
@@ -8,16 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Bootloaders/DFU/BootloaderDFU.txt b/Bootloaders/DFU/BootloaderDFU.txt
index 1f5eeb2f4bf..2ca771c2ea7 100644
--- a/Bootloaders/DFU/BootloaderDFU.txt
+++ b/Bootloaders/DFU/BootloaderDFU.txt
@@ -8,16 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs (Excluding the 8KB FLASH variants)
*
* \section SSec_Info USB Information:
*
diff --git a/Bootloaders/Incomplete/MIDI/BootloaderMIDI.txt b/Bootloaders/Incomplete/MIDI/BootloaderMIDI.txt
deleted file mode 100644
index 56886223081..00000000000
--- a/Bootloaders/Incomplete/MIDI/BootloaderMIDI.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-/** \file
- *
- * This file contains special DoxyGen information for the generation of the main page and other special
- * documentation pages. It is not a project source file.
- */
-
-/** \mainpage MIDI Bootloader
- *
- * \section SSec_Compat Demo Compatibility:
- *
- * The following table indicates what microcontrollers are compatible with this demo.
- *
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
- *
- * \section SSec_Info USB Information:
- *
- * The following table gives a rundown of the USB utilization of this demo.
- *
- *
- *
- * USB Mode: |
- * Device |
- *
- *
- * USB Class: |
- * Audio Class |
- *
- *
- * USB Subclass: |
- * Standard Audio Device |
- *
- *
- * Relevant Standards: |
- * USBIF Audio Class Specification |
- * USB-MIDI Audio Class Extension Specification |
- * General MIDI Specification |
- *
- *
- * Usable Speeds: |
- * Full Speed Mode |
- *
- *
- *
- * \section SSec_Description Project Description:
- *
- * MIDI bootloader. This is an implementation of a simple bootloader
- * over a USB-MIDI transport. For this bootloader to work correctly,
- * the "BIN2BOOT.java" source must be compiled and run with the target
- * firmware, output in binary (not hex) mode from the compiler.
- *
- * \section SSec_Options Project Options
- *
- * The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
- *
- *
- *
- *
- * None
- * |
- *
- *
- */
diff --git a/Bootloaders/TeensyHID/TeensyHID.txt b/Bootloaders/TeensyHID/TeensyHID.txt
index 3a450f9e455..2f97a3d630c 100644
--- a/Bootloaders/TeensyHID/TeensyHID.txt
+++ b/Bootloaders/TeensyHID/TeensyHID.txt
@@ -8,7 +8,7 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
* - AT90USB646
* - AT90USB162
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
index 3aa26ae856d..cf9d3b47e57 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -117,9 +117,9 @@ void EVENT_USB_Device_Connect(void)
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Sample reload timer initialization */
- OCR0A = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;
+ OCR0A = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
TCCR0A = (1 << WGM01); // CTC mode
- TCCR0B = (1 << CS00); // Fcpu speed
+ TCCR0B = (1 << CS01); // Fcpu/8 speed
}
/** Event handler for the library USB Disconnection event. */
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
index b6649cca0ac..585faec1b58 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
@@ -8,13 +8,11 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index a95e43fd574..3648b6ea78b 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -136,9 +136,9 @@ void EVENT_USB_Device_Connect(void)
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Sample reload timer initialization */
- OCR0A = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;
+ OCR0A = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
TCCR0A = (1 << WGM01); // CTC mode
- TCCR0B = (1 << CS00); // Fcpu speed
+ TCCR0B = (1 << CS01); // Fcpu/8 speed
#if defined(AUDIO_OUT_MONO)
/* Set speaker as output */
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
index 96d241c57df..c305f9c9db2 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
@@ -8,13 +8,11 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/CDC/CDC.txt b/Demos/Device/ClassDriver/CDC/CDC.txt
index 93924c89491..d0d60e26afc 100644
--- a/Demos/Device/ClassDriver/CDC/CDC.txt
+++ b/Demos/Device/ClassDriver/CDC/CDC.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.txt b/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
index eece70614a4..ba16b7044f3 100644
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.txt b/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
index 226b007cf73..f8176e69fba 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.txt b/Demos/Device/ClassDriver/Joystick/Joystick.txt
index d2fdaafd9d8..4584cf964fd 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.txt
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.txt b/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
index 17018a81322..b1f5c2b537b 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
index ca08602b7a1..0d4f8113ee3 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.txt b/Demos/Device/ClassDriver/MIDI/MIDI.txt
index 30f5c7d13d2..7f68e5b8715 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.txt
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
index 7046b704e75..6b0a3273353 100644
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
index 0fb5989668c..bed44f81deb 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.txt b/Demos/Device/ClassDriver/Mouse/Mouse.txt
index 6171866bdb7..4d55bbf2bd7 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.txt
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
index 9725b04f8c3..b897f1bb597 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
+++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
@@ -8,12 +8,10 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
index 17f64522ba0..065b3296739 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * This demo is known to be compatible with the following microcontrollers:
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.c b/Demos/Device/LowLevel/AudioInput/AudioInput.c
index a01c6729cc4..572e307b02f 100644
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.c
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.c
@@ -84,9 +84,9 @@ void EVENT_USB_Device_Connect(void)
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Sample reload timer initialization */
- OCR0A = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;
+ OCR0A = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
TCCR0A = (1 << WGM01); // CTC mode
- TCCR0B = (1 << CS00); // Fcpu speed
+ TCCR0B = (1 << CS01); // Fcpu/8 speed
}
/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.txt b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
index ca7fe1fa5a9..b36892d7a55 100644
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.txt
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
@@ -8,12 +8,11 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index 28e57c48c53..b9c306cc1ac 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -79,9 +79,9 @@ void EVENT_USB_Device_Connect(void)
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
/* Sample reload timer initialization */
- OCR0A = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;
+ OCR0A = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
TCCR0A = (1 << WGM01); // CTC mode
- TCCR0B = (1 << CS00); // Fcpu speed
+ TCCR0B = (1 << CS01); // Fcpu/8 speed
#if defined(AUDIO_OUT_MONO)
/* Set speaker as output */
diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
index 96d241c57df..c305f9c9db2 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
@@ -8,13 +8,11 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/CDC/CDC.txt b/Demos/Device/LowLevel/CDC/CDC.txt
index 93924c89491..d0d60e26afc 100644
--- a/Demos/Device/LowLevel/CDC/CDC.txt
+++ b/Demos/Device/LowLevel/CDC/CDC.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.txt b/Demos/Device/LowLevel/DualCDC/DualCDC.txt
index eece70614a4..ba16b7044f3 100644
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.txt
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.txt b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
index 226b007cf73..f8176e69fba 100644
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.txt
+++ b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/Joystick/Joystick.txt b/Demos/Device/LowLevel/Joystick/Joystick.txt
index d2fdaafd9d8..4584cf964fd 100644
--- a/Demos/Device/LowLevel/Joystick/Joystick.txt
+++ b/Demos/Device/LowLevel/Joystick/Joystick.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.txt b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
index e1f6785f76b..1aa1675ab76 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.txt
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
index ca08602b7a1..0d4f8113ee3 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/MIDI/MIDI.txt b/Demos/Device/LowLevel/MIDI/MIDI.txt
index 30f5c7d13d2..7f68e5b8715 100644
--- a/Demos/Device/LowLevel/MIDI/MIDI.txt
+++ b/Demos/Device/LowLevel/MIDI/MIDI.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.txt b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
index 7046b704e75..6b0a3273353 100644
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.txt
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/Mouse/Mouse.txt b/Demos/Device/LowLevel/Mouse/Mouse.txt
index 54bf9000ac6..15ab39b0e24 100644
--- a/Demos/Device/LowLevel/Mouse/Mouse.txt
+++ b/Demos/Device/LowLevel/Mouse/Mouse.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
index 9725b04f8c3..b897f1bb597 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
+++ b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
@@ -8,12 +8,10 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
index bdca6f94726..065b3296739 100644
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt
index db8695c581a..581905daf26 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.txt b/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
index 58469ab4570..65999926c99 100644
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.txt b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.txt
index 42009a3cadc..10406ec26f9 100644
--- a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.txt
+++ b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt
index b9ad58b929f..b7d56c02527 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.txt b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.txt
index 44060155e92..3489b1f6419 100644
--- a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.txt
+++ b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt
index 5872d1947f4..8dd5d9dd61e 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt
+++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.txt b/Demos/Host/ClassDriver/MouseHost/MouseHost.txt
index 8a3c1674c18..bcbd057830f 100644
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.txt
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt
index c0ff4bfbbd1..79bc5c43216 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt
index 776e1a49cf0..71a42568998 100644
--- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt
+++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.txt b/Demos/Host/LowLevel/CDCHost/CDCHost.txt
index 58469ab4570..65999926c99 100644
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.txt
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
index 51d91cc6e30..6a17fc5838b 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
index 42009a3cadc..10406ec26f9 100644
--- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
index b9ad58b929f..b7d56c02527 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/MIDIHost/MIDIHost.txt b/Demos/Host/LowLevel/MIDIHost/MIDIHost.txt
index 44060155e92..3489b1f6419 100644
--- a/Demos/Host/LowLevel/MIDIHost/MIDIHost.txt
+++ b/Demos/Host/LowLevel/MIDIHost/MIDIHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
index 5872d1947f4..8dd5d9dd61e 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.txt b/Demos/Host/LowLevel/MouseHost/MouseHost.txt
index 8a3c1674c18..bcbd057830f 100644
--- a/Demos/Host/LowLevel/MouseHost/MouseHost.txt
+++ b/Demos/Host/LowLevel/MouseHost/MouseHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
index c0ff4bfbbd1..79bc5c43216 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt b/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt
index 79310310ff8..484241df281 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt b/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
index 776e1a49cf0..71a42568998 100644
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB647
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/LUFA.pnproj b/LUFA.pnproj
index 346ae095825..633f6c3398c 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index b47097c42b0..6c7fb5c6c82 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -21,6 +21,7 @@
* - Cleanups to the Device mode Mass Storage demo applications' SCSI routines
* - Changed Audio Class driver sample read/write functions to be inline, to reduce the number of cycles needed to transfer
* samples to and from the device (allowing more time for sample processing and output)
+ * - Audio class Device mode demos now work at both 16MHz and 8MHz, rather than just at 8MHz
*
* Fixed:
* - Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 2ca27ec6024..b9ea7b665aa 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -23,6 +23,7 @@
* - Change makefiles to allow for absolute LUFA location to be used
* - Abstract out the physical media from the Mass Storage device demos
* - Add RNDIS Host Class driver
+ * - Make CDC Host Class driver work for devices with bidirectional endpoints
* - Make new demos
* -# Multiple-report HID device
* -# Mouse/CDC Dual Class Device
diff --git a/Projects/AVRISP/AVRISP.txt b/Projects/AVRISP/AVRISP.txt
index df1c3c41187..249976350f2 100644
--- a/Projects/AVRISP/AVRISP.txt
+++ b/Projects/AVRISP/AVRISP.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Projects/Benito/Benito.txt b/Projects/Benito/Benito.txt
index 9fd3cb4f190..128fba37c0a 100644
--- a/Projects/Benito/Benito.txt
+++ b/Projects/Benito/Benito.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
- * - AT90USB647
- * - AT90USB646
- * - ATMEGA32U6
- * - ATMEGA32U4
- * - ATMEGA16U4
- * - AT90USB162
- * - AT90USB82
+ * - Series 7 USB AVRs
+ * - Series 6 USB AVRs
+ * - Series 4 USB AVRs
+ * - Series 2 USB AVRs
*
* \section SSec_Info USB Information:
*
diff --git a/Projects/Magstripe/Magstripe.txt b/Projects/Magstripe/Magstripe.txt
index 5688a7db30b..19586277a44 100644
--- a/Projects/Magstripe/Magstripe.txt
+++ b/Projects/Magstripe/Magstripe.txt
@@ -8,7 +8,7 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
* - AT90USB1287
* - AT90USB1286
diff --git a/Projects/MissileLauncher/MissileLauncher.txt b/Projects/MissileLauncher/MissileLauncher.txt
index 6c724879fc8..1dfff2f9925 100644
--- a/Projects/MissileLauncher/MissileLauncher.txt
+++ b/Projects/MissileLauncher/MissileLauncher.txt
@@ -8,10 +8,9 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * The following table indicates what microcontrollers are compatible with this demo.
+ * The following list indicates what microcontrollers are compatible with this demo.
*
- * - AT90USB1287
- * - AT90USB1286
+ * - Series 7 USB AVRs
*
* \section SSec_Info USB Information:
*