keymap: improve consistency and general formatting of comments

diff --git a/keymaps-force-release/samsung-other b/keymaps-force-release/samsung-other
index c51123a0b619e161f081ec86001a2c12eba7bd3f..e9627af882209ba2ebd06f0fbfeca145a4941209 100644 (file)
--- a/keymaps-force-release/samsung-other
+++ b/keymaps-force-release/samsung-other
@@ -3,8 +3,8 @@
 0x83 # Fn+F2 battery
 0x84 # Fn+F5 backlight on/off
 0x86 # Fn+F9 WLAN
-0x88 # Fn-Up brightness up
-0x89 # Fn-Down brightness down
+0x88 # Fn+Up brightness up
+0x89 # Fn+Down brightness down
 0xB3 # Fn+F8 switch power mode (battery/dynamic/performance)
 0xF7 # Fn+F10 Touchpad on
 0xF9 # Fn+F10 Touchpad off

diff --git a/keymaps-force-release/samsung-series-3 b/keymaps-force-release/samsung-series-3
index bfa06e10b741460eacd2010cb273723c60275ddb..c26594a4c5f829515d1790633c7e6e4d73e64338 100644 (file)
--- a/keymaps-force-release/samsung-series-3
+++ b/keymaps-force-release/samsung-series-3
@@ -1,2 +1,2 @@
 0xCE   # Fn+F1  launch control setting
-0xD5   # Fn+F12 wifi on/off
+0xD5   # Fn+F12 Wi-Fi toggle

diff --git a/keymaps-force-release/samsung-series-9 b/keymaps-force-release/samsung-series-9
index 65707effb757e1e5345b10ddb4072be087934232..fa6a0b1d18c3b63fc2f5a6750f4723092527f581 100644 (file)
--- a/keymaps-force-release/samsung-series-9
+++ b/keymaps-force-release/samsung-series-9
@@ -1,6 +1,6 @@
 # list of scancodes (hex or decimal), optional comment
-0xCE # Fn+F8 keyboard backlit up
-0x8D # Fn+F7 keyboard backlit down
-0x97 # Fn+F12 wifi on/off
+0xCE # Fn+F8 keyboard backlight up
+0x8D # Fn+F7 keyboard backlight down
+0x97 # Fn+F12 Wi-Fi toggle
 0x96 # Fn+F1 performance mode (?)
 0xD5 # Fn+F6 battery life extender

diff --git a/keymaps/acer-aspire_8930 b/keymaps/acer-aspire_8930
index fb27bfb4f5f20d5fe986d94334ad3bd42077d372..8e36cd947cfa9f2826b6c2bf725c269d765fcb8f 100644 (file)
--- a/keymaps/acer-aspire_8930
+++ b/keymaps/acer-aspire_8930
@@ -1,5 +1,5 @@
-0xCA prog3        # key 'HOLD' on cine dash media console
+0xCA prog3        # key 'HOLD' on CineDash Media Console
 0x83 rewind
 0x89 fastforward
-0x92 media        # key 'ARCADE' on cine dash media console
+0x92 media        # key 'ARCADE' on CineDash Media Console
 0x9E back

diff --git a/keymaps/dell b/keymaps/dell
index 4f907b3eef542dc2b1dcaca45007aca6c76451a9..55015e352a49ccfc1f7a8c7aace49ca819e955c1 100644 (file)
--- a/keymaps/dell
+++ b/keymaps/dell
@@ -2,28 +2,28 @@
 0x82 stopcd # Stop
 0x83 previoussong # Previous song
 0x84 nextsong # Next song
-0x85 brightnessdown # Fn+Down arrow Brightness Down
-0x86 brightnessup # Fn+Up arrow Brightness Up
+0x85 brightnessdown # Fn+Down Brightness Down
+0x86 brightnessup # Fn+Up Brightness Up
 0x87 battery # Fn+F3 battery icon
 0x88 unknown # Fn+F2 Turn On/Off Wireless - handled in hardware
 0x89 ejectclosecd # Fn+F10 Eject CD
 0x8A suspend # Fn+F1 hibernate
 0x8B switchvideomode # Fn+F8 CRT/LCD (high keycode: "displaytoggle")
