Merge branch 'debian/sid' into debian/experimental

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

diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 1760a8e5f71e7185e2287aa7d103190e80f4a18f..e343b86eac814fba76a338f32b6f913da9da5bb8 100644 (file)
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!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 % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;

 ]>
 
 <refentry>
 ]>
 
 <refentry>


@@ -17,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2012-05-21T00:00:00Z</date>
+   <date>2012-06-09T00:00:00Z</date>

  </refentryinfo>
 
  <refmeta>
  </refentryinfo>
 
  <refmeta>


@@ -103,10 +99,10 @@
    the maintainer signature is stripped off, and checksums of the package
    are computed and put in the Packages file. The checksums of all of the
    Packages files are then computed and put into the Release file. The
    the maintainer signature is stripped off, and checksums of the package
    are computed and put in the Packages file. The checksums 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 for this Debian release
+   Release file is then signed by the archive key for this &keyring-distro; release,

    and distributed alongside the packages and the Packages files on
    and distributed alongside the packages and the Packages files on

-   Debian mirrors. The keys are in the Debian archive keyring available in
-   the <package>debian-archive-keyring</package> package.
+   &keyring-distro; mirrors. The keys are in the &keyring-distro; archive keyring
+   available in the &keyring-package; package.

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


@@ -191,7 +187,7 @@
 <refsect1><title>See Also</title> 
 <para> 
 &apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
 <refsect1><title>See Also</title> 
 <para> 
 &apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,

-&debsign; &debsig-verify;, &gpg;
+&debsign;, &debsig-verify;, &gpg;

 </para>
 
 <para>For more background information you might want to review the
 </para>
 
 <para>For more background information you might want to review the