Merge branch 'master' into bug555977-rra

diff --git a/policy.sgml b/policy.sgml
index aa8951a09499caff7e12da3f6bae7743450b11af..15d2a95b417baf51ad57ce56fbf960b00a2c36f4 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -8102,6 +8102,12 @@ endscript
           </footnote>
        </p>
 
+       <p>
+         Control information files should be owned by <tt>root:root</tt>
+         and either mode 644 (for most files) or mode 755 (for
+         executables such as <qref id="maintscripts">maintainer
+         scripts</qref>).
+       </p>
 
        <p>
          Setuid and setgid executables should be mode 4755 or 2755