From: Russ Allbery <rra@debian.org>
Date: Sat, 4 Jul 2009 22:35:00 +0000 (-0700)
Subject: Using /etc/X11 for configuration is allowed, not should
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b3e0fc33abf0e9af4e08a233c729607291191956;p=debian%2Fdebian-policy.git

Using /etc/X11 for configuration is allowed, not should

Expand the list of applications that may use /etc/X11 for configuration
files to include session managers, but change this section to may from
should.  There doesn't appear to be a reason to encourage this going
forward.  Reword the section for more direct phrasing.
---

diff --git a/policy.sgml b/policy.sgml
index b27c9da..0eed329 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -8599,12 +8599,13 @@ name ["<var>syshostname</var>"]:
 	  </p>
 
 	  <p>
-	    Configuration files for window managers and display managers
-	    should be placed in a subdirectory of <file>/etc/X11/</file>
-	    corresponding to the package name due to these programs' tight
-	    integration with the mechanisms of the X Window System.
-	    Application-level programs should use the <file>/etc/</file>
-	    directory unless otherwise mandated by policy.
+	    Configuration files for window, display, or session managers
+	    or other applications that are tightly integrated with the X
+	    Window System may be placed in a subdirectory
+	    of <file>/etc/X11/</file> corresponding to the package name.
+	    Other X Window System applications should use
+	    the <file>/etc/</file> directory unless otherwise mandated by
+	    policy (such as for <ref id="appdefaults">).
 	  </p>
 	</sect1>