merged with apt--mvo

1 files changed, 83 insertions, 32 deletions

diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 075d85698..d705b9e3e 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -11,36 +11,56 @@
 <!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>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-secure "<citerefentry>
+    <refentrytitle>apt-secure</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-archive "<citerefentry>
+    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
 
 <!ENTITY sources-list "<citerefentry>
     <refentrytitle><filename>sources.list</filename></refentrytitle>
@@ -51,44 +71,75 @@
 <!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>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY synaptic "<citerefentry>
+    <refentrytitle><command>synaptic</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY debsign "<citerefentry>
+    <refentrytitle><command>debsign</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY debsig-verify "<citerefentry>
+    <refentrytitle><command>debsig-verify</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY gpg "<citerefentry>
+    <refentrytitle><command>gpg</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-docinfo "
  <refentryinfo>
@@ -140,12 +191,12 @@
 <!ENTITY manbugs "
  <refsect1><title>Bogues</title>
    <para>
-Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues de APT</ulink>.  
-   Si vous voulez rapporter un bogue, consultez le texte 
+Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues d'APT</ulink>.  
+   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 "
@@ -153,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>