Merge remote-tracking branch 'upstream/master' into develop

14 files changed, 1 insertions, 15 deletions

diff --git a/keyboards/converter/adb_usb/config.h b/keyboards/converter/adb_usb/config.h
index a5845a0290..92ce05f3d2 100644
--- a/keyboards/converter/adb_usb/config.h
+++ b/keyboards/converter/adb_usb/config.h
@@ -24,7 +24,6 @@ Ported to QMK by Peter Roe <pete@13bit.me>
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    QMK
 #define PRODUCT         ADB keyboard converter
-#define DESCRIPTION     Convert ADB keyboard to USB
 
 /* matrix size */
 #define MATRIX_ROWS 16  // keycode bit: 3-0
diff --git a/keyboards/converter/hp_46010a/config.h b/keyboards/converter/hp_46010a/config.h
index a1345c66dc..91350bcb4f 100644
--- a/keyboards/converter/hp_46010a/config.h
+++ b/keyboards/converter/hp_46010a/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER        0x0001
 #define MANUFACTURER      QMK
 #define PRODUCT           46010A keyboard converter
-#define DESCRIPTION       46010A keyboard converter
                           
 #define MATRIX_ROWS       14
 #define MATRIX_COLS       8
diff --git a/keyboards/converter/ibm_5291/config.h b/keyboards/converter/ibm_5291/config.h
index f4c41d0706..adf66cc697 100644
--- a/keyboards/converter/ibm_5291/config.h
+++ b/keyboards/converter/ibm_5291/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER          0x0001
 #define MANUFACTURER        QMK
 #define PRODUCT             5291 keyboard converter
-#define DESCRIPTION         5291 keyboard converter
 
 #define MATRIX_ROWS         24
 #define MATRIX_COLS         4
diff --git a/keyboards/converter/ibm_terminal/config.h b/keyboards/converter/ibm_terminal/config.h
index ba9ec82fa2..5d8e5f8135 100644
--- a/keyboards/converter/ibm_terminal/config.h
+++ b/keyboards/converter/ibm_terminal/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    QMK
 #define PRODUCT         IBM Terminal Keyboard
-#define DESCRIPTION     USB converter for IBM Terminal Keyboard
 
 
 /* matrix size */
diff --git a/keyboards/converter/m0110_usb/config.h b/keyboards/converter/m0110_usb/config.h
index 02e4c30fb0..f980217b81 100644
--- a/keyboards/converter/m0110_usb/config.h
+++ b/keyboards/converter/m0110_usb/config.h
@@ -26,7 +26,6 @@ Ported to QMK by Techsock <info@techsock.com>
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    Apple
 #define PRODUCT         M0110(A)
-#define DESCRIPTION     Converts M0110(A) to USB and/or BT
 
 /* matrix size */
 #define MATRIX_ROWS 14
diff --git a/keyboards/converter/m0110_usb/readme.md b/keyboards/converter/m0110_usb/readme.md
index 2e8a2eaef1..a148091cd9 100644
--- a/keyboards/converter/m0110_usb/readme.md
+++ b/keyboards/converter/m0110_usb/readme.md
@@ -5,7 +5,7 @@ This is a port of the original M0110 converter from TMK to QMK. The original con
 
 ## Enabling Bluetooth for the Adafruit Feather 32U4 BLE
 
-Simply add `BLUETOOTH = AdafruitBLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` and `DESCRIPTION` values from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
+Simply add `BLUETOOTH = AdafruitBLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
 
 
 ## Pins
diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h
index 958b29b743..7dcb825492 100644
--- a/keyboards/converter/modelm101/config.h
+++ b/keyboards/converter/modelm101/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    iw0rm3r
 #define PRODUCT         IBM Model M 101/102
-#define DESCRIPTION     Controlled by AVR chip
 
 /* key matrix size */
 #define MATRIX_ROWS 8
diff --git a/keyboards/converter/numeric_keypad_IIe/config.h b/keyboards/converter/numeric_keypad_IIe/config.h
index a129e1210f..be21814f80 100644
--- a/keyboards/converter/numeric_keypad_IIe/config.h
+++ b/keyboards/converter/numeric_keypad_IIe/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Apple Inc.
 #define PRODUCT         Numeric Keypad IIe
-#define DESCRIPTION     "Numeric Keypad IIe, A2M2003"
 
 /*
 
diff --git a/keyboards/converter/palm_usb/config.h b/keyboards/converter/palm_usb/config.h
index 8414c47a77..4afc654e85 100644
--- a/keyboards/converter/palm_usb/config.h
+++ b/keyboards/converter/palm_usb/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    QMK
 #define PRODUCT         Stowaway converter
-#define DESCRIPTION     USB converter for Stowaway keyboard
 
 // IO pins to serial
 // https://deskthority.net/wiki/Arduino_Pro_Micro for pin lookup
diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h
index bbb7471521..ae6f1a209a 100644
--- a/keyboards/converter/siemens_tastatur/config.h
+++ b/keyboards/converter/siemens_tastatur/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MANUFACTURER Yiancar-Designs
 #define PRODUCT Siemens Tastatur
-#define DESCRIPTION Practice
 
 /* key matrix size */
 #define MATRIX_ROWS 4
diff --git a/keyboards/converter/sun_usb/config.h b/keyboards/converter/sun_usb/config.h
index 455d6423b5..f073e61e44 100644
--- a/keyboards/converter/sun_usb/config.h
+++ b/keyboards/converter/sun_usb/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    QMK
 #define PRODUCT         Sun keyboard converter
-#define DESCRIPTION     USB converter for Sun type 5 keyboard
 
 /* matrix size */
 #define MATRIX_ROWS 16
diff --git a/keyboards/converter/usb_usb/ble/config.h b/keyboards/converter/usb_usb/ble/config.h
index 3bf3b2963a..80e4968c41 100644
--- a/keyboards/converter/usb_usb/ble/config.h
+++ b/keyboards/converter/usb_usb/ble/config.h
@@ -2,8 +2,6 @@
 
 #undef PRODUCT
 #define PRODUCT         QMK BLE Adapter
-#undef DESCRIPTION
-#define DESCRIPTION
 
 // Turn off the mode leds on the BLE module
 #define ADAFRUIT_BLE_ENABLE_MODE_LEDS 0
diff --git a/keyboards/converter/usb_usb/config.h b/keyboards/converter/usb_usb/config.h
index 7af8950275..7ff8ceeebd 100644
--- a/keyboards/converter/usb_usb/config.h
+++ b/keyboards/converter/usb_usb/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    QMK
 #define PRODUCT         QMK USB-USB Converter
-#define DESCRIPTION     USB to USB Keyboard Converter with QMK
 
 /* size of virtual matrix */
 #define MATRIX_ROWS 16
diff --git a/keyboards/converter/xt_usb/config.h b/keyboards/converter/xt_usb/config.h
index fe79953873..e5624d843d 100644
--- a/keyboards/converter/xt_usb/config.h
+++ b/keyboards/converter/xt_usb/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    QMK
 #define PRODUCT         XT keyboard converter
-#define DESCRIPTION     convert XT keyboard to USB
 
 
 /* matrix size */