From: Russ Allbery <rra@debian.org>
Date: Sun, 3 Aug 2008 21:34:59 +0000 (-0700)
Subject: Clarify debconf translation requirement and capitalization
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=384440cf48def52710a14ad1c3bc6b9ec4a14f79;p=debian%2Fdebian-policy.git

Clarify debconf translation requirement and capitalization

Clarify that translation is only required for user-visible debconf
messages.  Capitalize "Debian Configuration Management Specification"
uniformly.  Thanks, Julian Andres Klode.  (Closes: #492624)
---

diff --git a/debian/changelog b/debian/changelog
index 46b64bb..5301371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ debian-policy (3.8.1.0) UNRELEASED; urgency=low
     Noritada.  (Closes: #487701)
   * Mention debugging packages as an explicit example of packages with
     extra priority.  Thanks, Charles Plessy.  (Closes: #491985)
+  * Clarify that translation is only required for user-visible debconf
+    messages.  Capitalize "Debian Configuration Management Specification"
+    uniformly.  Thanks, Julian Andres Klode.  (Closes: #492624)
 
  -- Russ Allbery <rra@debian.org>  Mon, 23 Jun 2008 19:23:50 -0700
 
diff --git a/policy.sgml b/policy.sgml
index cb43698..fa93e0f 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1206,8 +1206,8 @@
 	    Package maintainer scripts may prompt the user if
 	    necessary. Prompting should be done by communicating
 	    through a program, such as <prgn>debconf</prgn>, which
-	    conforms to the Debian Configuration management
-	    specification, version 2 or higher.  Prompting the user by
+	    conforms to the Debian Configuration Management
+	    Specification, version 2 or higher.  Prompting the user by
 	    other means, such as by hand<footnote>
                 From the Jargon file: by hand 2. By extension,
                 writing code which does something in an explicit or
@@ -1218,7 +1218,7 @@
 	  </p>
 
 	  <p>
-	    The Debian Configuration management specification is included
+	    The Debian Configuration Management Specification is included
 	    in the <file>debconf_specification</file> files in the
 	    <package>debian-policy</package> package.
 	    It is also available from the Debian web mirrors at
@@ -1227,8 +1227,8 @@
 	  </p>
 
 	  <p>
-	    Packages which use the Debian Configuration management
-	    specification may contain an additional
+	    Packages which use the Debian Configuration Management
+	    Specification may contain an additional
 	    <prgn>config</prgn> script and a <tt>templates</tt>
 	    file in their control archive<footnote>
 		The control.tar.gz inside the .deb.
@@ -1240,18 +1240,18 @@
 	    Therefore it must work using only the tools present in
 	    <em>essential</em> packages.<footnote>
 		  <package>Debconf</package> or another tool that
-		  implements the Debian Configuration management
-		  specification will also be installed, and any
+		  implements the Debian Configuration Management
+		  Specification will also be installed, and any
 		  versioned dependencies on it will be satisfied
 		  before preconfiguration begins.
 	    </footnote>
 	  </p>
 
 	  <p>
-	    Packages which use the Debian Configuration management
-	    specification must allow for translation of their messages
-	    by using a gettext-based system such as the one provided by
-	    the <package>po-debconf</package> package.
+	    Packages which use the Debian Configuration Management
+	    Specification must allow for translation of their user-visible
+	    messages by using a gettext-based system such as the one
+	    provided by the <package>po-debconf</package> package.
 	  </p>
 
 	  <p>