Merge branch 'master' into bug218897-rra

diff --git a/policy.sgml b/policy.sgml
index 2635fa8d42c47a136926f2093be741890dba8790..64a3de3c8ec584b1bf7d15bd4c4ae52b388955f6 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -1214,9 +1214,11 @@
        </p>
 
        <p>
-         You should not use <prgn>dpkg-divert</prgn> on a file
-         belonging to another package without consulting the
-         maintainer of that package first.
+         You should not use <prgn>dpkg-divert</prgn> on a file belonging
+         to another package without consulting the maintainer of that
+         package first.  When adding or removing diversions, package
+         maintainer scripts must provide the <tt>--package</tt> flag
+         to <prgn>dpkg-divert</prgn> and must not use <tt>--local</tt>.
        </p>
 
        <p>