doc/apt.conf.5.xml: Restrict option names to alphanumerical characters and "/-:._+".

diff --git a/debian/changelog b/debian/changelog
index 4f8b72a311de605baa3c6f349e2b0f2570a9e1d7..018b072d866dc106259cd8d0a8c1ea016fc12bb8 100644 (file)
--- 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).
   * 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
 
 
  -- 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 b1522a6142244620a61c380e9c184a996de21fc9..661f97ab1ca5ea30be265f2cb916c3c798eed093 100644 (file)
--- 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
    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 {
 
 <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 
      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>
      the cdrom block. It is important to have the trailing slash. Unmount 
      commands can be specified using UMount.</para></listitem>
      </varlistentry>