summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--doc/apt.conf.5.sgml3
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index afa7a94d2..bc42bf7fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.5.13) unstable; urgency=low
+
+ * Document configuration file comment syntax in apt.conf(5)
+ (Closes: #211262)
+
+ --
+
apt (0.5.12) unstable; urgency=low
* Exclude subdirectories named 'debian-installer' from the apt-cdrom
diff --git a/doc/apt.conf.5.sgml b/doc/apt.conf.5.sgml
index 73524f602..2f04c892c 100644
--- a/doc/apt.conf.5.sgml
+++ b/doc/apt.conf.5.sgml
@@ -39,7 +39,8 @@
parent groups.
<para>
Syntacticly the configuration language is modeled after what the ISC tools
- such as bind and dhcp use. Each line is of the form
+ such as bind and dhcp use. Lines starting with
+ <literal>//</literal> are treated as comments (ignored). Each line is of the form
<literallayout>APT::Get::Assume-Yes "true";</literallayout> The trailing
semicolon is required and the quotes are optional. A new scope can be
opened with curly braces, like: