From babb80e1534505c0b6e268a4f43bdd924b42030a Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 18 Jan 2006 22:47:48 +0000
Subject: * fix typo in apt-cache.8 manpage

---
 doc/apt-cache.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 0e1d2f8d9..789c3d228 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -191,7 +191,7 @@ Reverse Provides:
 
      <varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
      <listitem><para><literal>show</literal> performs a function similar to 
-     <command>dpkg --print-avail</command>i; it displays the package records for the 
+     <command>dpkg --print-avail</command>; it displays the package records for the 
      named packages.</para></listitem>
      </varlistentry>
 
-- 
cgit v1.2.3


From 6141cfe0307fd31cecaa4ac6d46e922b3e3aa3ce Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 18 Jan 2006 22:50:35 +0000
Subject: * fixed another typo in doc/apt-secure.8.xml

---
 doc/apt-secure.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index e22446030..fa13ddc0f 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -120,7 +120,7 @@
  
        <listitem><para><literal>Mirror network compromise</literal>.
         Without signature checking, a malicious agent can compromise a
-        mirror host and modify the files in it to propage malicious
+        mirror host and modify the files in it to propagate malicious
         software to all users downloading packages from that
         host.</para></listitem>
     </itemizedlist>
-- 
cgit v1.2.3


From b3ff13b8d1e75ef1019febd0d8daefa17d5dc1e0 Mon Sep 17 00:00:00 2001
From: Christian Perrier <bubulle@debian.org>
Date: Sun, 22 Jan 2006 08:38:28 +0000
Subject: Merge from Philippe Batailler French manpages tree/Vietnamese
 translation update * po/vi.po: Completed to 512 strings

Patches applied:

 * philippe.batailler@free.fr--2005/apt--main--0--patch-9
   manpages
---
 doc/fr/apt.ent.fr | 63 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

(limited to 'doc')

diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 94398bb44..d705b9e3e 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -11,36 +11,38 @@
 <!ENTITY apt-conf "<citerefentry>
     <refentrytitle><filename>apt.conf</filename></refentrytitle>
     <manvolnum>5</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-get "<citerefentry>
     <refentrytitle><command>apt-get</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-config "<citerefentry>
     <refentrytitle><command>apt-config</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>">
+  </citerefentry>"
+>
 
 <!ENTITY apt-cdrom "<citerefentry>
     <refentrytitle><command>apt-cdrom</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-cache "<citerefentry>
     <refentrytitle><command>apt-cache</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-preferences "<citerefentry>
     <refentrytitle><command>apt_preferences</command></refentrytitle>
     <manvolnum>5</manvolnum>
-  </citerefentry>">
+  </citerefentry>"
+>
 
 <!ENTITY apt-key "<citerefentry>
     <refentrytitle><command>apt-key</command></refentrytitle>
@@ -69,43 +71,44 @@
 <!ENTITY reportbug "<citerefentry>
     <refentrytitle><command>reportbug</command></refentrytitle>
     <manvolnum>1</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg "<citerefentry>
     <refentrytitle><command>dpkg</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg-buildpackage "<citerefentry>
     <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
     <manvolnum>1</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY gzip "<citerefentry>
     <refentrytitle><command>gzip</command></refentrytitle>
     <manvolnum>1</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg-scanpackages "<citerefentry>
     <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg-scansources "<citerefentry>
     <refentrytitle><command>dpkg-scansources</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dselect "<citerefentry>
     <refentrytitle><command>dselect</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>">
+  </citerefentry>"
+>
     
 <!ENTITY aptitude "<citerefentry>
     <refentrytitle><command>aptitude</command></refentrytitle>
@@ -192,8 +195,8 @@ Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues
    Si vous voulez signaler un bogue, consultez le texte 
    <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la 
 commande &reportbug;.</para>
- </refsect1>
- ">
+ </refsect1>"
+>
 
 <!-- Boiler plate Author section -->
 <!ENTITY manauthor "
@@ -201,17 +204,17 @@ commande &reportbug;.</para>
    <para>
    APT a été écrit par l'équipe APT <email>apt@packages.debian.org</email>.
 </para>
- </refsect1>
-">
+ </refsect1>"
+>
 
 <!-- Section traduction -->
 <!ENTITY deux-traducteurs "
 <refsect1><title>Traduction</title>
 <para>
 Jérôme Marant. 2000&nbsp;; mise à jour : Philippe Batailler. 2005.
-</para>
-</refsect1>
-">
+<email>debian-l10n-french@lists.debian.org</email>.</para>
+</refsect1>"
+>
 
 <!ENTITY traducteur "
 <refsect1><title>Traduction</title>
-- 
cgit v1.2.3