-0x8C f23 # Fn+Right arrow Auto Brightness
+0x8C f23 # Fn+Right Auto Brightness
 0x8F switchvideomode # Fn+F7 aspect ratio
 0x90 previoussong # Front panel previous song
-0x91 prog1 # Wifi Catcher (DELL Specific)
+0x91 prog1 # Wi-Fi Catcher (Dell-specific)
 0x92 media # MediaDirect button (house icon)
-0x93 f23 # FIXME Fn+Left arrow Auto Brightness
-0x95 camera # Shutter button Takes a picture if optional camera available
+0x93 f23 # FIXME Fn+Left Auto Brightness
+0x95 camera # Shutter button - Takes a picture if optional camera available
 0x97 email # Tablet email button
-0x98 f21 # FIXME: Tablet screen rotatation
+0x98 f21 # FIXME: Tablet screen rotation
 0x99 nextsong # Front panel next song
 0x9A setup # Tablet tools button
-0x9B switchvideomode # Display Toggle button
-0x9E f21 #touchpad toggle
+0x9B switchvideomode # Display toggle button
+0x9E f21 # Touchpad toggle
 0xA2 playpause # Front panel play/pause
 0xA4 stopcd # Front panel stop
 0xED media # MediaDirect button
 0xD8 screenlock # FIXME: Tablet lock button
-0xD9 f21 # touchpad toggle
+0xD9 f21 # Touchpad toggle

diff --git a/keymaps/fujitsu-amilo_pro_edition_v3505 b/keymaps/fujitsu-amilo_pro_edition_v3505
index d2e38cbb235e32d2595d4cbdd33aa4223f5eab29..74bae2f1449225f153e46634d91e357f4b24d8e4 100644 (file)
--- a/keymaps/fujitsu-amilo_pro_edition_v3505
+++ b/keymaps/fujitsu-amilo_pro_edition_v3505
@@ -1,4 +1,4 @@
-0xA5 help # Fn-F1
-0xA9 switchvideomode # Fn-F3
-0xD9 brightnessdown # Fn-F8
-0xE0 brightnessup # Fn-F9
+0xA5 help # Fn+F1
+0xA9 switchvideomode # Fn+F3
+0xD9 brightnessdown # Fn+F8
+0xE0 brightnessup # Fn+F9

diff --git a/keymaps/hewlett-packard b/keymaps/hewlett-packard
index 4461fa2ce5750da10ab0e0ba9cde9dea435aea02..4ab21947e2a05178a53dec52a89c2152abac04b5 100644 (file)
--- a/keymaps/hewlett-packard
+++ b/keymaps/hewlett-packard
@@ -1,12 +1,12 @@
 0x81 fn_esc
-0x89 battery # FnF8
-0x8A screenlock # FnF6
+0x89 battery # Fn+F8
+0x8A screenlock # Fn+F6
 0x8B camera
 0x8C media # music
 0x8E dvd
 0xB1 help
 0xB3 f23 # FIXME: Auto brightness
 0xD7 wlan
-0x92 brightnessdown # FnF7 (FnF9 on 6730b)
-0x97 brightnessup # FnF8 (FnF10 on 6730b)
-0xEE switchvideomode # FnF4
+0x92 brightnessdown # Fn+F7 (Fn+F9 on 6730b)
+0x97 brightnessup # Fn+F8 (Fn+F10 on 6730b)
+0xEE switchvideomode # Fn+F4

diff --git a/keymaps/hewlett-packard-hdx9494nr b/keymaps/hewlett-packard-hdx9494nr
index 92217879c8722bbdd83feef13e36f0e202ee6e78..39e8b4c9f7579df8b843f742fa8b185e6569e75d 100644 (file)
--- a/keymaps/hewlett-packard-hdx9494nr
+++ b/keymaps/hewlett-packard-hdx9494nr
@@ -1,3 +1,3 @@
-0xB2 www # FnF3
+0xB2 www # Fn+F3
 0xD8 f23 # touchpad off
 0xD9 f22 # touchpad on

