clarify wording in the section on the location of configuration files, closes: #170019

Author: joy
Date: 2003/02/16 00:07:45
clarify wording in the section on the location of configuration files, closes: #170019

git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-178

diff --git a/debian/changelog b/debian/changelog
index 19081d2e22a08a94bb533d529f781da7ee91fc26..e76951aefd2133c6e53c966f1561c1e377f839e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ debian-policy (3.5.9.0) unstable; urgency=low
     offtopic stuff, too.
   * When asked to restart a service that isn't already running, the init
     script should start it, closes: #60979.
+  * Rephrased section on configuration files to remove confusing use of
+    "should", closes: #170019.
 
  -- 
 

diff --git a/policy.sgml b/policy.sgml
index e8eb2f1de30fc78fa1130498ab4da84378c56003..8b1cab20e3be1266891ac126fef7982e32ca4b21 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -6077,17 +6077,16 @@ ln -fs ../sbin/sendmail debian/tmp/usr/bin/runq
          <heading>Location</heading>
          <p>
            Any configuration files created or used by your package
-           must reside in <file>/etc</file>. If there are several you
-           should consider creating a subdirectory of <file>/etc</file>
+           must reside in <file>/etc</file>. If there are several,
+           consider creating a subdirectory of <file>/etc</file>
            named after your package.</p>
 
          <p>
            If your package creates or uses configuration files
            outside of <file>/etc</file>, and it is not feasible to modify
-           the package to use the <file>/etc</file>, you should still put
-           the files in <file>/etc</file> and create symbolic links to
-           those files from the location that the package
-           requires.</p>
+           the package to use <file>/etc</file> directly, put the files
+           in <file>/etc</file> and create symbolic links to those files
+           from the location that the package requires.</p>
        </sect1>
 
        <sect1>