use FHS instead of FSSTND

diff --git a/ChangeLog b/ChangeLog
index d2ddd9d96f0e1f8f5082f9893d84477196e83ec5..c4f0652f3e6fff4345b98537f78c488bb6add336 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ Sat Dec 23 02:11:27 CST 2000 Adam Heath <doogie@debian.org>
 
   * scripts/dpkg-buildpackage.sh: Add -t to -h output.
 
+Fri Dec 22 12:35:43 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/update-alternatives.8: use FHS instead of FSSTND
+
 Thu Dec 21 19:30:56 CET 2000 peter karlsson <peterk@debian.org>
 
   * po/sv.po, doc/sv/dpkg.8: The "Even Merrier Christmas" update of the
@@ -41,6 +45,7 @@ Thu Dec 21 06:58:21 CET 2000 peter karlsson <peterk@debian.org>
 
   * po/sv.po: The "Merry Christmas" update of the Swedish translation.
 
+>>>>>>> 1.261
 Wed Dec 20 12:50:55 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * main/processarc.c: revert change from Adam: reading the trailing

diff --git a/debian/changelog b/debian/changelog
index 394a3dfbb474ccf61084780b7298019a036e8bca..798df0fafb25e28eb141a4ffa3481da929bab3ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ dpkg (1.8.0) unstable; urgency=low
     Closes: Bug#79352
   * Be more paranoid with file permissions when extracing files
   * Apply statoverrides to more then just files
+  * Update update-alternatives manpage to use FHS instead of FSSTND.
+    Closes: Bug#80237
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/update-alternatives.8 b/scripts/update-alternatives.8
index dc97b5b1c2eaf0cae43cace68cf97c150cbba814..eee016b1fefe6c60a4d78f0edcdbabb173866f63 100644 (file)
--- a/scripts/update-alternatives.8
+++ b/scripts/update-alternatives.8
@@ -5,7 +5,7 @@
 .\" by the Free Software Foundation; either version 2 of the License, or
 .\" (at your option) any later version.  There is NO WARRANTY.  You can
 .\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
-.TH UPDATE-ALTERNATIVES 8 "19 January 1998" "DEBIAN" "Debian GNU/Linux"
+.TH UPDATE-ALTERNATIVES 8 "19 January 1998" "Debian Project" "dpkg utilities"
 .SH NAME
 update-alternatives \- maintain symbolic links determining default commands
 .SH SYNOPSIS
@@ -79,7 +79,7 @@ which in turn is a symbolic link to the actual file referenced.
 This is done so that the system administrator's changes can be confined
 within the
 .I /etc
-directory: the FSSTND (q.v.) gives reasons why this is a Good Thing.
+directory: the FHS (q.v.) gives reasons why this is a Good Thing.
 .PP
 When each package
 providing a file with a particular functionality is
@@ -98,7 +98,7 @@ so that they are changed as a group; for example, when several versions
 of the
 .BR vi (1)
 editor are installed, the man page referenced by
-.I /usr/man/man1/vi.1
+.I /usr/share/man/man1/vi.1
 should correspond to the executable referenced by
 .IR /usr/bin/vi .
 .B update-alternatives
@@ -348,10 +348,9 @@ or, if that is not possible, email the author directly.
 If you find any discrepancy between the operation of
 .B update-alternatives
 and this manual page, it is a bug,
-either in the implementation or the documentation;
-please report it.
+either in the implementation or the documentation; please report it.
 .SH AUTHOR
-Debian GNU/Linux update-alternatives is copyright 1995
+Debian update-alternatives is copyright 1995
 Ian Jackson.  It is free software; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO warranty.
 .PP
@@ -360,7 +359,6 @@ This is free documentation; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO WARRANTY.
 .PP
 You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
-.\" .SH ACKNOWLEDGEMENTS
 .SH "SEE ALSO"
 .BR ln (1),
-FSSTND, the linux Filesystem Standard.
+FHS, the Filesystem Hierarchy Standard.