[Apt-listbugs-commits] [apt-listbugs] 03/03: further clarify the man page and the online help

[Francesco Poli]

This is an automated email from the git hooks/post-receive script.

frx-guest pushed a commit to branch master
in repository apt-listbugs.

commit 693affe5fa3419e3261af579a53d770d6394630c
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Sun Sep 10 18:19:58 2017 +0200

    further clarify the man page and the online help
    
    The -C option allows the user to specify a configuration file to be
    read in *addition* to (not in stead of) the default APT configuration
    files.
    See https://bugs.debian.org/869070#34
---
 bin/apt-listbugs         | 7 ++++++-
 debian/changelog         | 4 ++--
 lib/aptlistbugs/logic.rb | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/apt-listbugs b/bin/apt-listbugs
index b112d93..12bd618 100755
--- a/bin/apt-listbugs
+++ b/bin/apt-listbugs
@@ -150,7 +150,8 @@ kept up-to-date.
 
 : -C ((*apt.conf*)), --aptconf ((*apt.conf*))
 
-  Specifies the APT configuration file to use.
+  Specifies an additional APT configuration file to use.  This file will
+  be read after the default APT configuration files.
 
 : -F, --force-pin
 
@@ -354,6 +355,10 @@ cause the installation/upgrade to be aborted.
   whose first non-blank character is '#' are treated as comments and
   skipped entirely.
 
+: ((*/etc/apt/apt.conf*)) and ((*/etc/apt/apt.conf.d/**))
+
+  Default APT configuration files (see (({apt.conf}))(5) for more details).
+
 : ((*/etc/apt/apt.conf.d/10apt-listbugs*))
 
   Configuration file fragment for APT containing options related to
diff --git a/debian/changelog b/debian/changelog
index e43e6d7..654428a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,8 @@ apt-listbugs (0.1.24) UNRELEASED; urgency=medium
     versioned suggestion of debianutils (Closes: #867203)
   * added suggestion of sensible-utils
   * bumped Standards-Version to 4.1.0: no changes needed
-  * improved the man page, thanks to the constructive criticism by Vincent
-    Lefevre
+  * improved the man page and the online help, thanks to the constructive
+    criticism by Vincent Lefevre
 
  -- Francesco Poli (wintermute) <invernomuto at paranoici.org>  Mon, 13 Mar 2017 22:19:08 +0100
 
diff --git a/lib/aptlistbugs/logic.rb b/lib/aptlistbugs/logic.rb
index 897c17a..b097dec 100644
--- a/lib/aptlistbugs/logic.rb
+++ b/lib/aptlistbugs/logic.rb
@@ -60,7 +60,7 @@ class AppConfig
       sprintf(_(" -P <priority>    : Pin-Priority value [%s].\n"), @pin_priority),
       _(" -E <title>       : Title of RSS output.\n"),
       _(" -q               : Don't display progress bar.\n"),
-      _(" -C <apt.conf>    : apt.conf file to use.\n"),
+      _(" -C <apt.conf>    : Additional apt.conf file to use.\n"),
       _(" -F               : Automatically pin all buggy packages.\n"),
       _(" -N               : Never automatically pin packages.\n"),
       _(" -y               : Assume that you select yes for all questions.\n"),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/apt-listbugs/apt-listbugs.git