From owner-freebsd-doc@FreeBSD.ORG Tue Mar 1 11:20:10 2011 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AE421065676 for ; Tue, 1 Mar 2011 11:20:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 098B28FC27 for ; Tue, 1 Mar 2011 11:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p21BK9tc027325 for ; Tue, 1 Mar 2011 11:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p21BK9QM027324; Tue, 1 Mar 2011 11:20:09 GMT (envelope-from gnats) Resent-Date: Tue, 1 Mar 2011 11:20:09 GMT Resent-Message-Id: <201103011120.p21BK9QM027324@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDEFC106566B for ; Tue, 1 Mar 2011 11:16:16 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 498118FC15 for ; Tue, 1 Mar 2011 11:16:16 +0000 (UTC) Received: by fxm19 with SMTP id 19so5239157fxm.13 for ; Tue, 01 Mar 2011 03:16:15 -0800 (PST) Received: by 10.223.101.134 with SMTP id c6mr2359467fao.12.1298978175392; Tue, 01 Mar 2011 03:16:15 -0800 (PST) Received: from localhost (fresti.ros.sgsnet.se [193.11.208.139]) by mx.google.com with ESMTPS id n15sm2060159fam.36.2011.03.01.03.16.07 (version=SSLv3 cipher=OTHER); Tue, 01 Mar 2011 03:16:14 -0800 (PST) Message-Id: <867hcjw0pe.fsf@gmail.com> Date: Tue, 01 Mar 2011 14:15:57 +0300 From: Anonymous To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: docs/155149: [patch] don't encourage using xorg.conf outside of PREFIX X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2011 11:20:10 -0000 >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) /etc/X11/ /usr/local/etc/X11/ $XORGCONFIG /etc/X11/$XORGCONFIG /usr/local/etc/X11/$XORGCONFIG /etc/X11/xorg.conf /etc/xorg.conf /usr/local/etc/X11/xorg.conf. /usr/local/etc/X11/xorg.conf /usr/local/lib/X11/xorg.conf. /usr/local/lib/X11/xorg.conf where 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: Find the following line in - /etc/X11/xorg.conf: + /usr/local/etc/X11/xorg.conf: Driver "nv" @@ -196,7 +196,7 @@ x11/nvidia-xconfig and x11/nvidia-settings ports. The former can assist you in writing settings to - /etc/X11/xorg.conf from the command line, and + /usr/local/etc/X11/xorg.conf from the command line, and the latter will allow you to modify screen settings from a GUI while running the &xorg; system. @@ -208,7 +208,7 @@ Before you install and run Compiz Fusion, you need to add a few - settings to /etc/X11/xorg.conf: + settings to /usr/local/etc/X11/xorg.conf: Add the following section to enable composite effects: @@ -367,7 +367,7 @@ emerald --replace & You are probably missing a setting in - /etc/X11/xorg.conf. Review this file + /usr/local/etc/X11/xorg.conf. Review this file carefully and check especially the DefaultDepth and AddARGBGLXVisuals directives. 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 { Modifying X11 - Modify /etc/X11/xorg.conf + Modify /usr/local/etc/X11/xorg.conf (/etc/X11/XF86Config if you're running &xfree86;) in the following manner: 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;. - Then edit /etc/X11/xorg.conf and + Then edit /usr/local/etc/X11/xorg.conf and make sure you have the following lines: Section "InputDevice" @@ -7058,9 +7058,9 @@ options SYSVMSG # enable for do this, simply add the lines Buttons 5 and ZAxisMapping 4 5 to the InputDevice section of - /etc/X11/xorg.conf. For example, you + /usr/local/etc/X11/xorg.conf. For example, you might have the following InputDevice section - in /etc/X11/xorg.conf. + in /usr/local/etc/X11/xorg.conf. <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: