Disambiguate in install-info.8 the use of 'Info directory' with

'Info dir file'. Closes: #420766

diff --git a/debian/changelog b/debian/changelog
index 60c30bd674cc188471baf1a055564182813d4608..e74c7ca19605b6fe7eed16879d6403ef32145197 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ dpkg (1.14.3) UNRELEASED; urgency=low
   * Document in install-info.8 that when no '--section' option is specified,
     install-info will try to use the INFO-DIR-SECTION entry from the info
     file. Add missing commas. Thanks to Kurt B. Kaiser. Closes: #397737
+  * Disambiguate in install-info.8 the use of 'Info directory' with
+    'Info dir file'. Closes: #420766
 
   [ Updated dpkg-dev translations ]
   * French (Frédéric Bothamy). Closes: #423392

diff --git a/man/ChangeLog b/man/ChangeLog
index 72dde4f0eb9c45747570b4e955abb5af0101e14d..755b991d1598d420c568d7e71691f2517006c973 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15  Guillem Jover  <guillem@debian.org>
+
+       * install-info.8: Disambiguate the use of 'Info directory' with 'Info
+       dir file'.
+
 2007-05-15  Kurt B. Kaiser  <kbk@shore.net>
 
        * install-info.8: Add missing commas, and information on the behaviour

diff --git a/man/install-info.8 b/man/install-info.8
index 3c7f55666feaee663ebabaff010abd7af8827baf..ad44adcb0b6b3b3f84085db969c59c49fe238de2 100644 (file)
--- a/man/install-info.8
+++ b/man/install-info.8
@@ -4,7 +4,7 @@
 .\" or later for copying conditions.  There is NO warranty.
 .TH install\-info 8 "2007-05-15" "Debian Project" "dpkg utilities"
 .SH NAME
-install\-info - create or update entry in Info directory
+install\-info - create or update entry in Info dir file
 .
 .SH SYNOPSIS
 .B install\-info
@@ -24,7 +24,7 @@ install\-info - create or update entry in Info directory
 .
 .SH DESCRIPTION
 .B install\-info
-makes, updates or removes entries in the Info directory, the
+creates, updates or removes entries in the Info
 .B dir
 file. When updating or creating entries, if no description is
 specified on the command line or in the Info file, it attempts to guess
@@ -270,8 +270,8 @@ is omitted, no check on the menu entry is done.
 Inhibits the replacement of existing entries and the removal of empty
 sections.
 
-If the file being installed already has an entry in the directory, the
-old entry will be left alone instead of being replaced; the default is
+If the file being installed already has an entry in the Info \fBdir\fP file,
+the old entry will be left alone instead of being replaced; the default is
 to overwrite any old entry found with the newly generated one.
 
 If
@@ -280,7 +280,7 @@ will prevent the removal of the section heading which would otherwise
 happen if the section is made empty by the removal.
 .TP
 .B \-\-test
-Enables test mode, which inhibits the update of the directory file.
+Enables test mode, which inhibits the update of the Info \fBdir\fP file.
 .TP
 .B \-\-debug
 Enables debugging mode, in which the results of some internal