* doc/apt-get.8.xml:

  - point to the right dir for the user guide in the man-page

diff --git a/debian/changelog b/debian/changelog
index 04378ea509e745b8a321279844af392b2e139eb2..6813980c57b408862cf39238bb65e020920f80f1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ apt (0.6.45) unstable; urgency=low
   * ftparchive/cachedb.cc:
     - applied patch from ajt to fix Clean() function
       (closes: #379576)
   * ftparchive/cachedb.cc:
     - applied patch from ajt to fix Clean() function
       (closes: #379576)

+  * doc/apt-get.8.xml:
+    - fix path to the apt user build (Closes: #375640)

   * Merged from Christian Perrier bzr branch:
     * ko.po: Updated to 512t. Closes: #378901
     * hu.po: Updated to 512t. Closes: #376330
   * Merged from Christian Perrier bzr branch:
     * ko.po: Updated to 512t. Closes: #378901
     * hu.po: Updated to 512t. Closes: #376330


@@ -17,7 +19,7 @@ apt (0.6.45) unstable; urgency=low
     * eu.po: Updated
     * eu.po: Updated
 
     * eu.po: Updated
     * eu.po: Updated
 

- --
+ -- 

 
 apt  (0.6.44.2) unstable; urgency=low 
   
 
 apt  (0.6.44.2) unstable; urgency=low 
   

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index ac84f342a8e626bf2619c741eaa75816f04066b1..b98d5873719f1c9ea8dff4230ef84980d1cd0918 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -468,7 +468,7 @@
  <refsect1><title>See Also</title>
    <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
    &apt-conf;, &apt-config;,
  <refsect1><title>See Also</title>
    <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
    &apt-conf;, &apt-config;,

-   The APT User's guide in &docdir;, &apt-preferences;, the APT Howto.</para>
+   The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>

  </refsect1>
 
  <refsect1><title>Diagnostics</title>
  </refsect1>
 
  <refsect1><title>Diagnostics</title>

diff --git a/doc/apt.ent b/doc/apt.ent
index cf22df6d2dd968f94ff2417e15a94751f4ae346e..99fe443cfd650c58efaec04f3d76194b125bd8f7 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -2,6 +2,7 @@
 
 <!-- Some common paths.. -->
 <!ENTITY docdir "/usr/share/doc/apt/">
 
 <!-- Some common paths.. -->
 <!ENTITY docdir "/usr/share/doc/apt/">

+<!ENTITY guidesdir "/usr/share/doc/apt-doc/">

 <!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
 <!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
 <!ENTITY statedir "/var/lib/apt">
 <!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
 <!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
 <!ENTITY statedir "/var/lib/apt">