Date: Tue, 01 Mar 2011 14:15:57 +0300 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: docs/155149: [patch] don't encourage using xorg.conf outside of PREFIX Message-ID: <867hcjw0pe.fsf@gmail.com> Resent-Message-ID: <201103011120.p21BK9QM027324@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155149
>Category: docs
>Synopsis: [patch] don't encourage using xorg.conf outside of PREFIX
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 01 11:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
cf. conf/155147
>Description:
Xserver knows about PREFIX nowadays, so don't encourage using legacy paths.
>From xorg.conf(5)
<cmdline>
/etc/X11/<cmdline>
/usr/local/etc/X11/<cmdline>
$XORGCONFIG
/etc/X11/$XORGCONFIG
/usr/local/etc/X11/$XORGCONFIG
/etc/X11/xorg.conf
/etc/xorg.conf
/usr/local/etc/X11/xorg.conf.<hostname>
/usr/local/etc/X11/xorg.conf
/usr/local/lib/X11/xorg.conf.<hostname>
/usr/local/lib/X11/xorg.conf
where <cmdline> is a relative path (with no ".." components) specified
with the -configdir command line option.
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: en_US.ISO8859-1/articles/compiz-fusion/article.sgml
===================================================================
RCS file: /a/.cvsup/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v
retrieving revision 1.6
diff -u -p -r1.6 article.sgml
--- en_US.ISO8859-1/articles/compiz-fusion/article.sgml 15 Jun 2008 15:58:38 -0000 1.6
+++ en_US.ISO8859-1/articles/compiz-fusion/article.sgml 1 Mar 2011 10:44:02 -0000
@@ -176,7 +176,7 @@
the proprietary driver:</para>
<para>Find the following line in
- <filename>/etc/X11/xorg.conf</filename>:</para>
+ <filename>/usr/local/etc/X11/xorg.conf</filename>:</para>
<programlisting>Driver "nv"</programlisting>
@@ -196,7 +196,7 @@
<filename role="package">x11/nvidia-xconfig</filename> and
<filename role="package">x11/nvidia-settings</filename> ports. The
former can assist you in writing settings to
- <filename>/etc/X11/xorg.conf</filename> from the command line, and
+ <filename>/usr/local/etc/X11/xorg.conf</filename> from the command line, and
the latter will allow you to modify screen settings from a GUI while
running the <application>&xorg;</application> system.</para>
</note>
@@ -208,7 +208,7 @@
<para>Before you install and run
<application>Compiz Fusion</application>, you need to add a few
- settings to <filename>/etc/X11/xorg.conf</filename>:</para>
+ settings to <filename>/usr/local/etc/X11/xorg.conf</filename>:</para>
<para>Add the following section to enable composite effects:</para>
@@ -367,7 +367,7 @@ emerald --replace &</programlisting>
<answer>
<para>You are probably missing a setting in
- <filename>/etc/X11/xorg.conf</filename>. Review this file
+ <filename>/usr/local/etc/X11/xorg.conf</filename>. Review this file
carefully and check especially the <literal>DefaultDepth</literal>
and <literal>AddARGBGLXVisuals</literal> directives.</para>
</answer>
Index: en_US.ISO8859-1/articles/euro/article.sgml
===================================================================
RCS file: /a/.cvsup/doc/en_US.ISO8859-1/articles/euro/article.sgml,v
retrieving revision 1.12
diff -u -p -r1.12 article.sgml
--- en_US.ISO8859-1/articles/euro/article.sgml 31 Jul 2010 11:08:14 -0000 1.12
+++ en_US.ISO8859-1/articles/euro/article.sgml 1 Mar 2011 10:44:55 -0000
@@ -259,7 +259,7 @@ BEGIN {
<sect1 id="x11">
<title>Modifying X11</title>
- <para>Modify <filename>/etc/X11/xorg.conf</filename>
+ <para>Modify <filename>/usr/local/etc/X11/xorg.conf</filename>
(<filename>/etc/X11/XF86Config</filename> if you're running &xfree86;) in
the following manner:</para>
Index: en_US.ISO8859-1/books/faq/book.sgml
===================================================================
RCS file: /a/.cvsup/doc/en_US.ISO8859-1/books/faq/book.sgml,v
retrieving revision 1.1132
diff -u -p -r1.1132 book.sgml
--- en_US.ISO8859-1/books/faq/book.sgml 15 Jan 2011 12:51:40 -0000 1.1132
+++ en_US.ISO8859-1/books/faq/book.sgml 1 Mar 2011 10:41:04 -0000
@@ -7011,7 +7011,7 @@ options SYSVMSG # enable for
linkend="moused" remap="another section"> and set up
&man.moused.8;.</para>
- <para>Then edit <filename>/etc/X11/xorg.conf</filename> and
+ <para>Then edit <filename>/usr/local/etc/X11/xorg.conf</filename> and
make sure you have the following lines:</para>
<programlisting>Section "InputDevice"
@@ -7058,9 +7058,9 @@ options SYSVMSG # enable for
do this, simply add the lines <literal>Buttons 5</literal>
and <literal>ZAxisMapping 4 5</literal> to the
<quote>InputDevice</quote> section of
- <filename>/etc/X11/xorg.conf</filename>. For example, you
+ <filename>/usr/local/etc/X11/xorg.conf</filename>. For example, you
might have the following <quote>InputDevice</quote> section
- in <filename>/etc/X11/xorg.conf</filename>.</para>
+ in <filename>/usr/local/etc/X11/xorg.conf</filename>.</para>
<example>
<title><quote>InputDevice</quote> Section for Wheeled Mouse
Index: en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
===================================================================
RCS file: /a/.cvsup/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml,v
retrieving revision 1.134
diff -u -p -r1.134 chapter.sgml
--- en_US.ISO8859-1/books/handbook/l10n/chapter.sgml 1 Dec 2010 20:37:04 -0000 1.134
+++ en_US.ISO8859-1/books/handbook/l10n/chapter.sgml 1 Mar 2011 10:42:33 -0000
@@ -806,7 +806,7 @@ font8x8="cp866-8x8"</programlisting>
package.</para>
<para>Check the <literal>"Files"</literal> section
- in your <filename>/etc/X11/xorg.conf</filename> file.
+ in your <filename>/usr/local/etc/X11/xorg.conf</filename> file.
The following
line must be added <emphasis>before</emphasis> any other
<literal>FontPath</literal> entries:</para>
Index: en_US.ISO8859-1/books/handbook/x11/chapter.sgml
===================================================================
RCS file: /a/.cvsup/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v
retrieving revision 1.207
diff -u -p -r1.207 chapter.sgml
--- en_US.ISO8859-1/books/handbook/x11/chapter.sgml 15 Feb 2011 06:14:42 -0000 1.207
+++ en_US.ISO8859-1/books/handbook/x11/chapter.sgml 1 Mar 2011 10:46:34 -0000
@@ -677,7 +677,7 @@ EndSection</programlisting>
This is typically <filename>/etc/X11/xorg.conf</filename> or
<filename>/usr/local/etc/X11/xorg.conf</filename>.</para>
- <screen>&prompt.root; <userinput>cp xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
+ <screen>&prompt.root; <userinput>cp xorg.conf.new /usr/local/etc/X11/xorg.conf</userinput></screen>
<para>The X11 configuration process is now
complete. <application>&xorg;</application> may be now
@@ -830,7 +830,7 @@ EndSection</programlisting>
<para>And likewise with the freefont or other collections. To have the X
server detect these fonts, add an appropriate line to the
- X server configuration file (<filename>/etc/X11/xorg.conf</filename>),
+ X server configuration file (<filename>/usr/local/etc/X11/xorg.conf</filename>),
which reads:</para>
<programlisting>FontPath "/usr/local/lib/X11/fonts/URW/"</programlisting>
@@ -866,7 +866,7 @@ EndSection</programlisting>
in this example because it is more consistent with the other font
rendering back-ends. To enable the freetype module just add the
following line to the <literal>"Module"</literal> section of the
- <filename>/etc/X11/xorg.conf</filename> file.</para>
+ <filename>/usr/local/etc/X11/xorg.conf</filename> file.</para>
<programlisting>Load "freetype"</programlisting>
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?867hcjw0pe.fsf>