diff --git a/keymaps/lenovo-ideapad b/keymaps/lenovo-ideapad
index fc339839f231d39449143ed1282841fa0ec8421c..0de16466b437a9e94cdc15aada1e41e88ebcc7d5 100644 (file)
--- a/keymaps/lenovo-ideapad
+++ b/keymaps/lenovo-ideapad
@@ -4,5 +4,5 @@
 0xB9 brightnessup       # does nothing in BIOS
 0xBA brightnessdown     # does nothing in BIOS
 0xF1 camera             # BIOS toggles camera power
-0xf2 f21                # touchpad toggle (key alternately emits f2 and f3)
+0xf2 f21                # touchpad toggle (key alternately emits F2 and F3)
 0xf3 f21

diff --git a/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
index d87549e445272a3d94fa98c90792bd1f08f64a57..ac829d8f7f7607bd972999174a3ea291d258f8aa 100644 (file)
--- a/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
+++ b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
@@ -2,12 +2,12 @@
 0x90013 battery # Fn+F3
 0x90014 wlan # Fn+F5
 0x90016 switchvideomode # Fn+F7
-0x90017 f21 # Fn+F8  touchpadtoggle
+0x90017 f21 # Fn+F8  touchpad toggle
 0x90019 suspend # Fn+F12
 0x9001A brightnessup # Fn+Home
 0x9001B brightnessdown # Fn+End
 0x9001D zoom # Fn+Space
-0x90011 prog1 # Thinkvantage button
+0x90011 prog1 # ThinkVantage button
 
 0x90015 camera # Fn+F6 headset/camera VoIP key  ??
 0x90010 f20 # Microphone mute button; should be micmute, but see https://mail.gnome.org/archives/commits-list/2013-January/msg05822.html

diff --git a/keymaps/lg-x110 b/keymaps/lg-x110
index ba08cba3fef9f4552deabb9deff59f75bcfd92de..57f9156c62b562e33f8408fe65b7838a07c084db 100644 (file)
--- a/keymaps/lg-x110
+++ b/keymaps/lg-x110
@@ -1,12 +1,12 @@
-0xA0 mute # Fn-F9
-0xAE volumedown # Fn-Left
-0xAF search # Fn-F3
-0xB0 volumeup # Fn-Right
-0xB1 battery # Fn-F10 Info
-0xB3 suspend # Fn-F12
-0xDF sleep # Fn-F4
+0xA0 mute # Fn+F9
+0xAE volumedown # Fn+Left
+0xAF search # Fn+F3
+0xB0 volumeup # Fn+Right
+0xB1 battery # Fn+F10 Info
+0xB3 suspend # Fn+F12
+0xDF sleep # Fn+F4
 # 0xE2 bluetooth # satellite dish2
-0xE4 f21 # Fn-F5   Touchpad disable
-0xF6 wlan # Fn-F6
-0xF7 reserved # brightnessdown # Fn-Down
-0xF8 reserved # brightnessup # Fn-Up
+0xE4 f21 # Fn+F5 Touchpad toggle
+0xF6 wlan # Fn+F6
+0xF7 reserved # Fn+Down brightnessdown
+0xF8 reserved # Fn+Up brightnessup

diff --git a/keymaps/logitech-wave b/keymaps/logitech-wave
index caa5d5d310324cbae3878ffbec26defa4c519e37..724694e06789268ea5b09c249685f99aab4ce3e6 100644 (file)
--- a/keymaps/logitech-wave
+++ b/keymaps/logitech-wave
@@ -4,13 +4,13 @@
 0x9003D prog1 #gadget
 0x90005 camera #camera
 0x90018 media #media center
-0x90041 wordprocessor #fn+f1 (word)
-0x90042 spreadsheet #fn+f2 (excel)
-0x90043 calendar #fn+f3 (calendar)
-0x90044 prog2 #fn+f4 (program a)
-0x90045 prog3 #fn+f5 (program b)
-0x90046 prog4 #fn+f6 (program c)
-0x90048 messenger #fn+f8 (msn messenger)
-0x9002D find #fn+f10 (search www)
-0x9004B search #fn+f11 (search pc)
-0x9004C ejectclosecd #fn+f12 (eject)
+0x90041 wordprocessor #Fn+F1 (Word)
+0x90042 spreadsheet #Fn+F2 (Excel)
+0x90043 calendar #Fn+F3 (calendar)
+0x90044 prog2 #Fn+F4 (program a)
+0x90045 prog3 #Fn+F5 (program b)
+0x90046 prog4 #Fn+F6 (program c)
+0x90048 messenger #Fn+F8 (MSN messenger)
+0x9002D find #Fn+F10 (search www)
+0x9004B search #Fn+F11 (search PC)
+0x9004C ejectclosecd #Fn+F12 (eject)

