* doc/sources.list.5.xml:

  - Mentioned allowed characters in file names in /etc/apt/sources.list.d.
    Thanks to Matthias Urlichs. (Closes: #426913)
* doc/apt-get.8.xml:
  - Included '-v'/'--version' as a command to synopsis.
* cmdline/apt-cache.cc:
  - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061)
  - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038)
  - Removed asking to file a release-critical bug against a package if there
    is a request to install only one package and it is not installable.
    (Closes: #419521)

6 files changed, 62 insertions, 35 deletions

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 5513fcc90..4431fd4f9 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1739,8 +1739,8 @@ bool ShowHelp(CommandLine &Cmd)
       "   show - Show a readable record for the package\n"
       "   depends - Show raw dependency information for a package\n"
       "   rdepends - Show reverse dependency information for a package\n"
-      "   pkgnames - List the names of all packages\n"
-      "   dotty - Generate package graphs for GraphVis\n"
+      "   pkgnames - List the names of all packages in the system\n"
+      "   dotty - Generate package graphs for GraphViz\n"
       "   xvcg - Generate package graphs for xvcg\n"
       "   policy - Show policy settings\n"
       "\n"
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 104baba8a..5fbe21eed 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1721,6 +1721,7 @@ bool DoInstall(CommandLine &CmdL)
 	      "requested an impossible situation or if you are using the unstable\n" 
 	      "distribution that some required packages have not yet been created\n"
 	      "or been moved out of Incoming.") << endl;
+	 /*
 	 if (Packages == 1)
 	 {
 	    c1out << endl;
@@ -1729,6 +1730,7 @@ bool DoInstall(CommandLine &CmdL)
 		 "the package is simply not installable and a bug report against\n" 
 		 "that package should be filed.") << endl;
 	 }
+	 */
 
 	 c1out << _("The following information may help to resolve the situation:") << endl;
 	 c1out << endl;
diff --git a/debian/changelog b/debian/changelog
index a1a2d9f1c..e7309d577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+apt (0.7.19) unstable; urgency=low
+
+  [ Eugene V. Lyubimkin ]
+  * doc/sources.list.5.xml:
+    - Mentioned allowed characters in file names in /etc/apt/sources.list.d.
+      Thanks to Matthias Urlichs. (Closes: #426913)
+  * doc/apt-get.8.xml:
+    - Included '-v'/'--version' as a command to synopsis.
+  * cmdline/apt-cache.cc:
+    - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061)
+    - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038)
+    - Removed asking to file a release-critical bug against a package if there
+      is a request to install only one package and it is not installable.
+      (Closes: #419521)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 08 Nov 2008 12:40:19 +0200
+
 apt (0.7.18) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -89,7 +106,7 @@ apt (0.7.17~exp4) experimental; urgency=low
       failure when GREP_OPTIONS contains options that modify grep output.
       (Closes: #428752)
 
- -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 31 Oct 2008 23:45:17 +0300
 
 apt (0.7.17~exp3) experimental; urgency=low
 
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 325f1964d..d4c849f43 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -15,7 +15,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>05 November 2008</date>
+   <date>08 November 2008</date>
  </refentryinfo>
  
  <refmeta>
@@ -33,7 +33,7 @@
  <refsynopsisdiv>
    <cmdsynopsis>
       <command>apt-get</command>
-      <arg><option>-vsqdyfmubV</option></arg>
+      <arg><option>-sqdyfmubV</option></arg>
       <arg>
 	      <option>-o=
 			  <replaceable>config_string</replaceable>
@@ -91,6 +91,12 @@
          <arg choice='plain'>autoremove</arg>
 		 <arg choice='plain'>
 			 <group choice='req'>
+				<arg choice='plain'>-v</arg>
+				<arg choice='plain'>--version</arg>
+			 </group>
+		 </arg>
+		 <arg choice='plain'>
+			 <group choice='req'>
 				<arg choice='plain'>-h</arg>
 				<arg choice='plain'>--help</arg>
 			 </group>
@@ -158,24 +164,23 @@
 
      <varlistentry><term>install</term>
      <listitem>
-	     <para>
-		     <literal>install</literal> is followed by one or more 
-		     packages desired for installation or upgrading. 
-		     Each package is a package name, not a fully qualified 
-		     filename (for instance, in a Debian GNU/Linux system, 
-		     libc6 would be the argument provided, not 
-		     <literal>libc6_1.9.6-2.deb</literal>). All packages required 
-		     by the package(s) specified for installation will also 
-		     be retrieved and installed. 
-		     The <filename>/etc/apt/sources.list</filename> file is 
-		     used to locate the desired packages. If a hyphen is 
-		     appended to the package name (with no intervening space), 
-		     the identified package will be removed if it is installed. 
-		     Similarly a plus sign can be used to designate a 
-		     package to install. These latter features may be used 
-		     to override decisions made by apt-get's conflict 
-		     resolution system.
-	     </para>
+	 <para><literal>install</literal> is followed by one or more 
+	 packages desired for installation or upgrading. 
+	 Each package is a package name, not a fully qualified 
+	 filename (for instance, in a Debian GNU/Linux system, 
+	 libc6 would be the argument provided, not 
+	 <literal>libc6_1.9.6-2.deb</literal>). All packages required 
+	 by the package(s) specified for installation will also 
+	 be retrieved and installed. 
+	 The <filename>/etc/apt/sources.list</filename> file is 
+	 used to locate the desired packages. If a hyphen is 
+	 appended to the package name (with no intervening space), 
+	 the identified package will be removed if it is installed. 
+	 Similarly a plus sign can be used to designate a 
+	 package to install. These latter features may be used 
+	 to override decisions made by apt-get's conflict 
+	 resolution system.
+	 </para>
 
      <para>A specific version of a package can be selected for installation by 
      following the package name with an equals and the version of the package 
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9eb66d728..b875086ef 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -48,9 +48,12 @@
  
  <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 separate files whose names end with 
-   <literal>.list</literal>. The format is the same as for the regular
-   <filename>sources.list</filename> file. </para>
+   a way to add sources.list entries in separate files.
+   The format is the same as for the regular <filename>sources.list</filename> file.
+   File names need to end with
+   <filename>.list</filename> and may only contain letters (a-z and A-Z),
+   digits (0-9), underscore (_), hyphen (-) and period (.) characters.
+   Otherwise they will be silently ignored.</para>
  </refsect1>
 
  <refsect1><title>The deb and deb-src types</title>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 19e57536a..518aabcd3 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 18:12+0100\n"
+"POT-Creation-Date: 2008-11-08 21:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -184,8 +184,8 @@ msgid ""
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
@@ -2449,35 +2449,35 @@ msgstr ""
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1421
+#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1113
+#: apt-pkg/acquire-item.cc:1118
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1226
+#: apt-pkg/acquire-item.cc:1231
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1285
+#: apt-pkg/acquire-item.cc:1290
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1331
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1413
+#: apt-pkg/acquire-item.cc:1418
 msgid "Size mismatch"
 msgstr ""