* Add missing comma and space to German translation of ...

[apt.git] / doc / apt.conf.5.sgml

diff --git a/doc/apt.conf.5.sgml b/doc/apt.conf.5.sgml
index 5f48effa49ac3f3b45c0fdf87c1dc7a62f4d4068..2f04c892ca25be78c8886599913184ffaf84d82a 100644 (file)
--- a/doc/apt.conf.5.sgml
+++ b/doc/apt.conf.5.sgml
@@ -21,7 +21,7 @@
  </refnamediv>
  
  <RefSect1><Title>Description</>
-   <para>   
+   <para>
    <filename/apt.conf/ is the main configuration file for the APT suite of
    tools, all tools make use of the configuration file and a common command line
    parser to provide a uniform environment. When an APT tool starts up it will
@@ -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:
@@ -53,13 +54,13 @@ APT {
 </programlisting></informalexample>
    with newlines placed to make it more readable. Lists can be created by 
    opening a scope and including a single word enclosed in quotes followed by a 
-   semicolon. Multiple entries can be included, each seperated by a semicolon.
+   semicolon. Multiple entries can be included, each separated by a semicolon.
 <informalexample><programlisting>   
 DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 </programlisting></informalexample>
    <para>
    In general the sample configuration file in 
-   <filename>&docdir;/examples/apt.conf</> &configureindex;
+   <filename>&docdir;examples/apt.conf</> &configureindex;
    is a good guide for how it should look.
    <para>
    Two specials are allowed, <literal/#include/ and <literal/#clear/. 
@@ -67,7 +68,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    ends in a slash, then the whole directory is included.  
    <literal/#clear/ is used to erase a list of names.
    <para>
-   All of the APT tools take a -o option which allows an arbitary configuration 
+   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/ for instance) followed by an equals
    sign then the new value of the option. Lists can be appended too by adding 
@@ -95,7 +96,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 
      <VarListEntry><Term>Clean-Installed</Term>
      <ListItem><Para>
-     Defaults to on. When turned on the autoclean feature will remove any pacakge
+     Defaults to on. When turned on the autoclean feature will remove any packages
      which can no longer be downloaded from the cache. If turned off then
      packages that are locally installed are also excluded from cleaning - but
      note that APT provides no direct means to reinstall them.
@@ -103,7 +104,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 
      <VarListEntry><Term>Immediate-Configure</Term>
      <ListItem><Para>
-     Disable Immedate Configuration; This dangerous option disables some
+     Disable Immediate Configuration; This dangerous option disables some
      of APT's ordering code to cause it to make fewer dpkg calls. Doing
      so may be necessary on some extremely slow single user systems but 
      is very dangerous and may cause package install scripts to fail or worse.
@@ -187,7 +188,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      meaning to use no proxies. The <envar/http_proxy/ environment variable
      will override all settings.
      <para>
-     Three settings are provided for cache control with HTTP/1.1 complient 
+     Three settings are provided for cache control with HTTP/1.1 compliant 
      proxy caches. <literal/No-Cache/ tells the proxy to not use its cached 
      response under any circumstances, <literal/Max-Age/ is sent only for 
      index files and tells the cache to refresh its object if it is older than 
@@ -213,7 +214,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <ListItem><Para>
      FTP URIs; ftp::Proxy is the default proxy server to use. It is in the 
      standard form of <literal>ftp://[[user][:pass]@]host[:port]/</> and is 
-     overriden by the <envar/ftp_proxy/ environment variable. To use a ftp 
+     overridden by the <envar/ftp_proxy/ environment variable. To use a ftp 
      proxy you will have to set the <literal/ftp::ProxyLogin/ script in the 
      configuration file. This entry specifies the commands to send to tell 
      the proxy server what to connect to. Please see 
@@ -287,7 +288,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    lexical order from the directory specified. After this is done then the
    main config file is loaded.
    <para>
-   Binary programs are pointed to by <literal/Dir::Bin/. <literal/methods/ 
+   Binary programs are pointed to by <literal/Dir::Bin/. <literal/Dir::Bin::Methods/ 
    specifies the location of the method handlers and <literal/gzip/, 
    <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/, 
    <literal/dpkg-buildpackage/ and <literal/apt-cache/ specify the location