Date: Thu, 27 Aug 2009 12:33:05 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 167880 for review Message-ID: <200908271233.n7RCX5EV027349@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=167880 Change 167880 by rene@rene_self on 2009/08/27 12:32:10 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#21 integrate .. //depot/projects/docproj_nl/www/en/vendors.html#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.193 2009/08/26 09:00:26 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.194 2009/08/26 21:04:35 blackend Exp $ --> <chapter id="x11"> @@ -504,7 +504,7 @@ <deviceinfo version="0.2"> <device> <match key="info.capabilities" contains="input.keyboard"> - <merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge> + <merge key="input.x11_options.XkbOptions" type="string">terminate:ctrl_alt_bksp</merge> </match> </device> </deviceinfo></programlisting> @@ -528,6 +528,55 @@ along with any other options needed (e.g. keyboard layout switching).</para> + <note> + <para>As previously explained since version 7.4, by default, + the <application>hald</application> daemon will + automatically detect your keyboard. There are chances that + your keyboard layout or model will not be correct, desktop + environments like <application>GNOME</application>, + <application>KDE</application> or + <application>Xfce</application> provide tools to configure + the keyboard. However, it is possible to set the keyboard + properties directly either with the help of the + &man.setxkbmap.1; utility or with a + <application>hald</application>'s configuration rule.</para> + + <para>For example if one wants to use a PC 102 keys keyboard + coming with a french layout, we have to create a keyboard + configuration file for <application>hald</application> + called <filename>x11-input.fdi</filename> and saved in the + <filename + class="directory">/usr/local/etc/hal/fdi/policy</filename> + directory. This file should contain the following + lines:</para> + + <programlisting><?xml version="1.0" encoding="ISO-8859-1"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.keyboard"> + <merge key="input.x11_options.XkbModel" type="string">pc102</merge> + <merge key="input.x11_options.XkbLayout" type="string">fr</merge> + </match> + </device> +</deviceinfo></programlisting> + + <para>If this file already exists, just copy and add to your + file the lines regarding the keyboard configuration.</para> + + <para>You will have to reboot your machine to force + <application>hald</application> to read this file.</para> + + <para>It is possible to do the same configuration from an X + terminal or a script with this command line:</para> + + <screen>&prompt.user; <userinput>setxkbmap -model pc102 -layout fr</userinput></screen> + + <para>The + <filename>/usr/local/share/X11/xkb/rules/base.lst</filename> + file lists the various keyboard, layouts and options + available.</para> + </note> + <indexterm><primary>X11 tuning</primary></indexterm> <para>Next, tune the <filename>xorg.conf.new</filename> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.19 2009/08/26 06:04:10 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.20 2009/08/26 16:54:36 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml %SRCID% 1.193 --> ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#21 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.489 2009/07/26 11:48:34 blackend Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.490 2009/08/26 20:54:04 blackend Exp $ --> <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//"> @@ -568,6 +568,7 @@ <!ENTITY man.settc.1 "<citerefentry/<refentrytitle/settc/<manvolnum/1//"> <!ENTITY man.setty.1 "<citerefentry/<refentrytitle/setty/<manvolnum/1//"> <!ENTITY man.setvar.1 "<citerefentry/<refentrytitle/setvar/<manvolnum/1//"> +<!ENTITY man.setxkbmap.1 "<citerefentry vendor='xorg'/<refentrytitle/setxkbmap/<manvolnum/1//"> <!ENTITY man.sftp.1 "<citerefentry/<refentrytitle/sftp/<manvolnum/1//"> <!ENTITY man.sgmlnorm.1 "<citerefentry vendor='ports'/<refentrytitle/sgmlnorm/<manvolnum/1//"> <!ENTITY man.sgsc.1 "<citerefentry/<refentrytitle/sgsc/<manvolnum/1//"> ==== //depot/projects/docproj_nl/www/en/vendors.html#3 (text+ko) ==== @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">; -<!-- $FreeBSD$ --> +<!-- $FreeBSD: www/en/vendors.html,v 1.4 2009/08/26 18:21:34 rene Exp $ --> <html> <head> <meta http-equiv="refresh" content="5;url=doc/en_US.ISO8859-1/books/handbook/mirrors.html" />
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908271233.n7RCX5EV027349>