merged -r1887..1901 from lp:~donkult/apt/sid

13 files changed, 69 insertions, 34 deletions

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index c61d00e47..538de3c27 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -151,7 +151,7 @@ Reverse Provides:
    
        <listitem><para><literal>Missing</literal> is the number of package names that were referenced in
        a dependency but were not provided by any package. Missing packages may 
-       be in evidence if a full distribution is not accessed, or if a package
+       be an evidence if a full distribution is not accessed, or if a package
        (real or virtual) has been dropped from the distribution. Usually they
        are referenced from Conflicts or Breaks statements.</para>
        </listitem>
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index 77b837022..9f8a4056d 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -60,7 +60,7 @@
      <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term>
      <listitem><para>
      Temporary directory in which to write extracted debconf template files
-     and config scripts
+     and config scripts.
      Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
      </varlistentry>
 
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 334cc85da..d4d77c68e 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -158,7 +158,7 @@
      <para>
      The <literal>Dir</literal> section defines the standard directories needed to 
      locate the files required during the generation process. These 
-     directories are prepended to certain relative paths defined in later 
+     directories are prepended certain relative paths defined in later 
      sections to produce a complete an absolute path.</para>
      <variablelist>     
       <varlistentry><term>ArchiveDir</term>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 4735dcd34..d3c3772bd 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -263,7 +263,7 @@
      you will properly get another (newer, older or none) source version than
      the one you have installed or could install.</para>
 
-     <para>If the <option>--compile</option> options is specified
+     <para>If the <option>--compile</option> option is specified
      then the package will be compiled to a binary .deb using
      <command>dpkg-buildpackage</command>, if <option>--download-only</option>
      is specified then the source package will not be unpacked.</para>
@@ -391,7 +391,7 @@
 
      <para>Simulate prints out
      a series of lines each one representing a dpkg operation, Configure (Conf),
-     Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
+     Remove (Remv), Unpack (Inst). Square brackets indicate broken packages
      and empty set of square brackets meaning breaks that are of no consequence
      (rare).</para></listitem>
      </varlistentry>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 20f473f77..908fc342f 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -68,7 +68,7 @@
    different steps. <command>apt-secure</command> is the last step in
    this chain, trusting an archive does not mean that the packages
    that you trust it do not contain malicious code but means that you
-   trust the archive maintainer. Its the archive maintainer
+   trust the archive maintainer. It's the archive maintainer
    responsibility to ensure that the archive integrity is correct.
    </para>
 
@@ -94,7 +94,7 @@
    is computed and put in the Packages file. The MD5 sum of all of the
    packages files are then computed and put into the Release file. The
    Release file is then signed by the archive key (which is created
-   once a year and distributed through the FTP server. This key is
+   once a year) and distributed through the FTP server. This key is
    also on the Debian keyring.
    </para>
 
@@ -157,15 +157,15 @@
    </para>
 
      <itemizedlist>
-       <listitem><para><literal>Create a toplevel Release
-       file</literal>.  if it does not exist already. You can do this
+       <listitem><para><emphasis>Create a toplevel Release
+       file</emphasis>,  if it does not exist already. You can do this
        by running <command>apt-ftparchive release</command> 
        (provided in apt-utils).</para></listitem>
    
-      <listitem><para><literal>Sign it</literal>. You can do this by running
+      <listitem><para><emphasis>Sign it</emphasis>. You can do this by running
       <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
 
-      <listitem><para><literal>Publish the key fingerprint</literal>,
+      <listitem><para><emphasis>Publish the key fingerprint</emphasis>,
       that way your users will know what key they need to import in
       order to authenticate the files in the
       archive.</para></listitem>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 0cd63b31c..e2db9defb 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -48,9 +48,9 @@
    loading even more config files.</para>
 
    <para>The configuration file is organized in a tree with options organized into
-   functional groups. option specification is given with a double colon
+   functional groups. Option specification is given with a double colon
    notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within 
-   the APT tool group, for the Get tool. options do not inherit from their 
+   the APT tool group, for the Get tool. Options do not inherit from their 
    parent groups.</para> 
 
    <para>Syntactically the configuration language is modeled after what the ISC tools
@@ -58,7 +58,7 @@
    <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 
+   <literal>APT::Get::Assume-Yes "true";</literal>. The trailing 
    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
@@ -158,7 +158,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <varlistentry><term>Immediate-Configure</term>
      <listitem><para>Defaults to on which will cause APT to install essential and important packages
      as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing
-     &dpkg; call: If this option is disabled APT doesn't treat an important package in the same way as
+     &dpkg; call: If this option is disabled APT does treat an important package in the same way as
      an extra package: Between the unpacking of the important package A and his configuration can then
      be many other unpack or configuration calls, e.g. for package B which has no relation to A, but
      causes the dpkg call to fail (e.g. because maintainer script of package B generates an error) which results
@@ -170,8 +170,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      refers to this option so the user can deactivate the immediate configuration temporary to be able to perform
      an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now
      in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package
-     in question, so you should not blindly disable this option as the mentioned scenario above is not the only
-     problem immediate configuration can help to prevent in the first place.</para></listitem>
+     in question or by a system in an already broken state, so you should not blindly disable this option as
+     the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place.
+     Before a big operation like <literal>dist-upgrade</literal> is run with this option disabled it should be tried to
+     explicitly <literal>install</literal> the package APT is unable to configure immediately, but please make sure to
+     report your problem also to your distribution and to the APT team with the buglink below so they can work on
+     improving or correcting the upgrade process.</para></listitem>
      </varlistentry>
 
      <varlistentry><term>Force-LoopBreak</term>
@@ -261,7 +265,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      this applies to all things including connection timeout and data timeout.</para>
 
      <para>One setting is provided to control the pipeline depth in cases where the
-     remote server is not RFC conforming or buggy (such as Squid 2.0.2)
+     remote server is not RFC conforming or buggy (such as Squid 2.0.2).
      <literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 
      indicating how many outstanding requests APT should send. A value of
      zero MUST be specified if the remote host does not properly linger
@@ -532,9 +536,9 @@ DPkg::TriggersPending "true";</literallayout></para>
 
      <variablelist>
        <varlistentry><term>DPkg::NoTriggers</term>
-       <listitem><para>Add the no triggers flag to all dpkg calls (expect the ConfigurePending call).
+       <listitem><para>Add the no triggers flag to all dpkg calls (except the ConfigurePending call).
        See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the
-       triggers then this flag is present unless it is explicit called to do so in an extra call.
+       triggers when this flag is present unless it is explicitly called to do so in an extra call.
        Note that this option exists (undocumented) also in older apt versions with a slightly different
        meaning: Previously these option only append --no-triggers to the configure calls to dpkg -
        now apt will add these flag also to the unpack and remove calls.</para></listitem>
@@ -545,8 +549,8 @@ DPkg::TriggersPending "true";</literallayout></para>
        The "<literal>smart</literal>" way is it to configure only packages which need to be configured before
        another package can be unpacked (Pre-Depends) and let the rest configure by dpkg with a call generated
        by the next option. "<literal>no</literal>" on the other hand will not configure anything and totally
-       relay on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered).
-       Setting this option to another than the all value will implicit activate also the next option per
+       rely on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered).
+       Setting this option to another than the all value will implicitly activate also the next option per
        default as otherwise the system could end in an unconfigured status which could be unbootable!
        </para></listitem>
        </varlistentry>
@@ -554,7 +558,7 @@ DPkg::TriggersPending "true";</literallayout></para>
        <listitem><para>If this option is set apt will call <command>dpkg --configure --pending</command>
        to let dpkg handle all required configurations and triggers. This option is activated automatic
        per default if the previous option is not set to <literal>all</literal>, but deactivating could be useful
-       if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you could
+       if you want to run APT multiple times in a row - e.g. in an installer. In these sceneries you could
        deactivate this option in all but the last run.</para></listitem>
        </varlistentry>
        <varlistentry><term>DPkg::TriggersPending</term>
diff --git a/doc/apt.ent b/doc/apt.ent
index 9a4c17bcd..0b341ec14 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -78,7 +78,7 @@
 
 <!ENTITY dpkg "<citerefentry>
     <refentrytitle><command>dpkg</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 
@@ -96,19 +96,19 @@
 
 <!ENTITY dpkg-scanpackages "<citerefentry>
     <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 
 <!ENTITY dpkg-scansources "<citerefentry>
     <refentrytitle><command>dpkg-scansources</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 
 <!ENTITY dselect "<citerefentry>
     <refentrytitle><command>dselect</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 
