X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debconf_spec%2Fdebconf_specification.xml;h=638688a25349ab84fa449b5f6cc84470494e7509;hb=bce4b938b4e603a7bceeaf2ad31d007d0a9dcb43;hp=ff762324aab578f7b86076c1ec748f12f227d0b9;hpb=026cef0ae2067ff969ac84f4f5cadec62afb11ea;p=debian%2Fdebian-policy.git

diff --git a/debconf_spec/debconf_specification.xml b/debconf_spec/debconf_specification.xml
index ff76232..638688a 100644
--- a/debconf_spec/debconf_specification.xml
+++ b/debconf_spec/debconf_specification.xml
@@ -5,54 +5,35 @@
 <!ENTITY command_list SYSTEM "include/commands.xml">
 <!ENTITY priority_table SYSTEM "include/priorities.xml">
 <!ENTITY type_table SYSTEM "include/types.xml">
+<!ENTITY % versiondata SYSTEM "include/version.xml"> %versiondata;
 ]>
 <article>
 
   <articleinfo>
     <title>Configuration management</title>
-    <subtitle>Protocol version 2</subtitle>
-    <releaseinfo>Revision 7.0</releaseinfo>
+    <subtitle>Protocol version 2.1</subtitle>
+    <releaseinfo>Revision 7.1, Debian Policy &version;, &date;</releaseinfo>
     <author>
-      <firstname>
-        Wichert
-      </firstname>
-      <surname>
-        Akkerman
-      </surname>
+      <firstname>Wichert</firstname>
+      <surname>Akkerman</surname>
       <affiliation>
-        <orgname>
-	  The Debian Project
-	</orgname>
+        <orgname>The Debian Project</orgname>
 	<address><email>wakkerma@debian.org</email></address>
       </affiliation>
     </author>
     <author>
-      <firstname>
-        Joey
-      </firstname>
-      <surname>
-        Hess
-      </surname>
+      <firstname>Joey</firstname>
+      <surname>Hess</surname>
       <affiliation>
-        <orgname>
-	  The Debian Project
-	</orgname>
+        <orgname>The Debian Project</orgname>
 	<address><email>joeyh@debian.org</email></address>
       </affiliation>
     </author>
     <copyright>
-      <year>
-        1998
-      </year>
-      <year>
-        1999
-      </year>
-      <year>
-        2000
-      </year>
-      <holder>
-        Wichert Akkerman and Joey Hess
-      </holder>
+      <year>1998</year>
+      <year>1999</year>
+      <year>2000</year>
+      <holder>Wichert Akkerman and Joey Hess</holder>
     </copyright>
     <legalnotice>
       <para>
@@ -139,8 +120,8 @@
 	So, what do we need to store in a variable template? Of course we
 	need a name to identify the template. Template names are made up of
 	components separated by the character `/' (slash).
-	Each component is limited to alphanumerics and `+' `-' `.'
-	(plus, minus, full stop).
+	Each component is limited to alphanumerics and `+' `-' `.' `_'
+	(plus, minus, full stop, underscore).
       </para>
       <para>
         A type is also needed so data can be verified. Here is a table
@@ -186,7 +167,7 @@ Description: domain for this computer
 	For localization, the description field (and also the choices
 	field of a select or multiselect type question, and the
 	default field of a string or password type question) can be
-	supplimented with versions for other languages. These are
+	supplemented with versions for other languages. These are
 	named <emphasis>Description-ll</emphasis>,
 	<emphasis>Description-ll_LL</emphasis>,
 	<emphasis>Description-ll_LL.encoding</emphasis> and so on.
@@ -280,7 +261,7 @@ Description: domain for this computer
       usually run <emphasis>before</emphasis> the preinst, and before
       the package is unpacked!
       <note>
-	<simpara>Plese see debconf-devel(8) for details.</simpara>
+	<simpara>Please see debconf-devel(7) for details.</simpara>
       </note>
       This is done to make sure that we can
       use the desired configuration in the preinst if necessary.