Changed documentation and help, as -f only applies during remove.

diff --git a/ChangeLog b/ChangeLog
index 4b00f8c88c85e4e4e3541eeec6061b134d553f67..114cfb8d4a108d142258fbefb94bb261e58beb22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 24 05:24:23 CST 2000 Adam Heath <doogie@debian.org>
+
+  * scripts/update-rc.d: Changed documentation and help, as -f only
+    applies during remove.
+
 Sun Dec 24 05:10:29 CST 2000 Adam Heath <doogie@debian.org>
 
   * main/main.c: Added a --force-all option.

diff --git a/debian/changelog b/debian/changelog
index 9bab6ad42dc40583cf3f8b128f2c1ae47908b214..ba583f1c2ae9f74edc7cb1928d972612ac3c65f1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dpkg (1.8.0) unstable; urgency=low
 
+  * update-rc.d: Changed documentation and help, as -f only applies during
+    remove.  Closes: #55049.
   * Added a --force-all option.  Closes: #61354.
   * Format help string for --abort-after like other option help strings.
     Closes: #62464.

diff --git a/scripts/update-rc.d.8 b/scripts/update-rc.d.8
index ba7909a35de7dd785d4cab37b181123baeb1e13a..46277f0528e4e55d25b2307135ec56a453c837b2 100644 (file)
--- a/scripts/update-rc.d.8
+++ b/scripts/update-rc.d.8
@@ -11,13 +11,11 @@ update\-rc.d \- install and remove System-V style init script links
 .HP
 .B update-rc.d
 .RI [ -n ]
-.RI [ -f ]
 .IB name " defaults"
 .RI [ NN " | " NN-start " " NN-stop ]
 .HP
 .B update-rc.d
 .RI [ -n ]
-.RI [ -f ]
 .I name
 .BR start | stop
 .IR "NN runlevel runlevel " ...

diff --git a/scripts/update-rc.d.pl b/scripts/update-rc.d.pl
index ac9a1ae2497f318c52f60b121c83285d7cfde623..a5e52e41964088322c60dda0c026b49744485ddd 100644 (file)
--- a/scripts/update-rc.d.pl
+++ b/scripts/update-rc.d.pl
@@ -15,8 +15,8 @@ sub usage {
        print STDERR "update-rc.d: error: @_\n" if ($#_ >= 0);
        print STDERR <<EOF;
 usage: update-rc.d [-n] [-f] <basename> remove
-       update-rc.d [-n] [-f] <basename> defaults [NN | sNN kNN]
-       update-rc.d [-n] [-f] <basename> start|stop NN runlvl runlvl .  ...
+       update-rc.d [-n] <basename> defaults [NN | sNN kNN]
+       update-rc.d [-n] <basename> start|stop NN runlvl runlvl .  ...
                -n: not really
                -f: force
 EOF