diff --git a/doc/de/addendum/debiandoc_de.add b/doc/de/addendum/debiandoc_de.add
new file mode 100644
index 000000000..2332878a6
--- /dev/null
+++ b/doc/de/addendum/debiandoc_de.add
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>Übersetzung</title>
+   <para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
+   in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
+ </refsect1>
+
diff --git a/doc/de/addendum/xml_de.add b/doc/de/addendum/xml_de.add
new file mode 100644
index 000000000..2332878a6
--- /dev/null
+++ b/doc/de/addendum/xml_de.add
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>Übersetzung</title>
+   <para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
+   in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
+ </refsect1>
+
diff --git a/doc/de/makefile b/doc/de/makefile
new file mode 100644
index 000000000..a827a0f24
--- /dev/null
+++ b/doc/de/makefile
@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=doc/de
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+# Language Code of this translation
+LC=de
+
+include $(PO4A_MANPAGE_H)
diff --git a/doc/ja/manpage.links b/doc/ja/manpage.links
deleted file mode 100644
index e69de29bb..000000000
--- a/doc/ja/manpage.links
+++ /dev/null
diff --git a/doc/makefile b/doc/makefile
index fe53aba48..26ca52a9e 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -43,6 +43,14 @@ veryclean-subdirs:
 	for dir in $(SUBDIRS); do\
 		$(MAKE) -C $$dir veryclean; \
 	done
+	# FIXME remove created sgml files, but preserve all
+	# which are "left over" from older systems.
+	# After completing the transition this should be handled
+	# in the po4a-manpage makefile for all translations
+	for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/debiandoc*))); do\
+		rm -f $$dir/offline.$$dir.sgml; \
+		rm -f $$dir/guide.$$dir.sgml; \
+	done
 
 ifdef PO4A
 doc: po4a
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 379112c83..0f788aca1 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -34,13 +34,13 @@
    <para>The package resource list is used to locate archives of the package
    distribution system in use on the system. At this time, this manual page
    documents only the packaging system used by the Debian GNU/Linux system.
-   This control file is located in <filename>/etc/apt/sources.list</filename></para>
+   This control file is <filename>/etc/apt/sources.list</filename>.</para>
 
    <para>The source list is designed to support any number of active sources and a
    variety of source media. The file lists one source per line, with the
    most preferred source listed first. The format of each line is:
    <literal>type uri args</literal> The first item, <literal>type</literal>
-   determines the format for <literal>args</literal> <literal>uri</literal> is
+   determines the format for <literal>args</literal>. <literal>uri</literal> is
    a Universal Resource Identifier 
    (URI), which is a superset of the more specific and well-known Universal
    Resource Locator, or URL. The rest of the line can be marked as a comment 
@@ -64,14 +64,14 @@
    <literal>stable</literal> <literal>unstable</literal> or 
    <literal>testing</literal> while component is one of <literal>main</literal> 
    <literal>contrib</literal> <literal>non-free</literal> or
-   <literal>non-us</literal> The 
+   <literal>non-us</literal>. The 
    <literal>deb-src</literal> type describes a debian distribution's source
    code in the same form as the <literal>deb</literal> type.
    A <literal>deb-src</literal> line is required to fetch source indexes.</para>
 
 
    <para>The format for a <filename>sources.list</filename> entry using the
-   <literal>deb</literal> and <literal>deb-src</literal> types are:</para>
+   <literal>deb</literal> and <literal>deb-src</literal> types is:</para>
 
    <literallayout>deb uri distribution [component1] [component2] [...]</literallayout>
 
@@ -79,7 +79,7 @@
    Debian distribution, from which APT will find the information it needs. 
    <literal>distribution</literal> can specify an exact path, in which case the 
    components must be omitted and <literal>distribution</literal> must end with
-   a slash (/). This is useful for when only a particular sub-section of the 
+   a slash (/). This is useful for when the case only a particular sub-section of the 
    archive denoted by the URI is of interest.
    If <literal>distribution</literal> does not specify an exact path, at least
    one <literal>component</literal> must be present.</para>
@@ -143,7 +143,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
     http://server:port/, the proxy server specified in
     <envar>http_proxy</envar> will be used. Users of authenticated
     HTTP/1.1 proxies may use a string of the format
-    http://user:pass@server:port/
+    http://user:pass@server:port/.
     Note that this is an insecure method of authentication.</para></listitem>
     </varlistentry>
 
@@ -211,7 +211,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian
    directory, and uses only the unstable/contrib area. If this line appears as
-   well as the one in the previous example in <filename>sources.list</filename>.
+   well as the one in the previous example in <filename>sources.list</filename>
    a single FTP session will be used for both resource lines.</para>
    <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>