aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--pbuilder.83
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 15dcd94..37c52a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pbuilder (0.161) UNRELEASED; urgency=low
+
+ * Clarify documentation so that --configfile loads additional
+ configuration, and does not avoid loading configuration in place of
+ ~/.pbuilderrc (closes: #394985)
+
+ -- Junichi Uekawa <dancer@debian.org> Thu, 26 Oct 2006 07:58:13 +0900
+
pbuilder (0.160) unstable; urgency=low
* Bug fix: "pbuilder-doc: cowbuilder instead of cowdancer", thanks
diff --git a/pbuilder.8 b/pbuilder.8
index fd3ea7b..a419d87 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -245,7 +245,8 @@ The packages should be specified as a space-delimited list.
.TP
.BI "\-\-configfile [" "configuration file to load" "]"
-Loads the configuration file.
+Additional configuration file to read after all other
+configuration files have been read.
\" START OF hookdir description