From 09fab2442c2ab9a503841d3dcd56b3c0c3efb502 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 9 Apr 2009 04:36:34 +0200 Subject: * apt-pkg/contrib/strutl.cc: - fix TimeToStr i18n (LP: #289807) * [ABI break] merge support for http redirects, thanks to Jeff Licquia and Anthony Towns * [ABI break] use int for the package IDs (thanks to Steve Cotton) * apt-pkg/pkgcache.cc: - do not run "dpkg --configure pkg" if pkg is in trigger-awaited state (LP: #322955) * methods/https.cc: - add Acquire::https::AllowRedirect support * Clarify the --help for 'purge' (LP: #243948) * cmdline/apt-get.cc - fix "apt-get source pkg" if there is a binary package and a source package of the same name but from different packages (LP: #330103) * cmdline/acqprogress.cc: - Call pkgAcquireStatus::Pulse even if quiet, so that we still get dlstatus messages on the status-fd (LP: #290234). --- doc/examples/configure-index | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/examples/configure-index b/doc/examples/configure-index index db07f189e..5f29a2d3f 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -133,7 +133,8 @@ Acquire Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting Timeout "120"; Pipeline-Depth "5"; - + AllowRedirect "true"; + // Cache Control. Note these do not work with Squid 2.0.2 No-Cache "false"; Max-Age "86400"; // 1 Day age on index files @@ -150,7 +151,8 @@ Acquire Verify-Peer "false"; SslCert "/etc/apt/some.pem"; CaPath "/etc/ssl/certs"; - Verify-Host" "2"; + Verify-Host" "true"; + AllowRedirect "true"; }; ftp -- cgit v1.2.3-70-g09d2 From 26356e000d19b9e39bf6194778225eb1bccc8012 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 22 Apr 2009 10:15:08 +0200 Subject: Fix typo in French translation --- debian/changelog | 8 ++++++++ doc/fr/apt-get.fr.8.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index 58fa99d7a..f4c013146 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.22) UNRELEASED; urgency=low + + * Documentation translations: + - Fix a typo in apt-get(8 French translation. Closes: #525043 + Thanks to Guillaume Delacour for spotting it. + + -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 + apt (0.7.21) unstable; urgency=low [ Christian Perrier ] diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml index dccf415b1..c1b8552cb 100644 --- a/doc/fr/apt-get.fr.8.xml +++ b/doc/fr/apt-get.fr.8.xml @@ -201,7 +201,7 @@ semblables Avec la commande build-dep, apt-get installe ou supprime des paquets dans le but de satisfaire les dépendances de construction d'un paquet source. -Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au +Pour l'instant, dans le cas d'un paquet virtuel, un paquet est choisi au hasard. -- cgit v1.2.3-70-g09d2