Pārlūkot izejas kodu

Don't claim in dpkg man page that we set DPKG_OLD_CONFFILE and
DPKG_NEW_CONFFILE on sub shells since we actually don't.

Frank Lichtenheld 20 gadi atpakaļ
vecāks
revīzija
f967d7773b
3 mainītis faili ar 13 papildinājumiem un 15 dzēšanām
  1. 2 0
      debian/changelog
  2. 0 10
      man/C/dpkg.1
  3. 11 5
      man/ChangeLog

+ 2 - 0
debian/changelog

@@ -32,6 +32,8 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
     links. Closes: #349120, #349442
     links. Closes: #349120, #349442
   * Update archtable to reflect current archive: Add amd64 and remove
   * Update archtable to reflect current archive: Add amd64 and remove
     sh. Closes: #367329
     sh. Closes: #367329
+  * Don't claim in dpkg man page that we set DPKG_OLD_CONFFILE and
+    DPKG_NEW_CONFFILE on sub shells since we actually don't.
 
 
   [ Nicolas François ]
   [ Nicolas François ]
   * fix typos in the Russian man pages. Thanks to Stepan Golosunov.
   * fix typos in the Russian man pages. Thanks to Stepan Golosunov.

+ 0 - 10
man/C/dpkg.1

@@ -541,16 +541,6 @@ The program \fBdpkg\fP will execute while starting a new shell.
 .B COLUMNS
 .B COLUMNS
 Sets the number of columns \fBdpkg\fP should use when displaying formatted
 Sets the number of columns \fBdpkg\fP should use when displaying formatted
 text. Currently only used by \-l.
 text. Currently only used by \-l.
-.TP
-.B DPKG_OLD_CONFFILE
-Set by \fBdpkg\fP to the filename of the old configuration file 
-when you start a shell to examine a changed configuration.
-file.
-.TP
-.B DPKG_NEW_CONFFILE
-Set by \fBdpkg\fP to the filename of the newversion of a configuration file
-when you start a shell to examine a changed configuration.
-file.
 .
 .
 .SH EXAMPLES
 .SH EXAMPLES
 To list packages related to the editor vi:
 To list packages related to the editor vi:

+ 11 - 5
man/ChangeLog

@@ -1,3 +1,9 @@
+2006-05-17  Frank Lichtenheld  <djpig@debian.org>
+
+	* man/C/dpkg.1: We don't actually set
+	DPKG_OLD_CONFFILE and DPKG_NEW_CONFFILE on subshells,
+	so we shouldn't claim to do so.
+
 2006-05-16  Peter Karlsson  <peterk@debian.org>
 2006-05-16  Peter Karlsson  <peterk@debian.org>
 
 
 	* sv/deb-old.5.sv.po, sv/dpkg.1.sv.po: Partial updates.
 	* sv/deb-old.5.sv.po, sv/dpkg.1.sv.po: Partial updates.
@@ -5,11 +11,11 @@
 2006-05-14  Peter Karlsson  <peterk@debian.org>
 2006-05-14  Peter Karlsson  <peterk@debian.org>
 
 
 	* sv/822-date.1.sv.po, sv/deb.5.sv.po, sv/deb-control.5.sv.po,
 	* sv/822-date.1.sv.po, sv/deb.5.sv.po, sv/deb-control.5.sv.po,
-	  sv/deb-old.5.sv.po, sv/dpkg.1.sv.po, sv/dpkg.cfg.5.sv.po,
-	  sv/dpkg-deb.1.sv.po, sv/dpkg-query.1.sv.po, sv/dpkg-split.1.sv.po,
-	  sv/dselect.1.sv.po, sv/dselect.cfg.5.sv.po,
-	  sv/start-stop-daemon.8.sv.po: Began updating the Swedish
-	  translation.
+	sv/deb-old.5.sv.po, sv/dpkg.1.sv.po, sv/dpkg.cfg.5.sv.po,
+	sv/dpkg-deb.1.sv.po, sv/dpkg-query.1.sv.po, sv/dpkg-split.1.sv.po,
+	sv/dselect.1.sv.po, sv/dselect.cfg.5.sv.po,
+	sv/start-stop-daemon.8.sv.po: Began updating the Swedish
+	translation.
 
 
 2006-05-14  Philippe Batailler <philippe.batailler@free.fr>
 2006-05-14  Philippe Batailler <philippe.batailler@free.fr>