diff --git a/LUFA.pnproj b/LUFA.pnproj
index f50eba3a45..8e32081467 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/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
index b0a9b9e80f..100f2c1042 100644
--- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
@@ -116,11 +116,19 @@
/** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */
#define ADC_CHANNEL1 0x01
- /** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */
- #define ADC_CHANNEL2 0x02
+ #if !(defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))
+ /** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.
+ *
+ * \note Note available on all AVR models.
+ */
+ #define ADC_CHANNEL2 0x02
- /** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */
- #define ADC_CHANNEL3 0x03
+ /** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.
+ *
+ * \note Note available on all AVR models.
+ */
+ #define ADC_CHANNEL3 0x03
+ #endif
/** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */
#define ADC_CHANNEL4 0x04
diff --git a/Projects/AVRISP-MKII/AVRISP.txt b/Projects/AVRISP-MKII/AVRISP.txt
index e67c83e895..b05bb4da4a 100644
--- a/Projects/AVRISP-MKII/AVRISP.txt
+++ b/Projects/AVRISP-MKII/AVRISP.txt
@@ -123,7 +123,7 @@
* | PDI 6 Pin Layout: |
*
*
- * | MISO |
+ * MISO 2 |
* DATA |
* 1 |
*
@@ -143,7 +143,7 @@
* 4 |
*
*
- * | PORTx.y 2 |
+ * PORTx.y 2, 3 |
* CLOCK |
* 5 |
*
@@ -154,9 +154,10 @@
*
*
*
- * 1 When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together
+ * 1 Optional, see \ref SSec_Options section - for USB AVRs with ADC modules only \n
+ * 2 When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together
* via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK. \n
- * 2 See AUX line related tokens in the \ref SSec_Options section
+ * 3 See AUX line related tokens in the \ref SSec_Options section
*
* \section Sec_TPI TPI Connections
* Connections to the device for TPI programming1 (when enabled):
@@ -168,7 +169,7 @@
* TPI 6 Pin Layout: |
*
*
- * | MISO |
+ * MISO 2 |
* DATA |
* 1 |
*
@@ -178,7 +179,7 @@
* 2 |
*
*
- * | SCLK |
+ * SCLK 2 |
* CLOCK |
* 3 |
*
@@ -188,7 +189,7 @@
* 4 |
*
*
- * | PORTx.y 2 |
+ * PORTx.y 3 |
* /RESET |
* 5 |
*
@@ -199,9 +200,10 @@
*
*
*
- * 1 When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together
+ * 1 Optional, see \ref SSec_Options section - for USB AVRs with ADC modules only \n
+ * 2 When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together
* via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK. \n
- * 2 See AUX line related tokens in the \ref SSec_Options section
+ * 3 See AUX line related tokens in the \ref SSec_Options section
*
* \section SSec_Options Project Options
*