* merged documentation patch (debian #307756)

diff --git a/debian/changelog b/debian/changelog
index c439f0df5184c847ad82eff91b0c3634841d5f05..00b46eb22b7023fa1ab2676ed794ae22f0c75d53 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ apt (0.6.44) unstable; urgency=low
       patch) Closes: #350025
   * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
        * bg.po: Added, complete to 512t. Closes: #360262
+  * doc/apt-ftparchive.1.xml:
+    - fix documentation for "SrcPackages" -> "Sources" 
+      (thanks to Bart Martens for the patch, closes: #307756)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 25 Apr 2006 09:34:20 +0200
 

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 7c1ae9432e6d1dac422cbc9abc2b7ccf5df80b5b..8cfbc72e917c7f8e7aac6c38b3add6463db64f9c 100644 (file)
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -407,10 +407,10 @@ for i in Sections do
       Sets the Packages file output.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>SrcPackages</term>
+      <varlistentry><term>Sources</term>
       <listitem><para>
       Sets the Sources file output. At least one of
-      <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+      <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem>
       </varlistentry>
       
       <varlistentry><term>Contents</term>

diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index 657ec5440c6517bf13d3dfd05727fc7ea5d0bbf2..c9d352ab6afbb035f37fe168b430dd9d1c3b0524 100644 (file)
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -20,21 +20,21 @@ Default {
 // Contents file for these in the main section of the sid release
 BinDirectory "pool/main" {
        Packages "dists/sid/main/binary-i386/Packages";
-       SrcPackages "dists/sid/main/source/Sources";
+       Sources "dists/sid/main/source/Sources";
        Contents "dists/sid/Contents-i386";
 }
 
 // This is the same for the contrib section
 BinDirectory "pool/contrib" {
        Packages "dists/sid/contrib/binary-i386/Packages";
-       SrcPackages "dists/sid/contrib/source/Sources";
+       Sources "dists/sid/contrib/source/Sources";
        Contents "dists/sid/Contents-i386";
 }
 
 // This is the same for the non-free section
 BinDirectory "pool/non-free" {
        Packages "dists/sid/non-free/binary-i386/Packages";
-       SrcPackages "dists/sid/non-free/source/Sources";
+       Sources "dists/sid/non-free/source/Sources";
        Contents "dists/sid/Contents-i386";
 };
 

diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml
index 61cdfa2ec9e6158602e9ebeb7d08285708b8e99d..9ae6506fc01ed8fb47b8bffbdca2dd8eeeac8022 100644 (file)
--- a/doc/fr/apt-ftparchive.fr.1.xml
+++ b/doc/fr/apt-ftparchive.fr.1.xml
@@ -451,10 +451,10 @@ Indique le fichier 
       </para></listitem>
 </varlistentry>
 
-<varlistentry><term>SrcPackages</term>
+<varlistentry><term>Sources</term>
 <listitem><para>
 Indique le fichier «&nbsp;Sources&nbsp;» créé. L'un des deux fichiers, 
-<literal>Packages</literal> ou <literal>SrcPackages</literal> est nécessaire.
+<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire.
       </para></listitem>
 </varlistentry>
 
@@ -628,4 +628,4 @@ d
 &manbugs;
 &traducteur;
 
-</refentry>
\ No newline at end of file
+</refentry>