Document in deb-control.5 that the control file can have '#'-style

comments. Closes: #406481

diff --git a/debian/changelog b/debian/changelog
index e74c7ca19605b6fe7eed16879d6403ef32145197..d9310ce28bada9dc498fb2d8ee1123aa9a0daf34 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ dpkg (1.14.3) UNRELEASED; urgency=low
     file. Add missing commas. Thanks to Kurt B. Kaiser. Closes: #397737
   * Disambiguate in install-info.8 the use of 'Info directory' with
     'Info dir file'. Closes: #420766
+  * Document in deb-control.5 that the control file can have '#'-style
+    comments. Closes: #406481
 
   [ Updated dpkg-dev translations ]
   * French (Frédéric Bothamy). Closes: #423392

diff --git a/man/ChangeLog b/man/ChangeLog
index 755b991d1598d420c568d7e71691f2517006c973..359d85597eec27c051dc34ceb77da9ca73d899d5 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-15  Guillem Jover  <guillem@debian.org>
+
+       * deb-control.5: Document comments in the control file.
+
 2007-05-15  Guillem Jover  <guillem@debian.org>
 
        * install-info.8: Disambiguate the use of 'Info directory' with 'Info

diff --git a/man/deb-control.5 b/man/deb-control.5
index d11d7bf9a91ebee1ccae4ffea42f624dbf5d1e66..41613932d41fbccc4b3234fce9938aa7b099407e 100644 (file)
--- a/man/deb-control.5
+++ b/man/deb-control.5
@@ -1,6 +1,6 @@
 .\" Author: Raul Miller
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
-.TH deb\-control 5 "2006-02-28" "Debian Project" "Debian"
+.TH deb\-control 5 "2007-05-15" "Debian Project" "Debian"
 .SH NAME
 deb\-control \- Debian packages' master control file format
 .
@@ -9,7 +9,8 @@ control
 .
 .SH DESCRIPTION
 Each Debian package contains the master `control' file, which contains
-a number of fields. Each field begins with a tag, such as
+a number of fields, or comments when the line starts with \fB'#'\fP. Each
+field begins with a tag, such as
 .B Package
 or
 .B Version
@@ -179,6 +180,7 @@ fields.
 .SH EXAMPLE
 .\" .RS
 .nf
+# Comment
 Package: grep
 Essential: yes
 Priority: required