Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src add the xkeyboard-config manual as a .man, so that the norma...



details:   https://anonhg.NetBSD.org/src/rev/71cef39996e6
branches:  trunk
changeset: 349582:71cef39996e6
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Dec 15 09:17:26 2016 +0000

description:
add the xkeyboard-config manual as a .man, so that the normal X processing
of it happens.

diffstat:

 distrib/sets/lists/xbase/mi                                 |     7 +-
 external/mit/xorg/lib/xkeyboard-config/Makefile             |     4 +-
 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7   |  1341 -----------
 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man |  1341 +++++++++++
 4 files changed, 1347 insertions(+), 1346 deletions(-)

diffs (truncated from 2740 to 300 lines):

diff -r d50f6112edb5 -r 71cef39996e6 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi       Thu Dec 15 08:57:24 2016 +0000
+++ b/distrib/sets/lists/xbase/mi       Thu Dec 15 09:17:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.137 2016/11/23 09:50:52 snj Exp $
+# $NetBSD: mi,v 1.138 2016/12/15 09:17:26 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1393,6 +1393,7 @@
 ./usr/X11R7/man/cat7/XOrgFoundation.0                  -unknown-       .cat,xorg
 ./usr/X11R7/man/cat7/XProjectTeam.0                    -unknown-       .cat,xorg
 ./usr/X11R7/man/cat7/Xsecurity.0                       -unknown-       .cat,xorg
+./usr/X11R7/man/cat7/xkeyboard-config.0                        -unknown-       .cat,xorg
 ./usr/X11R7/man/html1                                  base-x11-root   xorg
 ./usr/X11R7/man/html1/appres.html                      -unknown-       html,xorg
 ./usr/X11R7/man/html1/atobm.html                       -unknown-       html,xorg
@@ -1536,7 +1537,7 @@
 ./usr/X11R7/man/html7/XOrgFoundation.html              -unknown-       html,xorg
 ./usr/X11R7/man/html7/XProjectTeam.html                        -unknown-       html,xorg
 ./usr/X11R7/man/html7/Xsecurity.html                   -unknown-       html,xorg
-#./usr/X11R7/man/html7/xkeyboard-config.html           -unknown-       html,xorg
+./usr/X11R7/man/html7/xkeyboard-config.html            -unknown-       html,xorg
 ./usr/X11R7/man/man1                                   base-x11-root   xorg
 ./usr/X11R7/man/man1/appres.1                          -unknown-       .man,xorg
 ./usr/X11R7/man/man1/atobm.1                           -unknown-       .man,xorg
@@ -1681,7 +1682,7 @@
 ./usr/X11R7/man/man7/XOrgFoundation.7                  -unknown-       .man,xorg
 ./usr/X11R7/man/man7/XProjectTeam.7                    -unknown-       .man,xorg
 ./usr/X11R7/man/man7/Xsecurity.7                       -unknown-       .man,xorg
-#./usr/X11R7/man/man7/xkeyboard-config.7                       -unknown-       .man,xorg
+./usr/X11R7/man/man7/xkeyboard-config.7                        -unknown-       .man,xorg
 ./usr/X11R7/man/whatis.db                              -unknown-       man,xorg,!makemandb
 ./usr/X11R7/share                                      base-x11-root   xorg
 ./usr/X11R7/share/aclocal                              base-x11-root   xorg
diff -r d50f6112edb5 -r 71cef39996e6 external/mit/xorg/lib/xkeyboard-config/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/Makefile   Thu Dec 15 08:57:24 2016 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/Makefile   Thu Dec 15 09:17:26 2016 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.11 2016/11/23 09:50:52 snj Exp $
+#      $NetBSD: Makefile,v 1.12 2016/12/15 09:17:26 mrg Exp $
 
 .include <bsd.own.mk>
 
 # XXX when updating to a new xkeyboard-config, regenerate with xsltproc
-#MAN=          xkeyboard-config.7
+MAN=           xkeyboard-config.7
 
 SUBDIR=                compat geometry keycodes rules symbols types
 
