From: Guillem Jover Date: Fri, 10 Feb 2006 03:52:11 +0000 (+0000) Subject: Document about the default log file, the behaviour in case of multple X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a96b14f62a0a00e196fc743a9a4dc23cbd60561;p=dpkg 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 075e79c0..7ae66060 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 James R. Van Zandt + + * 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 , Guillem Jover diff --git a/debian/changelog b/debian/changelog index fde77142..441b6281 100644 --- 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 cc946a0c..36a4d4e2 100644 --- 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 ' for status change updates; `YYYY-MM-DD HH:MM:SS ' for actions where \fI\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)