diff --git a/keymaps/logitech-wave-cordless b/keymaps/logitech-wave-cordless
index a10dad5e4dd351640ba3a937c156eef5ecc042e4..83bba1daf52239c57d3179d1ac30a2be2d4bc132 100644 (file)
--- a/keymaps/logitech-wave-cordless
+++ b/keymaps/logitech-wave-cordless
@@ -7,9 +7,9 @@
 0xC1041 wordprocessor
 0xC1042 spreadsheet
 0xC1043 calendar
-0xC1044 prog2 #fn+f4 (program a)
-0xC1045 prog3 #fn+f5 (program b)
-0xC1046 prog4 #fn+f6 (program c)
+0xC1044 prog2 #Fn+F4 (program a)
+0xC1045 prog3 #Fn+F5 (program b)
+0xC1046 prog4 #Fn+F6 (program c)
 0xC1048 messenger
-0xC104A find #fn+f10 (search www)
+0xC104A find #Fn+F10 (search www)
 0xC104C ejectclosecd

diff --git a/keymaps/maxdata-pro_7000 b/keymaps/maxdata-pro_7000
index c0e4f77af41ab48b10ef01bd117cb11b07b8cefd..87c94a3411c950e4e031b8b395cda307880c6c55 100644 (file)
--- a/keymaps/maxdata-pro_7000
+++ b/keymaps/maxdata-pro_7000
@@ -1,9 +1,9 @@
 0x97 prog2
 0x9F prog1
-0xA0 mute # Fn-F5
+0xA0 mute # Fn+F5
 0x82 www
 0xEC email
-0xAE volumedown # Fn-Down
-0xB0 volumeup # Fn-Up
+0xAE volumedown # Fn+Down
+0xB0 volumeup # Fn+Up
 0xDF suspend # Fn+F2
 0xF5 help

diff --git a/keymaps/micro-star b/keymaps/micro-star
index 4a438698eda4f7b7eeecb9a4ad4eaa8ba3ff7809..40a8decbe2e57295b6e261c38799c2de982b39b3 100644 (file)
--- a/keymaps/micro-star
+++ b/keymaps/micro-star
@@ -1,13 +1,13 @@
-0xA0 mute # Fn-F9
-0xAE volumedown # Fn-F7
-0xB0 volumeup # Fn-F8
+0xA0 mute # Fn+F9
+0xAE volumedown # Fn+F7
+0xB0 volumeup # Fn+F8
 0xB2 www # e button
-0xDF sleep # Fn-F12
+0xDF sleep # Fn+F12
 0xE2 bluetooth # satellite dish2
-0xE4 f21 # Fn-F3   Touchpad disable
+0xE4 f21 # Fn+F3 Touchpad disable
 0xEC email # envelope button
-0xEE camera # Fn-F6 camera disable
+0xEE camera # Fn+F6 camera disable
 0xF6 wlan # satellite dish1
-0xF7 brightnessdown # Fn-F4
-0xF8 brightnessup # Fn-F5
+0xF7 brightnessdown # Fn+F4
+0xF8 brightnessup # Fn+F5
 0xF9 search

diff --git a/keymaps/olpc-xo b/keymaps/olpc-xo
index 34434a121dc18c2aa17fbe39a35b42325650684c..78dad553a88ae4dd4ea5cc690e4d62491d424015 100644 (file)
--- a/keymaps/olpc-xo
+++ b/keymaps/olpc-xo
@@ -1,7 +1,7 @@
 0x59 fn
 0x81 fn_esc
 0xF9 camera
-0xF8 sound # Fn-CAMERA = Mic
+0xF8 sound # Fn+CAMERA = Mic
 
 
 # Function key mappings, as per
