From nobody@FreeBSD.org  Sat Sep 26 20:03:25 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2B4D1065692
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 26 Sep 2009 20:03:25 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id C0B7E8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 26 Sep 2009 20:03:25 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n8QK3O5K098673
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 26 Sep 2009 20:03:24 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n8QK3OFG098672;
	Sat, 26 Sep 2009 20:03:24 GMT
	(envelope-from nobody)
Message-Id: <200909262003.n8QK3OFG098672@www.freebsd.org>
Date: Sat, 26 Sep 2009 20:03:24 GMT
From: Oleg Ginzburg <oleg.ginzburg@nevosoft.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [handbook] partial updating and synchronisation with the original for russian x11 chapter
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>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:    gabor
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 26 20:10:06 UTC 2009
>Closed-Date:    Fri Oct 23 18:55:30 UTC 2009
>Last-Modified:  Fri Oct 23 19:00:13 UTC 2009
>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@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>&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+&lt;deviceinfo version="0.2"&gt;
+  &lt;device&gt;
+    &lt;match key="info.capabilities" contains="input.keyboard"&gt;
+	  &lt;merge key="input.x11_options.XkbOptions" type="string"&gt;terminate:ctrl_alt_bksp&lt;/merge&gt;
+    &lt;/match&gt;
+  &lt;/device&gt;
+&lt;/deviceinfo&gt;</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>&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+&lt;deviceinfo version="0.2"&gt;
+  &lt;device&gt;
+    &lt;match key="info.capabilities" contains="input.keyboard"&gt;
+	  &lt;merge key="input.x11_options.XkbModel" type="string"&gt;pc102&lt;/merge&gt;
+	  &lt;merge key="input.x11_options.XkbLayout" type="string"&gt;fr&lt;/merge&gt;
+    &lt;/match&gt;
+  &lt;/device&gt;
+&lt;/deviceinfo&gt;</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:
State-Changed-From-To: open->closed 
State-Changed-By: gabor 
State-Changed-When: Fri Oct 23 18:55:07 UTC 2009 
State-Changed-Why:  
Committed, thanks! 


Responsible-Changed-From-To: freebsd-doc->gabor 
Responsible-Changed-By: gabor 
Responsible-Changed-When: Fri Oct 23 18:55:07 UTC 2009 
Responsible-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139161 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/139161: commit references a PR
Date: Fri, 23 Oct 2009 18:54:50 +0000 (UTC)

 gabor       2009-10-23 18:54:42 UTC
 
   FreeBSD doc repository
 
   Modified files:
     ru_RU.KOI8-R/books/handbook/x11 chapter.sgml 
   Log:
   MFen:
           x11/chapter.sgml                        r1.186 -> r1.195
   
   PR:             docs/139161
   Submitted by:   Oleg Ginzburg <oleg.ginzburg@nevosoft.ru>
   
   Revision  Changes    Path
   1.24      +173 -46   doc/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
