Document about the default log file, the behaviour in case of multple

--log options and add a reference to dpkg.cfg manpage in the dpkg manpage.
Thanks to James R. Van Zandt. Closes: #350440

diff --git a/ChangeLog b/ChangeLog
index 075e79c045fb5b3b5422c8c3002a1aa068726164..7ae660608089f14e191ff486297031b2a232b703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-10  James R. Van Zandt  <jrvz@comcast.net>
+
+       * man/C/dpkg.1: Document the default log file. The behaviour in case
+       of multiple --log options. And add a reference to dpkg.cfg manpage.
+
 2006-02-10  Philippe Batailler  <philippe.batailler@free.fr>,
            Guillem Jover  <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index fde771422c4be65fcc034df33ccc17cf7015c8f3..441b62811286b5235e383bd6a01b3d6c4900edb9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
   * Add command descriptions in the synopis, and add a usage example for
     -f in the dpkg-query manpage. Thanks for the initial patch to
     Philippe Batailler. Closes: #352091
+  * Document about the default log file, the behaviour in case of multple
+    --log options and add a reference to dpkg.cfg manpage in the dpkg manpage.
+    Thanks to James R. Van Zandt. Closes: #350440
 
   [ Frank Lichtenheld ]
   * Let dpkg-source ignore comments in the hunk header as used by

diff --git a/man/C/dpkg.1 b/man/C/dpkg.1
index cc946a0ceed1ac709d18c08f1b53d77d811c2768..36a4d4e2ca962e0b134600bf8e5a9718c03785d0 100644 (file)
--- a/man/C/dpkg.1
+++ b/man/C/dpkg.1
@@ -1,4 +1,4 @@
-.TH DPKG 1 "2006-01-26" "Debian Project" "dpkg suite"
+.TH DPKG 1 "2006-02-10" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg - package manager for Debian
 
@@ -478,8 +478,10 @@ Configuration file conflicts are reported as
 `status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited'
 .TP
 \fB\-\-log=\fP\fIfilename\fP
-Log status change updates and actions to \fIfilename\fP.  This can be given
-multiple times.  Log messages are of the form `YYYY-MM-DD HH:MM:SS status
+Log status change updates and actions to \fIfilename\fP, instead of
+the default \fI/var/log/dpkg.log\fP. If this option is given multiple
+times, the last filename is used. Log messages are of the form
+`YYYY-MM-DD HH:MM:SS status
 <state> <pkg> <installed-version>' for status change updates;
 `YYYY-MM-DD HH:MM:SS <action> <pkg> <installed-version>
 <available-version>' for actions where \fI<action>\fP is one of install,
@@ -493,6 +495,10 @@ Do not try to verify package signatures.
 .TP
 .I /etc/dpkg/dpkg.cfg
 Configuration file with default options.
+.TP
+.I /var/log/dpkg.log
+Default log file (see \fI/etc/dpkg/dpkg.cfg\fP(5) and option
+\fB\-\-log\fP).
 .P
 The other files listed below are in their default directories, see option
 \fB\-\-admindir\fP to see how to change locations of these files.
@@ -600,6 +606,7 @@ following packages: \fIapt\fR, \fIaptitude\fR and \fIdebsums\fR.
 \fBdpkg\-deb\fP(1),
 \fBdeb\fP(5),
 \fBdeb\-control\fP(5),
+\fBdpkg.cfg\fP(5),
 and
 \fBdpkg\-reconfigure\fP(8)