@@ -14,7 +14,7 @@
 0x57 volumedown
 0x58 volumeup
 
-# fn-modified fkeys all produce the unmodified version of the key.
+# Fn-modified fkeys all produce the unmodified version of the key.
 0xBB f1
 0xBC f2
 0xBD f3
@@ -41,11 +41,11 @@
 0xEF f21
 
 0xEE chat
-0xE4 chat # Just mapping Fn-Chat to Chat for now
+0xE4 chat # Just mapping Fn+Chat to Chat for now
 0xDD menu # Frame
-0xDA prog1 # Fn-Frame
+0xDA prog1 # Fn+Frame
 
-# The FN of some keys is other keys
+# The Fn of some keys is other keys
 0xD3 delete
 0xD2 insert
 0xC9 pageup
@@ -60,7 +60,7 @@
 0xDB leftmeta # left grab
 0xDC rightmeta # right grab
 0x85 rightmeta # Right grab releases on a different scancode
-0xD6 kbdillumtoggle # Fn-space
+0xD6 kbdillumtoggle # Fn+space
 0x69 switchvideomode # Brightness key
 
 # Game keys

diff --git a/keymaps/samsung-other b/keymaps/samsung-other
index 3ac0c2f10c17d6974d80cf4c671654e940eb49be..536a13d9cd58a42b04ad3a12b08607e8de059a1f 100644 (file)
--- a/keymaps/samsung-other
+++ b/keymaps/samsung-other
@@ -5,8 +5,8 @@
 0x83 battery # Fn+F2
 0x84 prog1 # Fn+F5 backlight on/off
 0x86 wlan # Fn+F9
-0x88 brightnessup # Fn-Up
-0x89 brightnessdown # Fn-Down
+0x88 brightnessup # Fn+Up
+0x89 brightnessdown # Fn+Down
 0xB1 prog2 # Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice)
 0xB3 prog3 # Fn+F8 switch power mode (battery/dynamic/performance)
 0xB4 wlan # Fn+F9 (X60P)

diff --git a/keymaps/samsung-series-3 b/keymaps/samsung-series-3
index 52b2d64b44f99272a2c918716b7b5b24085eb0d6..9a16fbce27a00e1b3c88a688b45603189df0623c 100644 (file)
--- a/keymaps/samsung-series-3
+++ b/keymaps/samsung-series-3
@@ -1,3 +1,3 @@
 0xCE prog1     # Fn+F1  launch control setting
 0xB3 prog2     # Fn+F11 performance mode
-0xD5 wlan      # Fn+F12 wifi on/off
+0xD5 wlan      # Fn+F12 Wi-Fi toggle

diff --git a/keymaps/samsung-series-9 b/keymaps/samsung-series-9
index 3b65735fa0c802a9fbd0277f142be58138b11cac..c0712f02a0da6b36df20f86d248c12011b1e85e9 100644 (file)
--- a/keymaps/samsung-series-9
+++ b/keymaps/samsung-series-9
@@ -1,5 +1,5 @@
-0x96 kbdillumup         # Fn+F8 keyboard backlit up
-0x97 kbdillumdown       # Fn+F7 keyboard backlit down
-0xD5 wlan               # Fn+F12 wifi on/off
+0x96 kbdillumup         # Fn+F8 keyboard backlight up
+0x97 kbdillumdown       # Fn+F7 keyboard backlight down
+0xD5 wlan               # Fn+F12 Wi-Fi toggle
 0xCE prog1              # Fn+F1 performance mode
 0x8D prog2              # Fn+F6 battery life extender

diff --git a/keymaps/toshiba-satellite_m30x b/keymaps/toshiba-satellite_m30x
index ae8e34941b378826e06086cd3b6e67bb6daf0206..26e0bbd93905a2e4ea4c6fa4b2906163e569dc0a 100644 (file)
--- a/keymaps/toshiba-satellite_m30x
+++ b/keymaps/toshiba-satellite_m30x
@@ -2,5 +2,5 @@
 0xd9 brightnessup
 0xee screenlock
 0x93 media
-0x9e f22 #touchpad_enable
-0x9f f23 #touchpad_disable
+0x9e f22 # touchpad enable
+0x9f f23 # touchpad disable