docs/139161: [handbook] partial updating and synchronisation with the original for russian x11 chapter
Oleg Ginzburg
oleg.ginzburg at nevosoft.ru
Sat Sep 26 20:10:07 UTC 2009
>Number: 139161
>Category: docs
>Synopsis: [handbook] partial updating and synchronisation with the original for russian x11 chapter
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 26 20:10:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Oleg Ginzburg
>Release: 8.0-RC1
>Organization:
>Environment:
FreeBSD localhost.my.domain 8.0-RC1 FreeBSD 8.0-RC1 #2: Sat Sep 26 12:12:51 MSD 2009 root at localhost.my.domain:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
An information in russian translate x11 chapter has become outdated (absence about features Xorg 7.4, the information about -retro key, information about daemons dbus/hald...). The attached patch partially correct the information.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- ru_RU.KOI8-R/books/handbook/x11/chapter.sgml-orig 2009-09-26 21:59:29.000000000 +0400
+++ ru_RU.KOI8-R/books/handbook/x11/chapter.sgml 2009-09-26 23:18:05.000000000 +0400
@@ -438,14 +438,44 @@
<screen>&prompt.user; <userinput>startx</userinput></screen>
- <para>åÓÌÉ ÜÔÏ ÎÅ ÓÒÁÂÏÔÁÅÔ, ÉÌÉ ËÏÎÆÉÇÕÒÁÃÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ ÎÅ
- ÐÏÄÈÏÄÉÔ, X11 ÎÅÏÂÈÏÄÉÍÏ ÎÁÓÔÒÏÉÔØ ×ÒÕÞÎÕÀ. ðÒÏÃÅÓÓ ÎÁÓÔÒÏÊËÉ
- X11 Ñ×ÌÑÅÔÓÑ
+ <para>îÁÞÉÎÁÑ Ó ×ÅÒÓÉÉ 7.4, <application>&xorg;</application>
+ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ <acronym>HAL</acronym> ÄÌÑ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÐÏÉÓËÁ ËÌÁ×ÉÁÔÕÒÙ É ÍÙÛÉ.
+ ðÏÒÔÙ <filename role="package">sysutils/hal</filename> É
+ <filename role="package">devel/dbus</filename> ÂÕÄÕÔ ÉÎÓÔÁÌÌÉÒÏ×ÁÎÙ ËÁË
+ ÚÁ×ÉÓÉÍÏÓÔÉ <filename role="package">x11/xorg</filename>, ÎÏ ÄÌÑ
+ ÉÈ ×ËÌÀÞÅÎÉÑ ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÓÌÅÄÕÀÝÉÅ ÚÁÐÉÓÉ ×
+ <filename>/etc/rc.conf</filename> file:</para>
+
+ <programlisting>hald_enable="YES"
+dbus_enable="YES"</programlisting>
+
+ <para>üÔÉ ÓÅÒ×ÉÓÙ ÄÏÌÖÎÙ ÂÙÔØ ÚÁÐÕÝÅÎÙ (×ÒÕÞÎÕÀ ÉÌÉ ÐÒÉ
+ ÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ) ÄÏ ÐÏÓÌÅÄÕÀÝÅÊ ÚÁÇÒÕÚËÉ <application>&xorg;</application>
+ ËÏÎÆÉÇÕÒÁÃÉÉ.</para>
+
+ <para>á×ÔÏÍÁÔÉÞÅÓËÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ ÎÅ ×ÓÅÇÄÁ ÍÏÖÅÔ ÓÒÁÂÏÔÁÔØ ÎÁ ÎÅËÏÔÏÒÏÍ ÏÂÏÒÕÄÏ×ÁÎÉÉ,
+ ÌÉÂÏ ÓÏÚÄÁÔØ ÎÅ ÓÏ×ÓÅÍ ÔÕ ÎÁÓÔÒÏÊËÕ, ËÏÔÏÒÁÑ ÖÅÌÁÅÍÁ. ÷ ÜÔÉÈ ÓÌÕÞÁÑÈ, ÎÅÏÂÈÏÄÉÍÁ ÒÕÞÎÁÑ
+ ÎÁÓÔÒÏÊËÁ ËÏÎÆÉÇÕÒÁÃÉÉ.</para>
+
+ <note>
+ <para>ôÁËÉÅ ÏËÏÎÎÙÅ ÍÅÎÅÄÖÅÒÙ, ËÁË
+ <application>GNOME</application>,
+ <application>KDE</application> ÉÌÉ
+ <application>Xfce</application> ÉÍÅÀÔ ÓÏÂÓÔ×ÅÎÎÙÅ ÕÔÉÌÉÔÙ, ÐÏÚ×ÏÌÑÀÝÉÅ ÐÏÌØÚÏ×ÁÔÅÌÀ
+ ÌÅÇËÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÔÁËÉÅ ÐÁÒÁÍÅÔÒÙ, ËÁË ÒÁÚÒÅÛÅÎÉÅ ÜËÒÁÎÁ.
+ ðÏÜÔÏÍÕ, ÅÓÌÉ ËÏÎÆÉÇÕÒÁÃÉÑ ÐÏ-ÕÍÏÌÞÁÎÉÀ ÎÅ ÐÏÄÈÏÄÑÝÁÑ É ×Ù
+ ÐÌÁÎÉÒÕÅÔÅ ÉÎÓÔÁÌÌÉÒÏ×ÁÔØ ÜÔÉ ÏËÏÎÎÙÅ ÍÅÎÅÄÖÅÒÙ, ÐÒÏÓÔÏ ÍÏÖÅÔÅ
+ ÐÒÏÄÏÌÖÉÔØ ÎÁÓÔÒÏÊËÕ ÒÁÂÏÞÅÊ ÓÒÅÄÙ, ÉÓÐÏÌØÚÕÑ ÉÈ ÓÏÂÓÔ×ÅÎÎÙÅ ÕÔÉÌÉÔÙ
+ ÄÌÑ ÕÓÔÁÎÏ×ÏË ÐÁÒÁÍÅÔÒÏ× ÜËÒÁÎÁ.</para>
+ </note>
+
+ <para>ðÒÏÃÅÓÓ ÎÁÓÔÒÏÊËÉ X11 Ñ×ÌÑÅÔÓÑ
ÍÎÏÇÏÛÁÇÏ×ÙÍ. ðÅÒ×ÙÊ ÛÁÇ ÚÁËÌÀÞÁÅÔÓÑ × ÐÏÓÔÒÏÅÎÉÉ ÎÁÞÁÌØÎÏÇÏ
- ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ. òÁÂÏÔÁÑ Ó ÐÒÁ×ÁÍÉ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ,
- ÐÒÏÓÔÏ ÚÁÐÕÓÔÉÔÅ:</para>
+ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ.
+ òÁÂÏÔÁÑ Ó ÐÒÁ×ÁÍÉ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ, ÐÒÏÓÔÏ
+ ÚÁÐÕÓÔÉÔÅ:</para>
- <screen>&prompt.root; <userinput>Xorg -configure</userinput></screen>
+<screen>&prompt.root; <userinput>Xorg -configure</userinput></screen>
<para>ðÒÉ ÜÔÏÍ × ËÁÔÁÌÏÇÅ <filename>/root</filename> ÂÕÄÅÔ ÓÏÚÄÁÎ ÓËÅÌÅÔ
ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ X11 ÐÏÄ ÉÍÅÎÅÍ
@@ -463,6 +493,13 @@
<screen>&prompt.root; <userinput>Xorg -config xorg.conf.new</userinput></screen>
+ <para>îÁÞÉÎÁÑ Ó <application>&xorg;</application> 7.4 É ×ÙÛÅ,
+ ÜÔÏ ÔÅÓÔÉÒÏ×ÁÎÉÅ ÐÏËÁÖÅÔ ÌÉÛØ ÞÅÒÎÙÊ ÜËÒÁÎ, ÞÔÏ ÄÅÌÁÅÔ ÄÉÁÇÎÏÓÔÉËÕ
+ ÎÅ ÓÏ×ÓÅÍ ÐÏÌÎÏÃÅÎÎÙÍ. óÔÁÒÏÅ ÐÏ×ÅÄÅÎÉÅ ÂÕÄÅÔ ÄÏÓÔÕÐÎÏ
+ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÏÐÃÉÉ <option>retro</option></para>
+
+ <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen>
+
<para>åÓÌÉ ÐÏÑ×ÉÌÁÓØ Þ£ÒÎÏ-ÂÅÌÁÑ ÓÅÔËÁ É ËÕÒÓÏÒ ÍÙÛÉ × ×ÉÄÅ
X, ÔÏ ÎÁÓÔÒÏÊËÁ ÂÙÌÁ ×ÙÐÏÌÎÅÎÁ ÕÓÐÅÛÎÏ. äÌÑ ÚÁ×ÅÒÛÅÎÉÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ
ÐÒÏÓÔÏ ÎÁÖÍÉÔÅ ÏÄÎÏ×ÒÅÍÅÎÎÏ
@@ -472,10 +509,97 @@
<keycap>Backspace</keycap>
</keycombo>.</para>
- <note>
+ <note>
+ <para>äÁÎÎÁÑ ËÏÍÂÉÎÁÃÉÑ ×ËÌÀÞÅÎÁ ÐÏ-ÕÍÏÌÞÁÎÉÀ ÄÏ
+ <application>&xorg;</application> ×ÅÒÓÉÉ 7.3. äÌÑ ×ËÌÀÞÅÎÉÑ ÜÔÏÇÏ ×
+ ×ÅÒÓÉÉ 7.4 É ×ÙÛÅ, ×Ù ÄÏÌÖÎÎÙ ××ÅÓÔÉ ÓÌÅÄÕÀÝÕÀ
+ ËÏÍÁÎÄÕ × ÌÀÂÏÍ ÜÍÕÌÑÔÏÒÅ X ÔÅÒÍÉÎÁÌÁ:</para>
+
+ <screen>&prompt.user; <userinput>setxkbmap -option terminate:ctrl_alt_bksp</userinput></screen>
+
+ <para>ÉÌÉ ÓÏÚÄÁÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ËÌÁ×ÉÁÔÕÒÙ ÄÌÑ
+ <application>hald</application> ÎÁÚÙ×ÁÅÍÙÊ
+ <filename>x11-input.fdi</filename> É ÓÏÈÒÁÎÉÔØ ÅÇÏ ×
+ <filename
+ class="directory">/usr/local/etc/hal/fdi/policy</filename>
+ ÄÉÒÅËÔÏÒÉÉ. äÁÎÎÙÊ ÆÁÊÌ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÓÌÅÄÕÀÝÉÅ
+ ÓÔÒÏÞËÉ:</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.XkbOptions" type="string">terminate:ctrl_alt_bksp</merge>
+ </match>
+ </device>
+</deviceinfo></programlisting>
+
+ <para>÷ÁÍ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÐÅÒÅÚÁÇÒÕÚËÁ ÓÉÓÔÅÍÙ ÄÌÑ ×ÓÔÕÐÌÅÎÉÑ ÐÁÒÁÍÅÔÒÏ×
+ <application>hald</application> × ÓÉÌÕ.</para>
+ </note>
+
+
<para>åÓÌÉ ÍÙÛØ ÎÅ ÒÁÂÏÔÁÅÔ, ÅÅ ÎÅÏÂÈÏÄÉÍÏ ÎÁÓÔÒÏÉÔØ.
ïÂÒÁÔÉÔÅÓØ Ë <xref linkend="mouse"> × ÇÌÁ×Å Ï ÕÓÔÁÎÏ×ËÅ
- &os;.</para>
+ &os;. äÏÐÏÌÎÉÔÅÌØÎÏ, ÎÁÞÉÎÁÑ Ó ×ÅÒÓÉÉ
+ 7.4, ÓÅËÃÉÑ <literal>InputDevice</literal> ×
+ <filename>xorg.conf</filename> ÉÇÎÏÒÉÒÕÅÔÓÑ × ÐÏÌØÚÕ
+ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÐÏÉÓËÁ ÕÓÔÒÏÊÓÔ×. äÌÑ ×ÏÚ×ÒÁÝÅÎÉÑ ÓÔÁÒÏÇÏ ÐÏ×ÅÄÅÎÉÑ, ÄÏÂÁ×ØÔÅ
+ ÓÌÅÄÕÀÝÉÅ ÓÔÒÏÞËÉ × ÓÅËÃÉÉ <literal>ServerLayout</literal> ÉÌÉ
+ <literal>ServerFlags</literal>:</para>
+
+ <programlisting>Option "AutoAddDevices" "false"</programlisting>
+
+ <para>õÓÔÒÏÊÓÔ×Á ××ÏÄÁ ÍÏÇÕÔ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÙ ÚÁÔÅÍ ËÁË × ÐÒÅÄÙÄÕÝÉÈ ×ÅÒÓÉÑÈ,
+ ×ÍÅÓÔÅ Ó ÄÒÕÇÉÍÉ ÎÅÏÂÈÏÄÉÍÙÍÉ ÏÐÃÉÑÍÉ (ÔÁËÉÍÉ, ËÁË ÐÅÒÅËÌÀÞÅÎÉÅ ÒÁÓËÌÁÄÏË ËÌÁ×ÉÁÔÕÒÙ
+ ÎÁÐÒÉÍÅÒ).</para>
+
+ <note>
+ <para>ëÁË ÒÁÎÅÅ ÕÖÅ ÓÏÏÂÝÁÌÏÓØ, ÎÁÞÉÎÁÑ Ó ×ÅÒÓÉÉ 7.4, ÐÏ-ÕÍÏÌÞÁÎÉÀ,
+ <application>hald</application> ÄÅÍÏÎ ÂÕÄÅÔ ÐÙÔÁÔØÓÑ ÒÁÓÐÏÚÎÁÔØ
+ ×ÁÛÕ ËÌÁ×ÉÁÔÕÒÕ Á×ÔÏÍÁÔÉÞÅÓËÉ. åÓÔØ ×ÏÚÍÏÖÎÏÓÔØ, ÞÔÏ ÒÁÓËÌÁÄËÁ ×ÁÛÅÊ
+ ËÌÁ×ÉÁÔÕÒÙ ÉÌÉ ÅÅ ÍÏÄÅÌØ ÂÕÄÕÔ ÏÐÒÅÄÅÌÅÎÙ ÎÅËÏÒÒÅËÔÎÏ. ôÁËÉÅ ÏËÏÎÎÙÅ
+ ÍÅÎÅÄÖÅÒÙ ËÁË <application>GNOME</application>,
+ <application>KDE</application> ÉÌÉ
+ <application>Xfce</application> ÓÏÄÅÒÖÁÔ Ó×ÏÉ ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ
+ ËÌÁ×ÉÁÔÕÒ. ôÅÍ ÎÅ ÍÅÎÅÅ, ÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁÒÁÍÅÔÒÙ ËÌÁ×ÉÁÔÕÒÙ
+ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ Ó ÐÏÍÏÝØÀ ÕÔÉÌÉÔÙ &man.setxkbmap.1; ÉÌÉ ÞÅÒÅÚ
+ <application>hald</application>ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÐÒÁ×ÉÌÁ.</para>
+
+ <para>îÁÐÒÉÍÅÒ, ÅÓÌÉ ×Ù ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÁ×ÉÁÛÉ PC 102 ËÌÁ×ÉÁÔÕÒÙ,
+ ÉÄÕÝÁÑ Ó ÆÒÁÎÃÕÓËÏÊ ÒÁÓËÌÁÄËÏÊ, ÍÙ ÄÏÌÖÎÙ ÓÏÚÄÁÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ
+ ËÌÁ×ÉÁÔÕÒÙ ÄÌÑ <application>hald</application>
+ ÎÁÚÙ×ÁÅÍÙÊ <filename>x11-input.fdi</filename> É ÓÏÈÒÁÎÉÔØ ×
+ <filename
+ class="directory">/usr/local/etc/hal/fdi/policy</filename>
+ ÄÉÒÅËÔÏÒÉÉ. üÔÏÔ ÆÁÊÌ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÓÌÅÄÕÀÝÉÅ
+ ÓÔÒÏÞËÉ:</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>åÓÌÉ ÜÔÏÔ ÆÁÊÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÓÔÏ ÓËÏÐÉÒÕÊÔÅ É ÄÏÂÁ×ØÔÅ ÜÔÉ ÓÔÒÏÞËÉ ×
+ ÆÁÊÌ ÄÁÎÎÙÊ ÆÁÊÌ.</para>
+
+ <para>÷Ù ÄÏÌÖÎÙ ÂÕÄÅÔÅ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÓÉÓÔÅÍÕ, ÞÔÏÂÙ ÚÁÓÔÁ×ÉÔØ
+ <application>hald</application> ÐÒÉÍÅÎÉÔØ ÎÁÓÔÒÏÊËÉ.</para>
+
+ <para>åÓÔØ ×ÏÚÍÏÖÎÏÓÔØ ÐÒÏÄÅÌÁÔØ ÔÕ ÖÅ ËÏÎÆÉÇÕÒÁÃÉÀ ÉÚ X ÔÅÒÍÉÎÁÌÁ
+ ÉÌÉ ÓËÒÉÐÔ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÏÊ:</para>
+
+ <screen>&prompt.user; <userinput>setxkbmap -model pc102 -layout fr</userinput></screen>
+
+ <para>æÁÊÌ
+ <filename>/usr/local/share/X11/xkb/rules/base.lst</filename>
+ ÓÏÄÅÒÖÉÔ ÓÐÉÓÏË ÒÁÚÌÉÞÎÙÈ ËÌÁ×ÉÁÔÕÒ, ÄÏÓÔÕÐÎÙÅ ÏÐÃÉÉ
+ É ÒÁÓËÌÁÄËÉ.</para>
</note>
<indexterm><primary>ôÏÎËÁÑ ÎÁÓÔÒÏÊËÁ X11</primary></indexterm>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-doc
mailing list