diff options
| author | Michael Vogt <mvo@debian.org> | 2005-11-28 09:54:54 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2005-11-28 09:54:54 +0000 |
| commit | b5d727a3d33a53d567b3e1fd79b32fc22faa407c (patch) | |
| tree | bb6998b6abce466972e78928bf1153b28ab979a9 /doc | |
| parent | bc7c97627e28be226e88ec8b2290b820985b802f (diff) | |
| parent | bac148a766ad6d280172b9faa99c9207fa49ba4b (diff) | |
* merged with apt--mvo and corrected conflicts in po/
Patches applied:
* apt@packages.debian.org/apt--sources-list-d--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-30
* apt@packages.debian.org/apt--sources-list-d--0--patch-1
Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d
* bubulle@debian.org--2005/apt--main--0--patch-130
Galician translation completed
* bubulle@debian.org--2005/apt--main--0--patch-131
Simplified Chinese translation update
* bubulle@debian.org--2005/apt--main--0--patch-132
Completed Simplified Chinese translation
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90
* merged the sources.list.d patch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93
* sources.list.d documented
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94
* pkgDirStream has (slightly) better extract support now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95
* merge fix for #339533
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97
* some more debug output
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98
* ABI change: merged more flexible pkgAcquireFile code
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99
* merged http download limit for apt (#146877)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100
* applied parts of the string speedup patch from debian #319377 (ABI change)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101
* fix for #340448
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102
* finalized this release
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/configure-index | 1 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a93b74349..9e851d753 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -117,6 +117,7 @@ Acquire No-Cache "false"; Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate }; ftp diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index bde9893bf..9762005b0 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -46,6 +46,13 @@ by using a #.</para> </refsect1> + <refsect1><title>sources.list.d</title> + <para>The <filename>/etc/apt/sources.list.d</filename> directory provides + a way to add sources.list entries in seperate files that end with + <literal>.list</literal>. The format is the same as for the regular + <filename>sources.list</filename> file. </para> + </refsect1> + <refsect1><title>The deb and deb-src types</title> <para>The <literal>deb</literal> type describes a typical two-level Debian archive, <filename>distribution/component</filename>. Typically, |