summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-07-03 18:33:31 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-07-03 18:33:31 +0200
commitb7952f4b67d7021dc912aed5f38bc45f03bfc064 (patch)
tree5d18c4268786a05df634be6dbf3a68a2d0f282b6 /doc
parentc833c7a16381c383588265bbb35ed24ad383b53f (diff)
parentc64d1644ae0fd1af92c80a91a6c17b57f0b8f313 (diff)
* merged with apts mainline
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-ftparchive.1.xml4
-rw-r--r--doc/examples/apt-ftparchive.conf6
-rw-r--r--doc/examples/configure-index1
-rw-r--r--doc/fr/apt-ftparchive.fr.1.xml6
-rw-r--r--doc/sources.list.5.xml2
5 files changed, 10 insertions, 9 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 7c1ae9432..8cfbc72e9 100644
--- 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 657ec5440..c9d352ab6 100644
--- 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/examples/configure-index b/doc/examples/configure-index
index 9e851d753..b87e85030 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -244,6 +244,7 @@ DPkg
Debug
{
pkgProblemResolver "false";
+ pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
pkgAcquire "false";
pkgAcquire::Worker "false";
pkgDPkgPM "false";
diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml
index 61cdfa2ec..9ae6506fc 100644
--- a/doc/fr/apt-ftparchive.fr.1.xml
+++ b/doc/fr/apt-ftparchive.fr.1.xml
@@ -451,10 +451,10 @@ Indique le fichier �&nbsp;Packages&nbsp;� cr��.
</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�cimal 100 en cas d'erreur.
&manbugs;
&traducteur;
-</refentry> \ No newline at end of file
+</refentry>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9762005b0..e47418b27 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -204,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<para>Uses HTTP to access the archive at nonus.debian.org, under the
debian-non-US directory, and uses only files found under
- <filename>unstable/binary-i3866</filename> on i386 machines,
+ <filename>unstable/binary-i386</filename> on i386 machines,
<filename>unstable/binary-m68k</filename> on m68k, and so
forth for other supported architectures. [Note this example only
illustrates how to use the substitution variable; non-us is no longer