summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2008-12-15 17:58:01 +0100
committerMichael Vogt <mvo@debian.org>2008-12-15 17:58:01 +0100
commitd1b14e80cc22908d65445c9eb3926ebb4be190e7 (patch)
tree681dc0b93c4025b63225976f388a4d73c057449f
parenta70c81475ae682d9b1f4d3ed76c1644f701bfca2 (diff)
parent7f1bc985dc0af4b953674f0e6702bada30f32a80 (diff)
Mentioned '/* ... */' comments. (Closes: #507601)
-rw-r--r--debian/changelog1
-rw-r--r--doc/apt.conf.5.xml7
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 144623c3f..90be66400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ apt (0.7.20) unstable; urgency=low
(Closes: #457265)
- Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
(Closes: #438559)
+ - Mentioned '/* ... */' comments. (Closes: #507601)
[ Michael Vogt ]
* make "apt-get build-dep" installed packages marked automatic
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 1835f2282..74966c5b3 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -21,7 +21,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>06 December 2008</date>
+ <date>10 December 2008</date>
</refentryinfo>
<refmeta>
@@ -53,8 +53,9 @@
parent groups.</para>
<para>Syntactically the configuration language is modeled after what the ISC tools
- such as bind and dhcp use. Lines starting with
- <literal>//</literal> are treated as comments (ignored).
+ such as bind and dhcp use. Lines starting with
+ <literal>//</literal> are treated as comments (ignored), as well as all text
+ between <literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.
Each line is of the form
<literal>APT::Get::Assume-Yes "true";</literal> The trailing
semicolon is required and the quotes are optional. A new scope can be