From efe9ba671b2acb4b7cddedeba2aefc0d4fea01d4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 28 Sep 2006 11:22:44 +0200
Subject: * doc/examples/configure-index:   - document the buildDeps debug
 option

---
 doc/examples/configure-index | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index f8abd75ed..0f0abc30c 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -251,6 +251,7 @@ Debug
   pkgDPkgPM "false";
   pkgDPkgProgressReporting "false";
   pkgOrderList "false";
+  BuildDeps "false";
   
   pkgInitialize "false";   // This one will dump the configuration space
   NoLocking "false";
-- 
cgit v1.2.3


From 8d82c1b2d0a5deb52804c9c9ddf8e636e188f2c7 Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Fri, 6 Oct 2006 23:57:13 +0200
Subject: Correct very bad wording in apt-get.8

---
 doc/fr/apt-get.fr.8.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml
index cfaa76c7d..dccf415b1 100644
--- a/doc/fr/apt-get.fr.8.xml
+++ b/doc/fr/apt-get.fr.8.xml
@@ -175,8 +175,8 @@ d'
 Avec la commande <literal>source</literal>, <command>apt-get</command> récupère des paquets
 sources. APT examine les paquets disponibles pour choisir le paquet source
 à récupérer. Il trouve ensuite et télécharge dans le répertoire courant
-la version la plus récente. Les paquets source sont suivis différemment que
-les paquets binaires, via les lignes de type <literal>deb-src</literal> dans le fichier
+la version la plus récente. Les paquets source sont gérés indépendamment
+des paquets binaires, via les lignes de type <literal>deb-src</literal> dans le fichier
 &sources-list;. On n'obtiendra probablement pas les mêmes sources que celles
 du paquet installé ou celles du paquet qu'on pourrait installer. Si l'option 
 <option>--compile</option> est spécifiée, le paquet est compilé en un binaire .deb 
-- 
cgit v1.2.3


From 75ece2c9fa9359a697b65f2e1dc2bbd85ae359aa Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Mon, 9 Oct 2006 06:58:05 +0200
Subject: Fix encoding of generated Japanese man pages. Closes: #361699

---
 doc/ja/style.ja.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl
index 4af2d74cf..c102f1366 100644
--- a/doc/ja/style.ja.xsl
+++ b/doc/ja/style.ja.xsl
@@ -4,6 +4,6 @@
 
 <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
 
-<xsl:param name="chunker.output.encoding" select="'EUC-JP'" />
+<xsl:param name="man.output.encoding" select="'EUC-JP'" />
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
-- 
cgit v1.2.3


From b23f91ebeef9bf7730d5d4bd920d5bf24c50910e Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Mon, 9 Oct 2006 07:01:40 +0200
Subject: Fix encoding of generated French manpages

---
 doc/fr/makefile     | 2 +-
 doc/fr/style.fr.xsl | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 doc/fr/style.fr.xsl

(limited to 'doc')

diff --git a/doc/fr/makefile b/doc/fr/makefile
index 596de7b09..c650dc03a 100644
--- a/doc/fr/makefile
+++ b/doc/fr/makefile
@@ -7,7 +7,7 @@ include ../../buildlib/defaults.mak
 
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 XSLTPROC=/usr/bin/xsltproc
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
+STYLESHEET=./style.fr.xsl
 
 
 # Man pages
diff --git a/doc/fr/style.fr.xsl b/doc/fr/style.fr.xsl
new file mode 100644
index 000000000..11593bb42
--- /dev/null
+++ b/doc/fr/style.fr.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
+
+<xsl:param name="man.output.encoding" select="'ISO-8859-15'" />
+
+</xsl:stylesheet>
-- 
cgit v1.2.3


From c5bb93937b4486ec151b77deb6f17ad1fb611cc5 Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Sat, 11 Nov 2006 18:13:44 +0100
Subject: Fix a minor error in the French manpage. Closes: #398028

