French manpages translation update

[apt.git] / doc / apt-key.8.xml

diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 3748b5e17929ae4ba6fe6103dbbbed9fe3428001..1d91790eaf128a7a8c1c14ab334ffdc9c00231d7 100644 (file)
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <?xml version="1.0" encoding="utf-8" standalone="no"?>

-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!ENTITY % aptent SYSTEM "apt.ent">
-%aptent;
-
-<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
-%aptverbatiment;
-
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;

 ]>
 
 <refentry>
 ]>
 
 <refentry>

- &apt-docinfo;
- 
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>2012-06-09T00:00:00Z</date>
+ </refentryinfo>
+

  <refmeta>
    <refentrytitle>apt-key</refentrytitle>
    <manvolnum>8</manvolnum>
  <refmeta>
    <refentrytitle>apt-key</refentrytitle>
    <manvolnum>8</manvolnum>


@@ -37,19 +40,19 @@
 
 <refsect1><title>Commands</title>
    <variablelist>
 
 <refsect1><title>Commands</title>
    <variablelist>

-     <varlistentry><term>add &synopsis-param-filename;</term>
+     <varlistentry><term><option>add</option> <option>&synopsis-param-filename;</option></term>

      <listitem>
      <para>
      <listitem>
      <para>

-
-       Add a new key to the list of trusted keys.  The key is read
-       from &synopsis-param-filename;, or standard input if
-       &synopsis-param-filename; is <literal>-</literal>.
+       Add a new key to the list of trusted keys.
+       The key is read from the filename given with the parameter
+       &synopsis-param-filename; or if the filename is <literal>-</literal>
+       from standard input.

      </para>
 
      </listitem>
      </varlistentry>
 
      </para>
 
      </listitem>
      </varlistentry>
 

-     <varlistentry><term>del &synopsis-param-keyid;</term>
+     <varlistentry><term><option>del</option> <option>&synopsis-param-keyid;</option></term>

      <listitem>
      <para>
 
      <listitem>
      <para>
 


@@ -60,7 +63,7 @@
      </listitem>
      </varlistentry>
 
      </listitem>
      </varlistentry>
 

-     <varlistentry><term>export &synopsis-param-keyid;</term>
+     <varlistentry><term><option>export</option> <option>&synopsis-param-keyid;</option></term>

      <listitem>
      <para>
 
      <listitem>
      <para>
 


@@ -71,7 +74,7 @@
      </listitem>
      </varlistentry>
 
      </listitem>
      </varlistentry>
 

-     <varlistentry><term>exportall</term>
+     <varlistentry><term><option>exportall</option></term>

      <listitem>
      <para>
 
      <listitem>
      <para>
 


@@ -82,7 +85,7 @@
      </listitem>
      </varlistentry>
 
      </listitem>
      </varlistentry>
 

-     <varlistentry><term>list</term>
+     <varlistentry><term><option>list</option></term>

      <listitem>
      <para>
 
      <listitem>
      <para>
 


@@ -93,7 +96,7 @@
      </listitem>
      </varlistentry>
      
      </listitem>
      </varlistentry>
      

-        <varlistentry><term>finger</term>
+     <varlistentry><term><option>finger</option></term>

      <listitem>
      <para>
 
      <listitem>
      <para>
 


@@ -104,7 +107,7 @@
      </listitem>
      </varlistentry>
      
      </listitem>
      </varlistentry>
      

-        <varlistentry><term>adv</term>
+     <varlistentry><term><option>adv</option></term>

      <listitem>
      <para>
 
      <listitem>
      <para>
 


@@ -116,31 +119,31 @@
      </listitem>
      </varlistentry>
 
      </listitem>
      </varlistentry>
 

-     <varlistentry><term>update</term>
+     <varlistentry><term><option>update</option></term>

      <listitem>
      <para>
 
        Update the local keyring with the archive keyring and remove from
        the local keyring the archive keys which are no longer valid.
        The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
      <listitem>
      <para>
 
        Update the local keyring with the archive keyring and remove from
        the local keyring the archive keys which are no longer valid.
        The archive keyring is shipped in the <literal>archive-keyring</literal> package of your

-       distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
+       distribution, e.g. the &keyring-package; package in &keyring-distro;.

 
      </para>
 
      </listitem>
      </varlistentry>
      
 
      </para>
 
      </listitem>
      </varlistentry>
      

-     <varlistentry><term>net-update</term>
+     <varlistentry><term><option>net-update</option></term>

      <listitem>
      <para>
 
      <listitem>
      <para>
 

-       Work similar to the <command>update</command> command above, but get the
-       archive keyring from an URI instead and validate it against a master key.
+       Perform an update working similarly to the <command>update</command> command above,
+       but get the archive keyring from a URI instead and validate it against a master key.

 
        This requires an installed &wget; and an APT build configured to have
        a server to fetch from and a master keyring to validate.
 
 
        This requires an installed &wget; and an APT build configured to have
        a server to fetch from and a master keyring to validate.
 

-       APT in Debian does not support this command and relies on
+       APT in Debian does not support this command, relying on

        <command>update</command> instead, but Ubuntu's APT does.
 
      </para>
        <command>update</command> instead, but Ubuntu's APT does.
 
      </para>


@@ -153,8 +156,8 @@
  <refsect1><title>Options</title>
 <para>Note that options need to be defined before the commands described in the previous section.</para>
    <variablelist>
  <refsect1><title>Options</title>
 <para>Note that options need to be defined before the commands described in the previous section.</para>
    <variablelist>

-      <varlistentry><term>--keyring &synopsis-param-filename;</term>
-      <listitem><para>With this option it is possible to specify a specific keyring
+      <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option></term>
+      <listitem><para>With this option it is possible to specify a particular keyring

       file the command should operate on. The default is that a command is executed
       on the <filename>trusted.gpg</filename> file as well as on all parts in the
       <filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</filename>
       file the command should operate on. The default is that a command is executed
       on the <filename>trusted.gpg</filename> file as well as on all parts in the
       <filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</filename>


@@ -173,12 +176,12 @@
      <listitem><para>Local trust database of archive keys.</para></listitem>
      </varlistentry>
 
      <listitem><para>Local trust database of archive keys.</para></listitem>
      </varlistentry>
 

-     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
-     <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+     <varlistentry><term>&keyring-filename;</term>
+     <listitem><para>Keyring of &keyring-distro; archive trusted keys.</para></listitem>

      </varlistentry>
 
      </varlistentry>
 

-     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
-     <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+     <varlistentry><term>&keyring-removed-filename;</term>
+     <listitem><para>Keyring of &keyring-distro; archive removed trusted keys.</para></listitem>

      </varlistentry>
 
    </variablelist>
      </varlistentry>
 
    </variablelist>