Wichert Akkerman лет назад: 25
Родитель
Сommit
e8ff3e8da4
3 измененных файлов с 15 добавлено и 2 удалено
  1. 4 0
      ChangeLog
  2. 2 1
      debian/changelog
  3. 9 1
      main/dpkg.8

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+Wed Apr 25 13:15:41 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/dpkg.8: document dpkg.cfg
+
 Wed Apr 25 13:05:13 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * main/dpkg.8: Fix formating error

+ 2 - 1
debian/changelog

@@ -105,7 +105,8 @@ dpkg (1.9.0) unstable; urgency=low
     Closes: Bug# 31620
   * Fix wrong ENOENT test in dpkg-divert. Closes: Bug#95088
   * Add support for more SuperH variants (sh[34]{,eb}-linux-gnu)
-  * Fix formating in dpkg manpage
+  * Fix formating and a typo in the dpkg manpage
+  * Document the dpkg.cfg configuration file in dpkg(8)
 
  -- Wichert Akkerman <wakkerma@debian.org>  Tue, 24 Apr 2001 02:23:46 +0200
 

+ 9 - 1
main/dpkg.8

@@ -295,6 +295,10 @@ See \fBdpkg-deb\fP(1) for more information about the following actions.
 .fi
 
 .SH OPTIONS
+All options can be specified both on the commandline and in the \fBdpkg\fP
+configuration file \fI/etc/dpkg/dpkg.cfg\fP. Each line in the configuration
+file is either an option (exactly the same as the commandline option but
+without leading dashes) or a comment (if it starts with a \fB#\fR).
 .br
 .TP
 \fB--abort-after=\fP\fInumber\fP
@@ -460,7 +464,11 @@ installed.
 Send package status info to file descriptor \fI<n>\fP.  This can be given
 multiple times.  Status updates are of the form `status: <pkg>: <pkg qstate>'.
 .SH FILES
-The files listed here are in their default directories, see option
+.TP
+.I /etc/dpkg.cfg
+Configuration file with default options.
+.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.
 .TP
 .I /var/lib/dpkg/available