* doc/examples/configure-index:

  - Removed obsoleted header line. (Closes: #417638)
  - Changed 'linux-kernel' to 'linux-image'.
* doc/sources.list.5.xml:
  - Fixed typo and grammar in 'sources.list.d' section. Thanks to
    Timothy G Abbott <tabbott@MIT.EDU>. (Closes: #478098)
* doc/apt-get.8.xml:
  - Advanced descriptions for 'remove' and 'purge' options.
    (Closes: #274283)
* debian/rules:
  - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green.
    Fixes FTBFS. (Closes: #504181)

6 files changed, 26 insertions, 10 deletions

diff --git a/configure.in b/configure.in
index bf4116e8b..0ffbc67ff 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.17")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.18")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 35d6649ad..1d4197488 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,24 @@
-apt (0.7.18) UNRELEASED; urgency=low
+apt (0.7.18) unstable; urgency=low
 
+  [ Christian Perrier ]
   * Translations:
     - French updated
 
- -- Christian Perrier <bubulle@debian.org>  Thu, 06 Nov 2008 19:41:51 +0100
+  [ Eugene V. Lyubimkin ]
+  * doc/examples/configure-index:
+    - Removed obsoleted header line. (Closes: #417638)
+    - Changed 'linux-kernel' to 'linux-image'.
+  * doc/sources.list.5.xml:
+    - Fixed typo and grammar in 'sources.list.d' section. Thanks to
+      Timothy G Abbott <tabbott@MIT.EDU>. (Closes: #478098)
+  * doc/apt-get.8.xml:
+    - Advanced descriptions for 'remove' and 'purge' options.
+      (Closes: #274283)
+  * debian/rules:
+    - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green.
+      Fixes FTBFS. (Closes: #504181)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Thu, 06 Nov 2008 22:18:15 +0200
 
 apt (0.7.17) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index f6ff3c47a..f587b141a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,7 +186,7 @@ apt-doc: build-doc
 # Build architecture-dependent files here.
 
 binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
-apt: build debian/shlibs.local
+apt: build build-doc debian/shlibs.local
 	dh_testdir -p$@
 	dh_testroot -p$@
 	dh_clean -p$@ -k
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 73bacf09b..325f1964d 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -213,14 +213,15 @@
 
      <varlistentry><term>remove</term>
      <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are 
-     removed instead of installed. If a plus sign is appended to the package 
+	 removed instead of installed. Note the removing a package leaves its
+	 configuration files in system. If a plus sign is appended to the package 
      name (with no intervening space), the identified package will be 
      installed instead of removed.</para></listitem>
      </varlistentry>
 
      <varlistentry><term>purge</term>
      <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are 
-     removed and purged.</para></listitem>
+     removed and purged (any configuration files are deleted too).</para></listitem>
      </varlistentry>
 
      <varlistentry><term>source</term>
@@ -419,7 +420,8 @@
      <varlistentry><term><option>--purge</option></term>
      <listitem><para>Use purge instead of remove for anything that would be removed.
      An asterisk ("*") will be displayed next to packages which are
-     scheduled to be purged.
+	 scheduled to be purged. <option>remove --purge</option> is equivalent for
+	 <option>purge</option> command.
      Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
      </varlistentry>
 
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index d0c453a1c..07803b2cb 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -1,4 +1,3 @@
-// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is (except for the
    last line) a completely valid file. Most of the options have sane default
@@ -25,7 +24,7 @@ APT
   Architecture "i386";
   Build-Essential "build-essential";
 
-  NeverAutoRemove  { "linux-kernel.*";  };  // packages that should never
+  NeverAutoRemove  { "linux-image.*";  };  // packages that should never
                                             // considered for autoRemove
 
   // Options for apt-get
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 8b041391a..9eb66d728 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -48,7 +48,7 @@
  
  <refsect1><title>sources.list.d</title>
    <para>The <filename>/etc/apt/sources.list.d</filename> directory provides
-   a way to add sources.list entries in seperate files that end with 
+   a way to add sources.list entries in separate files whose names end with 
    <literal>.list</literal>. The format is the same as for the regular
    <filename>sources.list</filename> file. </para>
  </refsect1>