Make wording about following the FHS less ambiguous

* Remove the ambiguous word "installed" when requiring that the location
  of files and directories follow the FHS.  (Closes: #638060)

diff --git a/debian/changelog b/debian/changelog
index 96eb8f9bbd5d28229f2689d9e72f826b571bf0af..9b82e5f94a35cf5cbf4f3e7cb5f3fed09f389f89 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ debian-policy (3.9.3.1) UNRELEASED; urgency=low
   * Suggest checkbashisms from devscripts or the posh shell for checking
     whether /bin/sh scripts are Policy-compliant rather than recommending
     dash.  Thanks, Raphael Geissert.  (Closes: #490604)
+  * Remove the ambiguous word "installed" when requiring that the location
+    of files and directories follow the FHS.  (Closes: #638060)
   * Install the HTML version of upgrading-checklist in the policy.html
     directory as upgrading-checklist.html so that it can be deployed on
     www.debian.org in a way that will allow links to Policy sections to

diff --git a/policy.sgml b/policy.sgml
index 3fcae7589b112d313dd0576d4dcdb080b8a63c1a..0121da51069c18300781f282e9440ebc46b88f55 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -6169,11 +6169,11 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
          <heading>File System Structure</heading>
 
          <p>
-           The location of all installed files and directories must
-           comply with the Filesystem Hierarchy Standard (FHS),
-           version 2.3, with the exceptions noted below, and except
-           where doing so would violate other terms of Debian
-           Policy.  The following exceptions to the FHS apply:
+           The location of all files and directories must comply with the
+           Filesystem Hierarchy Standard (FHS), version 2.3, with the
+           exceptions noted below, and except where doing so would
+           violate other terms of Debian Policy.  The following
+           exceptions to the FHS apply:
 
             <enumlist>
               <item>