Substituted 'apt-archive' with 'apt-ftparchive'.

diff --git a/debian/changelog b/debian/changelog
index 9ea553256b46afa52d50b3ebe2c89fc8a9a87023..ceb5efbdc7ec604d6157ac6a4dedca0f7d83007d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,7 +35,12 @@ apt (0.7.17) unstable; urgency=low
     - Lowercased short package descriptions.
     - Bumped 'Standards-Version' to 3.8.0, no changes needed.
   * cmdline/apt-cache.cc:
-    - Advanced built-in help. (Closes: #286061)
+    - Advanced built-in help. Patch by
+      Andre Felipe Machado <andremachado@techforce.com.br>. (Closes: #286061)
+  * doc/:
+    - Substituded 'apt-archive' with 'apt-ftparchive' in docs.
+      Patch based on work of
+      Andre Felipe Machado <andremachado@techforce.com.br>. (Closes: #350865)
 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300
 

diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 01b157789f176ef10ff21eb4d1f3526e38abb41b..9696e018dfd13499254bb63cc786708d95bac9be 100644 (file)
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -179,7 +179,7 @@
 
 <refsect1><title>See Also</title> 
 <para> 
-&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
 &debsign; &debsig-verify;, &gpg;
 </para>
 

diff --git a/doc/apt.ent b/doc/apt.ent
index b7d03b58521a562bf54fc420f0015ca1a58935b8..d0bfaba56851cc2d0b493ebdf3c4bebe17f8e436 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -57,8 +57,8 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-archive "<citerefentry>
-    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
@@ -148,7 +148,7 @@
    <address><email>apt@packages.debian.org</email></address>
    <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
    <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
-   <date>14 December 2003</date>
+   <date>28 October 2008</date>
    <productname>Linux</productname>
 
  </refentryinfo>
@@ -207,6 +207,12 @@
    <productname>Linux</productname>
 ">
 
+<!ENTITY apt-qapage "
+       <para>
+               <ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>
+       </para>
+">
+
 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
  <refsect1><title>Bugs</title>

diff --git a/doc/fr/apt-secure.fr.8.xml b/doc/fr/apt-secure.fr.8.xml
index 5cec9a49d1169999b6229b1daccc618ca021ffc0..25b5ffd097393cfcfa1f32cc5c3926df24d77dff 100644 (file)
--- a/doc/fr/apt-secure.fr.8.xml
+++ b/doc/fr/apt-secure.fr.8.xml
@@ -188,7 +188,7 @@ les deux premi
 
 <refsect1><title>Voir aussi</title> 
 <para> 
-&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-archive;, &debsign;, 
+&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, &debsign;, 
 &debsig-verify;, &gpg;
 
 </para>

diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index d705b9e3e0d0503b5ba37ba7575ccd4332d3032f..651100497cd19b2e72fc5eeb190885013615caf6 100644 (file)
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -56,8 +56,8 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-archive "<citerefentry>
-    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >

diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml
index e20b865617899eff1f18b36fa7635cae455936ef..20c57fb166db382177b887fbdc767dae5399c358 100644 (file)
--- a/doc/ja/apt-secure.ja.8.xml
+++ b/doc/ja/apt-secure.ja.8.xml
@@ -325,7 +325,7 @@
 -->
 <refsect1><title>関連項目</title> 
 <para> 
-&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
 &debsign; &debsig-verify;, &gpg;
 </para>
 

diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja
index d633424617cc93b4b5122b11e3cafac1da84199e..1d1c36b1efddfd6dafa2e968c9c37e2416277864 100644 (file)
--- a/doc/ja/apt.ent.ja
+++ b/doc/ja/apt.ent.ja
@@ -56,8 +56,8 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-archive "<citerefentry>
-    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >