From ae9e53b340ca2b0ce2f88d4122f44a681f8c7346 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Thu, 20 Apr 2006 06:37:42 +0000 Subject: Add a note that rc.conf overrides this DISPLAYMANAGER setting, even though rc.conf is deprecated. Package-Manager: portage-2.1_pre7-r5 --- x11-apps/xinit/ChangeLog | 6 +++++- x11-apps/xinit/files/xdm.confd | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'x11-apps/xinit') diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index b38bf828ea73..d5540e781158 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.44 2006/04/20 06:28:30 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.45 2006/04/20 06:37:42 spyderous Exp $ + + 20 Apr 2006; Donnie Berkholz ; files/xdm.confd: + Add a note that rc.conf overrides this DISPLAYMANAGER setting, even though + rc.conf is deprecated. *xinit-1.0.2-r2 (20 Apr 2006) diff --git a/x11-apps/xinit/files/xdm.confd b/x11-apps/xinit/files/xdm.confd index 53f310d77f16..e6d69799637c 100644 --- a/x11-apps/xinit/files/xdm.confd +++ b/x11-apps/xinit/files/xdm.confd @@ -6,4 +6,5 @@ XSTATICVT="yes" # What display manager do you use ? [ xdm | gdm | kdm | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. DISPLAYMANAGER="xdm" -- cgit v1.2.3-65-gdbad