---
 doc/fr/apt_preferences.fr.5.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/fr/apt_preferences.fr.5.xml b/doc/fr/apt_preferences.fr.5.xml
index 6e1d2043e..aba9f0d06 100644
--- a/doc/fr/apt_preferences.fr.5.xml
+++ b/doc/fr/apt_preferences.fr.5.xml
@@ -208,7 +208,7 @@ d'
 <programlisting>
 Package: *
 Pin: release a=unstable
-Pin-Priority: 500
+Pin-Priority: 50
 </programlisting>
 
 <simpara>L'entrée suivante affecte une priorité haute à toutes les versions
@@ -578,4 +578,4 @@ apt-get install <replaceable>paquet</replaceable>/unstable
 
  &manbugs;
 &traducteur;
-</refentry>
\ No newline at end of file
+</refentry>
-- 
cgit v1.2.3


From ffaed865e222224a34b38a8e3eb19867c1a7dd39 Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Sun, 12 Nov 2006 07:30:07 +0100
Subject: Fix the typo described in #320000

---
 doc/ja/sources.list.ja.5.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml
index e000d8767..8522a3be3 100644
--- a/doc/ja/sources.list.ja.5.xml
+++ b/doc/ja/sources.list.ja.5.xml
@@ -391,7 +391,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 
-- 
cgit v1.2.3


From 14127f180b86c2290abf3653cd4b4d5972a1177e Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 23 Nov 2006 08:04:38 +0100
Subject: * mention apt-secure in apt.8 and apt-apt.8

---
 doc/apt-get.8.xml | 2 +-
 doc/apt.8         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b98d58737..451806e7b 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -467,7 +467,7 @@
 
  <refsect1><title>See Also</title>
    <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
-   &apt-conf;, &apt-config;,
+   &apt-conf;, &apt-config;, &apt-secure;
    The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>
  </refsect1>
 
diff --git a/doc/apt.8 b/doc/apt.8
index 3fb214a3b..671fe9c5b 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -33,6 +33,7 @@ None.
 .BR apt-get (8),
 .BR apt.conf (5),
 .BR sources.list (5)
+.BR apt-secure (8)
 .SH DIAGNOSTICS
 apt returns zero on normal operation, decimal 100 on error.
 .SH BUGS
-- 
cgit v1.2.3


From 65d71b381cc326bdf5310d8a2ea5b3f0d0307f63 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 23 Nov 2006 08:12:02 +0100
Subject: * added missing ","

---
 doc/apt-get.8.xml | 2 +-
 doc/apt.8         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 451806e7b..17f663a35 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -467,7 +467,7 @@
 
  <refsect1><title>See Also</title>
    <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
-   &apt-conf;, &apt-config;, &apt-secure;
+   &apt-conf;, &apt-config;, &apt-secure;, 
    The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>
  </refsect1>
 
diff --git a/doc/apt.8 b/doc/apt.8
index 671fe9c5b..6f39c5387 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -32,7 +32,7 @@ None.
 .BR apt-cache (8),
 .BR apt-get (8),
 .BR apt.conf (5),
-.BR sources.list (5)
+.BR sources.list (5),
 .BR apt-secure (8)
 .SH DIAGNOSTICS
 apt returns zero on normal operation, decimal 100 on error.
-- 
cgit v1.2.3


From c70496f94c8a16072b0b7a7906dec4b1aa4f306e Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 27 Nov 2006 12:07:06 +0100
Subject: * apt-pkg/deb/dpkgpm.cc:   - added "Dpkg::StopOnError" variable that
 controls if apt       will abort on errors from dpkg

---
 doc/examples/configure-index | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 0f0abc30c..73e20aa43 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -237,6 +237,10 @@ DPkg
    // Control the size of the command line passed to dpkg.
    MaxBytes 1024;
    MaxArgs 350;
+
+   // controls if apt will apport on the first dpkg error or if it 
+   // tries to install as many packages as possible
+   StopOnError "true";
 }
 
 /* Options you can set to see some debugging text They correspond to names
-- 
cgit v1.2.3