diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/apt-get.8.xml | 23 | ||||
-rw-r--r-- | doc/examples/configure-index | 98 | ||||
-rw-r--r-- | doc/examples/sources.list | 12 | ||||
-rw-r--r-- | doc/po/apt-doc.pot | 5 | ||||
-rw-r--r-- | doc/po/fr.po | 3 |
5 files changed, 86 insertions, 55 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 57306c03f..7eb87b452 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -278,6 +278,12 @@ for broken dependencies.</para></listitem> </varlistentry> + <varlistentry><term>download</term> + <listitem><para><literal>download</literal> will download the given + binary package into the current directoy. + </para></listitem> + </varlistentry> + <varlistentry><term>clean</term> <listitem><para><literal>clean</literal> clears out the local repository of retrieved package files. It removes everything but the lock file from @@ -302,6 +308,23 @@ <listitem><para><literal>autoremove</literal> is used to remove packages that were automatically installed to satisfy dependencies for some package and that are no more needed.</para></listitem> </varlistentry> + + <varlistentry><term>changelog</term> + <listitem><para><literal>changelog</literal> downloads a package changelog and displays + it through <command>sensible-pager</command>. The server name and base + directory is defined in the <literal>APT::Changelogs::Server</literal> + variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for + Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for + Ubuntu). + By default it displays the changelog for the version that is + installed. However, you can specify the same options as for + the <option>install</option> command. + </para> + </listitem> + </varlistentry> + + + </variablelist> </refsect1> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index c4c2acb64..b87251103 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -114,54 +114,62 @@ APT // does a ExecFork) Keep-Fds {}; + Changelogs + { + // server the provides the changelogs, the code will assume + // the changlogs are in the pool/ under a srcpkg_ver directory + // with the name "changelog" + Server "http://packages.debian.org/changelogs"; + }: + // control parameters for cron jobs by /etc/cron.daily/apt Periodic { - BackupArchiveInterval "0"; - // - Backup after n-days if archive contents changed.(0=disable) - - BackupLevel "3"; - // - Backup level.(0=disable), 1 is invalid. - - // APT::Archives::MaxAge "0"; (old, deprecated) - MaxAge "0"; // (new) - // - Set maximum allowed age of a cache package file. If a cache - // package file is older it is deleted (0=disable) - - // APT::Archives::MinAge "2"; (old, deprecated) - MinAge "2"; // (new) - // - Set minimum age of a package file. If a file is younger it - // will not be deleted (0=disable). Usefull to prevent races - // and to keep backups of the packages for emergency. - - // APT::Archives::MaxSize "0"; (old, deprecated) - MaxSize "0"; // (new) - // - Set maximum size of the cache in MB (0=disable). If the cache - // is bigger, cached package files are deleted until the size - // requirement is met (the biggest packages will be deleted - // first). - - Update-Package-Lists "0"; - // - Do "apt-get update" automatically every n-days (0=disable) - // - Download-Upgradeable-Packages "0"; - // - Do "apt-get upgrade --download-only" every n-days (0=disable) - // - Unattended-Upgrade "0"; - // - Run the "unattended-upgrade" security upgrade script - // every n-days (0=disabled) - // Requires the package "unattended-upgrades" and will write - // a log in /var/log/unattended-upgrades - // - AutocleanInterval "0"; - // - Do "apt-get autoclean" every n-days (0=disable) - - Verbose "0"; - // - Send report mail to root - // 0: no report (or null string) - // 1: progress report (actually any string) - // 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) - // 3: + trace on + BackupArchiveInterval "0"; + // - Backup after n-days if archive contents changed.(0=disable) + + BackupLevel "3"; + // - Backup level.(0=disable), 1 is invalid. + + // APT::Archives::MaxAge "0"; (old, deprecated) + MaxAge "0"; // (new) + // - Set maximum allowed age of a cache package file. If a cache + // package file is older it is deleted (0=disable) + + // APT::Archives::MinAge "2"; (old, deprecated) + MinAge "2"; // (new) + // - Set minimum age of a package file. If a file is younger it + // will not be deleted (0=disable). Usefull to prevent races + // and to keep backups of the packages for emergency. + + // APT::Archives::MaxSize "0"; (old, deprecated) + MaxSize "0"; // (new) + // - Set maximum size of the cache in MB (0=disable). If the cache + // is bigger, cached package files are deleted until the size + // requirement is met (the biggest packages will be deleted + // first). + + Update-Package-Lists "0"; + // - Do "apt-get update" automatically every n-days (0=disable) + // + Download-Upgradeable-Packages "0"; + // - Do "apt-get upgrade --download-only" every n-days (0=disable) + // + Unattended-Upgrade "0"; + // - Run the "unattended-upgrade" security upgrade script + // every n-days (0=disabled) + // Requires the package "unattended-upgrades" and will write + // a log in /var/log/unattended-upgrades + // + AutocleanInterval "0"; + // - Do "apt-get autoclean" every n-days (0=disable) + + Verbose "0"; + // - Send report mail to root + // 0: no report (or null string) + // 1: progress report (actually any string) + // 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) + // 3: + trace on }; }; diff --git a/doc/examples/sources.list b/doc/examples/sources.list index ef729e203..cc0fd2b8d 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -1,9 +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://security.debian.org stable/updates main contrib non-free +deb http://us.archive.ubuntu.com/ubuntu hardy main restricted +deb-src http://us.archive.ubuntu.com/ubuntu hardy 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://security.debian.org stable/updates main contrib non-free +deb http://security.ubuntu.com/ubuntu hardy-security main restricted +deb-src http://security.ubuntu.com/ubuntu hardy-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 6b3b1b01b..413cd8614 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -11,10 +11,9 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: ENCODING" #. type: TH #: apt.8:17 diff --git a/doc/po/fr.po b/doc/po/fr.po index 124ffe6e4..02bdf7646 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -601,7 +601,6 @@ msgstr "" " <listitem><para>Liste d'état des paquets installés automatiquement.\n" " Élément de configuration : <literal>Dir::State::extended_states</literal>.</para></listitem>\n" " </varlistentry>\n" -"\">\n" #. type: Plain text #: apt.ent:191 @@ -6650,7 +6649,7 @@ msgstr "" "La liste <literal>Ignore-Files-Silently</literal> permet d'indiquer quels " "sont les fichiers qu'APT peut ignorer sans avertissement dans les " "répertoires contenant des fragments de configuration. Par défaut, les " -"fichiers qui se terminent par <literal>.disabled</literal>, <literal>~</" +"fichiers qui se terminent par literal>.disabled</literal>, <literal>~</" "literal>, <literal>.bak</literal> ou <literal>.dpkg-[a-z]+</literal> sont " "ignorés. Comme cela est visible dans le dernier élément de cette liste, il " "est possible d'utiliser la syntaxe des expressions rationnelles." |