Procházet zdrojové kódy

try to be cristal clear about the usage of :: and {} (Closes: #503481)

See the bugreport (and merged ones) for discussion details which
lead to these additions to the introduction of the apt.conf manpage.
David Kalnischkies před 17 roky
rodič
revize
63fc55509f
5 změnil soubory, kde provedl 919 přidání a 697 odebrání
  1. 1 0
      debian/changelog
  2. 26 3
      doc/apt.conf.5.xml
  3. 285 229
      doc/po/apt-doc.pot
  4. 303 232
      doc/po/fr.po
  5. 304 233
      doc/po/ja.po

+ 1 - 0
debian/changelog

@@ -29,6 +29,7 @@ apt (0.7.24) UNRELEASED; urgency=low
       a bit and improve the documentation for this option group.
   * doc/apt.conf.5.xml:
     - document the Acquire::http::Dl-Limit option
+    - try to be cristal clear about the usage of :: and {} (Closes: #503481)
   * doc/apt-cache.8.xml:
     - clarify the note for the pkgnames command (Closes: #547599)
   * doc/apt.ent, all man pages:

+ 26 - 3
doc/apt.conf.5.xml

@@ -86,17 +86,40 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    <para>The names of the configuration items are not case-sensitive. So in the previous example
    you could use <literal>dpkg::pre-install-pkgs</literal>.</para>
 
-   <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal> 
+   <para>Names for the configuration items are optional if a list is defined as it can be see in
+   the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If you don't specify a name a
+   new entry will simply add a new option to the list. If you specify a name you can override
+   the option as every other option by reassigning a new value to the option.</para>
+
+   <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal>:
    <literal>#include</literal> will include the given file, unless the filename
    ends in a slash, then the whole directory is included.  
    <literal>#clear</literal> is used to erase a part of the configuration tree. The
-   specified element and all its descendants are erased.</para>
+   specified element and all its descendants are erased.
+   (Note that these lines also need to end with a semicolon.)</para>
+
+   <para>The #clear command is the only way to delete a list or a complete scope.
+   Reopening a scope or the ::-style described below will <emphasis>not</emphasis>
+   override previewsly written entries. Only options can be overridden by adressing a new
+   value to it - lists and scopes can't be overridden, only cleared.</para>
 
    <para>All of the APT tools take a -o option which allows an arbitrary configuration 
    directive to be specified on the command line. The syntax is a full option
    name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals
    sign then the new value of the option. Lists can be appended too by adding 
-   a trailing :: to the list name.</para>
+   a trailing :: to the list name. (As you might suspect: The scope syntax can't be used
+   on the commandline.)</para>
+
+   <para>Note that you can use :: only for appending one item per line to a list and
+   that you should not use it in combination with the scope syntax.
+   (The scope syntax implicit insert ::) Using both syntaxes together will trigger a bug
+   which some users unfortunately relay on: An option with the unusual name "<literal>::</literal>"
+   which acts like every other option with a name. These introduces many problems
+   including that a user who writes multiple lines in this <emphasis>wrong</emphasis> syntax in
+   the hope to append to a list will gain the opposite as only the last assignment for this option
+   "<literal>::</literal>" will be used. Upcoming APT versions will raise errors and
+   will stop working if they encounter this misuse, so please correct such statements now
+   as long as APT doesn't complain explicit about them.</para>
  </refsect1>
 
  <refsect1><title>The APT Group</title>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 285 - 229
doc/po/apt-doc.pot


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 303 - 232
doc/po/fr.po


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 304 - 233
doc/po/ja.po