diff -r d50f6112edb5 -r 71cef39996e6 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7
--- a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7 Thu Dec 15 08:57:24 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1341 +0,0 @@
-.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.19" "X Version 11"
-.SH NAME
-xkeyboard-config \- XKB data description files
-.SH DESCRIPTION
-xkeyboard-config provides the description files for the X Keyboard
-Extension (XKB). The configuration options below are usually applied with
-setxkbmap(1).
-.SH MODELS
-.TS
-left,box;
-lB lB
-___
-lB l.
-Model  Description
-pc101  Generic 101-key PC
-pc102  Generic 102-key (Intl) PC
-pc104  Generic 104-key PC
-pc105  Generic 105-key (Intl) PC
-dell101        Dell 101-key PC
-latitude       Dell Latitude series laptop
-dellm65        Dell Precision M65
-everex Everex STEPnote
-flexpro        Keytronic FlexPro
-microsoft      Microsoft Natural
-omnikey101     Northgate OmniKey 101
-winbook        Winbook Model XP5
-pc98   PC-98xx Series
-a4techKB21     A4Tech KB-21
-a4techKBS8     A4Tech KBS-8
-a4_rfkb23      A4Tech Wireless Desktop RFKB-23
-airkey Acer AirKey V
-azonaRF2300    Azona RF2300 wireless Internet Keyboard
-scorpius       Advance Scorpius KI
-brother        Brother Internet Keyboard
-btc5113rf      BTC 5113RF Multimedia
-btc5126t       BTC 5126T
-btc6301urf     BTC 6301URF
-btc9000        BTC 9000
-btc9000a       BTC 9000A
-btc9001ah      BTC 9001AH
-btc5090        BTC 5090
-btc9019u       BTC 9019U
-btc9116u       BTC 9116U Mini Wireless Internet and Gaming
-cherryblue     Cherry Blue Line CyBo@rd
-cherryblueb    Cherry CyMotion Master XPress
-cherrybluea    Cherry Blue Line CyBo@rd (alternate option)
-cherrycyboard  Cherry CyBo@rd USB-Hub
-cherrycmexpert Cherry CyMotion Expert
-cherrybunlim   Cherry B.UNLIMITED
-chicony        Chicony Internet Keyboard
-chicony0108    Chicony KU-0108
-chicony0420    Chicony KU-0420
-chicony9885    Chicony KB-9885
-compaqeak8     Compaq Easy Access Keyboard
-compaqik7      Compaq Internet Keyboard (7 keys)
-compaqik13     Compaq Internet Keyboard (13 keys)
-compaqik18     Compaq Internet Keyboard (18 keys)
-cymotionlinux  Cherry CyMotion Master Linux
-armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
-presario       Laptop/notebook Compaq (eg. Presario) Internet Keyboard
-ipaq   Compaq iPaq Keyboard
-dell   Dell
-dellsk8125     Dell SK-8125
-dellsk8135     Dell SK-8135
-dellusbmm      Dell USB Multimedia Keyboard
-inspiron       Dell Laptop/notebook Inspiron 6xxx/8xxx
-precision_m    Dell Laptop/notebook Precision M series
-dexxa  Dexxa Wireless Desktop Keyboard
-diamond        Diamond 9801 / 9802 series
-dtk2000        DTK2000
-ennyah_dkb1008 Ennyah DKB-1008
-fscaa1667g     Fujitsu-Siemens Computers AMILO laptop
-genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910
-geniuscomfy    Genius Comfy KB-12e
-geniuscomfy2   Genius Comfy KB-21e-Scroll
-geniuskb19e    Genius KB-19e NB
-geniuskkb2050hs        Genius KKB-2050HS
-gyration       Gyration
-htcdream       HTC Dream
-kinesis        Kinesis
-logitech_base  Logitech Generic Keyboard
-logitech_g15   Logitech G15 extra keys via G15daemon
-hpi6   Hewlett-Packard Internet Keyboard
-hp250x Hewlett-Packard SK-250x Multimedia Keyboard
-hpxe3gc        Hewlett-Packard Omnibook XE3 GC
-hpxe3gf        Hewlett-Packard Omnibook XE3 GF
-hpxt1000       Hewlett-Packard Omnibook XT1000
-hpdv5  Hewlett-Packard Pavilion dv5
-hpzt11xx       Hewlett-Packard Pavilion ZT11xx
-hp500fa        Hewlett-Packard Omnibook 500 FA
-hp5xx  Hewlett-Packard Omnibook 5xx
-hpnx9020       Hewlett-Packard nx9020
-hp6000 Hewlett-Packard Omnibook 6000/6100
-honeywell_euroboard    Honeywell Euroboard
-hpmini110      Hewlett-Packard Mini 110 Notebook
-rapidaccess    IBM Rapid Access
-rapidaccess2   IBM Rapid Access II
-thinkpad       IBM ThinkPad 560Z/600/600E/A22E
-thinkpad60     IBM ThinkPad R60/T60/R61/T61
-thinkpadz60    IBM ThinkPad Z60m/Z60t/Z61m/Z61t
-ibm_spacesaver IBM Space Saver
-logiaccess     Logitech Access Keyboard
-logiclx300     Logitech Cordless Desktop LX-300
-logii350       Logitech Internet 350 Keyboard
-logimel        Logitech Media Elite Keyboard
-logicd Logitech Cordless Desktop
-logicd_it      Logitech Cordless Desktop iTouch
-logicd_nav     Logitech Cordless Desktop Navigator
-logicd_opt     Logitech Cordless Desktop Optical
-logicda        Logitech Cordless Desktop (alternate option)
-logicdpa2      Logitech Cordless Desktop Pro (alternate option 2)
-logicfn        Logitech Cordless Freedom/Desktop Navigator
-logicdn        Logitech Cordless Desktop Navigator
-logiitc        Logitech iTouch Cordless Keyboard (model Y-RB6)
-logiik Logitech Internet Keyboard
-itouch Logitech iTouch
-logicink       Logitech Internet Navigator Keyboard
-logiex110      Logitech Cordless Desktop EX110
-logiinkse      Logitech iTouch Internet Navigator Keyboard SE
-logiinkseusb   Logitech iTouch Internet Navigator Keyboard SE (USB)
-logiultrax     Logitech Ultra-X Keyboard
-logiultraxc    Logitech Ultra-X Cordless Media Desktop Keyboard
-logidinovo     Logitech diNovo Keyboard
-logidinovoedge Logitech diNovo Edge Keyboard
-mx1998 Memorex MX1998
-mx2500 Memorex MX2500 EZ-Access Keyboard
-mx2750 Memorex MX2750
-microsoft4000  Microsoft Natural Ergonomic Keyboard 4000
-microsoft7000  Microsoft Natural Wireless Ergonomic Keyboard 7000
-microsoftinet  Microsoft Internet Keyboard
-microsoftpro   Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-microsoftprousb        Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
-microsoftprooem        Microsoft Natural Keyboard Pro OEM
-vsonku306      ViewSonic KU-306 Internet Keyboard
-microsoftprose Microsoft Internet Keyboard Pro, Swedish
-microsoftoffice        Microsoft Office Keyboard
-microsoftmult  Microsoft Wireless Multimedia Keyboard 1.0A
-microsoftelite Microsoft Natural Keyboard Elite
-microsoftccurve2k      Microsoft Comfort Curve Keyboard 2000
-oretec Ortek MCK-800 MM/Internet keyboard
-propeller      Propeller Voyager (KTEZ-1000)
-qtronix        QTronix Scorpius 98N+
-samsung4500    Samsung SDM 4500P
-samsung4510    Samsung SDM 4510P
-sanwaskbkg3    Sanwa Supply SKB-KG3
-sk1300 SK-1300
-sk2500 SK-2500
-sk6200 SK-6200
-sk7100 SK-7100
-sp_inet        Super Power Multimedia Keyboard
-sven   SVEN Ergonomic 2500
-sven303        SVEN Slim 303
-symplon        Symplon PaceBook (tablet PC)
-toshiba_s3000  Toshiba Satellite S3000
-trust  Trust Wireless Keyboard Classic
-trustda        Trust Direct Access Keyboard
-trust_slimline Trust Slimline
-tm2020 TypeMatrix EZ-Reach 2020
-tm2030PS2      TypeMatrix EZ-Reach 2030 PS2
-tm2030USB      TypeMatrix EZ-Reach 2030 USB
-tm2030USB-102  TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)
-tm2030USB-106  TypeMatrix EZ-Reach 2030 USB (106:JP mode)
-yahoo  Yahoo! Internet Keyboard
-macbook78      MacBook/MacBook Pro
-macbook79      MacBook/MacBook Pro (Intl)
-macintosh      Macintosh
-macintosh_old  Macintosh Old
-macintosh_hhk  Happy Hacking Keyboard for Mac
-acer_c300      Acer C300
-acer_ferrari4k Acer Ferrari 4000
-acer_laptop    Acer Laptop
-asus_laptop    Asus Laptop
-apple  Apple
-apple_laptop   Apple Laptop
-applealu_ansi  Apple Aluminium Keyboard (ANSI)
-applealu_iso   Apple Aluminium Keyboard (ISO)
-applealu_jis   Apple Aluminium Keyboard (JIS)
-silvercrest    SILVERCREST Multimedia Wireless Keyboard
-emachines      Laptop/notebook eMachines m68xx
-benqx  BenQ X-Touch
-benqx730       BenQ X-Touch 730
-benqx800       BenQ X-Touch 800
-hhk    Happy Hacking Keyboard
-classmate      Classmate PC
-olpc   OLPC
-sun_type7_usb  Sun Type 7 USB
-sun_type7_euro_usb     Sun Type 7 USB (European layout)
-sun_type7_unix_usb     Sun Type 7 USB (Unix layout)
-sun_type7_jp_usb       Sun Type 7 USB (Japanese layout) / Japanese 106-key
-sun_type6_usb  Sun Type 6/7 USB
-sun_type6_euro_usb     Sun Type 6/7 USB (European layout)
-sun_type6_unix_usb     Sun Type 6 USB (Unix layout)
-sun_type6_jp_usb       Sun Type 6 USB (Japanese layout)
-sun_type6_jp   Sun Type 6 (Japanese layout)
-targa_v811     Targa Visionary 811
-unitekkb1925   Unitek KB-1925
-compalfl90     FL90
-creativedw7000 Creative Desktop Wireless 7000
-htcdream       Htc Dream phone
-teck227        Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
-teck229        Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
-
-.TE
-.SH LAYOUTS
-.TS
-left,box;
-lB lB
-____
-lB l.
-Layout(Variant)        Description
-us     English (US)
-us(chr)        Cherokee
-us(euro)       English (US, with euro on 5)
-us(intl)       English (US, international with dead keys)
-us(alt-intl)   English (US, alternative international)
-us(colemak)    English (Colemak)
-us(dvorak)     English (Dvorak)
-us(dvorak-intl)        English (Dvorak, international with dead keys)
-us(dvorak-alt-intl)    English (Dvorak alternative international no dead keys)
-us(dvorak-l)   English (left handed Dvorak)
-us(dvorak-r)   English (right handed Dvorak)
-us(dvorak-classic)     English (classic Dvorak)
-us(dvp)        English (Programmer Dvorak)
-us(rus)        Russian (US, phonetic)
-us(mac)        English (Macintosh)
-us(altgr-intl) English (international AltGr dead keys)
-us(olpc2)      English (the divide/multiply keys toggle the layout)
-us(hbs)        Serbo-Croatian (US)
-us(workman)    English (Workman)
-us(workman-intl)       English (Workman, international with dead keys)
-
-_
-af     Afghani
-af(ps) Pashto
-af(uz) Uzbek (Afghanistan)
-af(olpc-ps)    Pashto (Afghanistan, OLPC)
-af(fa-olpc)    Persian (Afghanistan, Dari OLPC)
-af(uz-olpc)    Uzbek (Afghanistan, OLPC)
-
-_
-ara    Arabic
-ara(azerty)    Arabic (azerty)
-ara(azerty_digits)     Arabic (azerty/digits)
-ara(digits)    Arabic (digits)
-ara(qwerty)    Arabic (qwerty)



Home | Main Index | Thread Index | Old Index