merged lp:~donkult/apt/sid

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

diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 20f473f77003dccb866267af18815cca2392b239..f8ff678b957b91879ac5790c1deb8bb75930da35 100644 (file)
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -5,6 +5,9 @@
 <!ENTITY % aptent SYSTEM "apt.ent">
 %aptent;
 
 <!ENTITY % aptent SYSTEM "apt.ent">
 %aptent;
 

+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
+%aptverbatiment;
+

 ]>
 
 <refentry>
 ]>
 
 <refentry>


@@ -68,7 +71,7 @@
    different steps. <command>apt-secure</command> is the last step in
    this chain, trusting an archive does not mean that the packages
    that you trust it do not contain malicious code but means that you
    different steps. <command>apt-secure</command> is the last step in
    this chain, trusting an archive does not mean that the packages
    that you trust it do not contain malicious code but means that you

-   trust the archive maintainer. Its the archive maintainer
+   trust the archive maintainer. It's the archive maintainer

    responsibility to ensure that the archive integrity is correct.
    </para>
 
    responsibility to ensure that the archive integrity is correct.
    </para>
 


@@ -94,7 +97,7 @@
    is computed and put in the Packages file. The MD5 sum of all of the
    packages files are then computed and put into the Release file. The
    Release file is then signed by the archive key (which is created
    is computed and put in the Packages file. The MD5 sum of all of the
    packages files are then computed and put into the Release file. The
    Release file is then signed by the archive key (which is created

-   once a year and distributed through the FTP server. This key is
+   once a year) and distributed through the FTP server. This key is

    also on the Debian keyring.
    </para>
 
    also on the Debian keyring.
    </para>
 


@@ -145,8 +148,8 @@
    (you should make sure you are using a trusted communication channel
    when retrieving it), add it with <command>apt-key</command> and
    then run <command>apt-get update</command> so that apt can download
    (you should make sure you are using a trusted communication channel
    when retrieving it), add it with <command>apt-key</command> and
    then run <command>apt-get update</command> so that apt can download

-   and verify the <filename>Release.gpg</filename> files from the archives you
-   have configured.
+   and verify the <filename>InRelease</filename> or <filename>Release.gpg</filename>
+   files from the archives you have configured.

    </para>
 </refsect1>
 
    </para>
 </refsect1>
 


@@ -157,15 +160,16 @@
    </para>
 
      <itemizedlist>
    </para>
 
      <itemizedlist>

-       <listitem><para><literal>Create a toplevel Release
-       file</literal>.  if it does not exist already. You can do this
+       <listitem><para><emphasis>Create a toplevel Release
+       file</emphasis>,  if it does not exist already. You can do this

        by running <command>apt-ftparchive release</command> 
        (provided in apt-utils).</para></listitem>
    
        by running <command>apt-ftparchive release</command> 
        (provided in apt-utils).</para></listitem>
    

-      <listitem><para><literal>Sign it</literal>. You can do this by running
+      <listitem><para><emphasis>Sign it</emphasis>. You can do this by running
+      <command>gpg --clearsign -o InRelease Release</command> and

       <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
 
       <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
 

-      <listitem><para><literal>Publish the key fingerprint</literal>,
+      <listitem><para><emphasis>Publish the key fingerprint</emphasis>,

       that way your users will know what key they need to import in
       order to authenticate the files in the
       archive.</para></listitem>
       that way your users will know what key they need to import in
       order to authenticate the files in the
       archive.</para></listitem>