diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-cache.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 2 | ||||
| -rw-r--r-- | doc/examples/configure-index | 6 | ||||
| -rw-r--r-- | doc/examples/sources.list | 13 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 7 |
5 files changed, 22 insertions, 8 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 34749fd77..0e1d2f8d9 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -214,7 +214,7 @@ Reverse Provides: </varlistentry> <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term> - <listitem><para><literal>rdepends</literal>shows a listing of each reverse dependency a + <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a package has.</para></listitem> </varlistentry> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 12b03196a..3e50bef8c 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -183,7 +183,7 @@ belonging to any distribution whose Archive name is "<literal>unstable</literal> <programlisting> Package: * Pin: release a=unstable -Pin-Priority: 500 +Pin-Priority: 50 </programlisting> <simpara>The following record assigns a high priority to all package versions diff --git a/doc/examples/configure-index b/doc/examples/configure-index index dee0c06ff..9e851d753 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -72,6 +72,11 @@ APT NoAct "false"; }; + Authentication + { + TrustCDROM "false"; // consider the CDROM always trusted + }; + GPGV { TrustedKeyring "/etc/apt/trusted.gpg"; @@ -112,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/examples/sources.list b/doc/examples/sources.list index 9f2343277..a958899ae 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -1,10 +1,11 @@ # See sources.list(5) for more information, especialy # Remember that you can only use http, ftp or file URIs # CDROMs are managed through the apt-cdrom tool. -deb http://http.us.debian.org/debian stable main contrib non-free -deb http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free -deb http://security.debian.org stable/updates main contrib non-free +deb http://us.archive.ubuntu.com/ubuntu dapper main restricted +deb-src http://us.archive.ubuntu.com/ubuntu dapper main restricted -# Uncomment if you want the apt-get source function to work -#deb-src http://http.us.debian.org/debian stable main contrib non-free -#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free +deb http://security.ubuntu.com/ubuntu dapper-security main restricted +deb-src http://security.ubuntu.com/ubuntu dapper-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted 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, |