Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Nov 2011 20:28:23 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 201181 for review
Message-ID:  <201111042028.pA4KSNIb039342@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@201181?ac=10

Change 201181 by rene@rene_acer on 2011/11/04 20:28:23

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#21 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#114 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#28 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#9 (text+ko) ====

@@ -15,7 +15,7 @@
   <articleinfo>
     <title>Problem Report Handling Guidelines</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.38 2011/09/01 16:35:16 ryusuke Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.39 2011/11/03 20:56:02 manolis Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -1042,6 +1042,10 @@
 	  </listitem>
 
 	  <listitem>
+	    <para>Set Responsible to <literal>gnats-admin</literal>.</para>
+	  </listitem>
+
+	  <listitem>
 	    <para>Set State to <literal>closed</literal>.</para>
 	  </listitem>
 	</itemizedlist>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#21 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.207 2011/02/15 06:14:42 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.208 2011/10/30 17:29:14 manolis Exp $
 -->
 
 <chapter id="x11">
@@ -397,14 +397,8 @@
     <sect2>
       <title>Configuring X11</title>
 
-      <para>As of version 7.3, <application>&xorg;</application> can
-	often work without any configuration file by simply typing at
-	prompt:</para>
-
-      <screen>&prompt.user; <userinput>startx</userinput></screen>
-
-      <para>Starting with version 7.4, <application>&xorg;</application>
-	can use <acronym>HAL</acronym> to autodetect keyboards and mice.
+      <para><application>&xorg;</application>
+	uses <acronym>HAL</acronym> to autodetect keyboards and mice.
 	The <filename role="package">sysutils/hal</filename> and
 	<filename role="package">devel/dbus</filename> ports are installed
 	as dependencies of <filename role="package">x11/xorg</filename>, but
@@ -416,7 +410,13 @@
 
       <para>These services should be started (either manually or by
 	rebooting) before further <application>&xorg;</application>
-	configuration is attempted.</para>
+	configuration or use is attempted.</para>
+
+      <para><application>&xorg;</application> can
+	often work without any further configuration steps by simply typing at
+	prompt:</para>
+
+      <screen>&prompt.user; <userinput>startx</userinput></screen>
 
       <para>The automatic configuration may fail to work with some hardware,
 	or may not set things up quite as desired.  In these cases, manual
@@ -456,15 +456,7 @@
       <para>The next step is to test the existing
         configuration to verify that <application>&xorg;</application>
         can work with the graphics
-        hardware on the target system.  In <application>&xorg;</application>
-	versions up to 7.3, type:</para>
-
-      <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new</userinput></screen>
-
-      <para>Starting with <application>&xorg;</application> 7.4 and above,
-	this test produces a black screen which may make it difficult
-	to diagnose whether X11 is working properly.  The older behavior
-	is still available by using the <option>retro</option> option:</para>
+        hardware on the target system.  Type:</para>
 
       <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen>
 
@@ -483,15 +475,14 @@
 	</keycombo>.</para>
 
       <note>
-	<para>In <application>&xorg;</application> versions up to 7.3,
-	  the
+	<para>The
 	  <keycombo action="simul">
 	    <keycap>Ctrl</keycap>
 	    <keycap>Alt</keycap>
 	    <keycap>Backspace</keycap>
-	  </keycombo> key combination could be used to break out of
-	  <application>&xorg;</application>.  To enable it in
-	  version 7.4 and later, you can either type the following
+	  </keycombo> key combination may also be used to break out of
+	  <application>&xorg;</application>.  To enable it,
+	  you can either type the following
 	  command from any X terminal emulator:</para>
 
 	<screen>&prompt.user; <userinput>setxkbmap -option terminate:ctrl_alt_bksp</userinput></screen>
@@ -526,8 +517,9 @@
 
 	<para>If the mouse does not work, you will need to first
 	  configure it before proceeding.  See <xref linkend="mouse">
-	  in the &os; install chapter.  Additionally, starting with version
-	  7.4, the <literal>InputDevice</literal> sections in
+	  in the &os; install chapter.  In recent
+	  <application>Xorg</application> versions,
+	  the <literal>InputDevice</literal> sections in
 	  <filename>xorg.conf</filename> are ignored in favor of the
 	  autodetected devices.  To restore the old behavior, add the
 	  following line to the <literal>ServerLayout</literal> or
@@ -540,8 +532,8 @@
 	    switching).</para>
 
       <note>
-	<para>As previously explained since version 7.4, by default,
-	  the <application>hald</application> daemon will
+	<para>As previously explained
+	  the <application>hald</application> daemon will, by default,
 	  automatically detect your keyboard.  There are chances that
 	  your keyboard layout or model will not be correct, desktop
 	  environments like <application>GNOME</application>,

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#114 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1118 2011/10/13 14:50:03 brueffer Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1119 2011/11/04 14:28:43 pav Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -3811,7 +3811,7 @@
 	it unless the default is not suitable for your port.</para>
 
       <para>If your port anchors its man tree somewhere other than
-	<makevar>MANPREFIX</makevar>, you can use the
+	<makevar>PREFIX</makevar>, you can use the
 	<makevar>MANPREFIX</makevar> to set it.  Also, if only manpages in
 	certain sections go in a non-standard place, such as some <literal>perl</literal> modules
 	ports, you can set individual man paths using

==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#28 (text+ko) ====

@@ -5,7 +5,7 @@
 <usergroups>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.110 2011/08/17 15:05:49 jkois Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.112 2011/10/30 15:03:05 gjb Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -263,12 +263,12 @@
   <country code="ES" name="Spain">
     <entry id="freebsdspain">
       <name>FreeBSD Spain</name>
-      <url>https://sites.google.com/site/freebsdspain/</url>;
+      <url>http://freebsdspain.blogspot.com/</url>;
       <description>FreeBSD Spain is a new FreeBSD user group for
 	Spanish FreeBSD users, where they can share knowledge,
 	ideas, opinions and seek help.  For more information please
 	visit our <a
-	href="https://sites.google.com/site/freebsdspain/">website</a>;
+	href="http://freebsdspain.blogspot.com/">website</a>;
 	or send an <a href="mailto:gobledb@gmail.com">email</a>.
       </description>
     </entry>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111042028.pA4KSNIb039342>