summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 4f8b72a31..018b072d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ apt (0.7.25) UNRELEASED; urgency=low
* doc/apt.conf.5.xml:
- Deprecate unquoted values, string concatenation and explain what should
not be written inside a value (quotes,backslash).
+ - Restrict option names to alphanumerical characters and "/-:._+".
-- Julian Andres Klode <jak@debian.org> Sat, 26 Sep 2009 15:00:28 +0200
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index b1522a614..661f97ab1 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -62,8 +62,9 @@
semicolon and the quotes are required. The value must be on one line, and
there is no kind of string concatenation. It must not include inside quotes.
The behavior of the backslash "\" and escaped characters inside a value is
- undefined and it should not be used. A new scope can be opened with curly
- braces, like:</para>
+ undefined and it should not be used. An option name may include
+ alphanumerical characters and the "/-:._+" characters. A new scope can
+ be opened with curly braces, like:</para>
<informalexample><programlisting>
APT {
@@ -329,7 +330,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
as specified in <filename>/etc/fstab</filename>. It is possible to provide
alternate mount and unmount commands if your mount point cannot be listed
in the fstab (such as an SMB mount and old mount packages). The syntax
- is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within
+ is to put <literallayout>/cdrom/::Mount "foo";</literallayout> within
the cdrom block. It is important to have the trailing slash. Unmount
commands can be specified using UMount.</para></listitem>
</varlistentry>