[Pkg-sysvinit-commits] r1535 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 18:14:21 +0000 (Fri, 24 Jul 2009)
New Revision: 1535

Added:
   sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
Modify shutdown(8) manual page to make it more clear when -c
work (Closes: #374038).  Based on text proposal from Dan Jacobson.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 14:29:28 UTC (rev 1534)
+++ sysvinit/trunk/debian/changelog	2009-07-24 18:14:21 UTC (rev 1535)
@@ -47,6 +47,8 @@
     - Drop patch 92_sata-hddown now included upstream.
     - Drop patch 93_sulogin_fallback now included upstream.
     - Drop patch 95_halt-name now included upstream.
+  * Modify shutdown(8) manual page to make it more clear when -c
+    work (Closes: #374038).  Based on text proposal from Dan Jacobson.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 24 Jul 2009 11:26:26 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 14:29:28 UTC (rev 1534)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 18:14:21 UTC (rev 1535)
@@ -1,4 +1,5 @@
 10_doc_manuals
+11_doc_shutdown-c
 # 12_doc_lastb patch is reported to be incorrect.
 #12_doc_lastb
 14_doc_fsf_addr

Added: sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch	2009-07-24 18:14:21 UTC (rev 1535)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_doc_shutdown-c.dpatch by Petter Reinholdtsen, based on text
+## proposal from Dan Jacobson
+
+Make it clear that shutdown -c can only cancel a waiting shutdown, not
+an active one.
+
+BTS:    #374038
+Status: not sent upstream
+
+ at DPATCH@
+Index: a/man/shutdown.8
+===================================================================
+--- a/man/shutdown.8	(revision 1485)
++++ b/man/shutdown.8	(working copy)
+@@ -81,9 +81,10 @@
+ .\"}}}
+ .\"{{{  -c
+ .IP \fB\-c\fP
+-Cancel an already running shutdown. With this option it is of course
+-not possible to give the \fBtime\fP argument, but you can enter a
+-explanatory message on the command line that will be sent to all users.
++Cancel a waiting shutdown. ("shutdown now" is no longer waiting.) With
++this option it is of course not possible to give the time argument, but
++you can enter explanatory message arguments on the command line that
++will be sent to all users.
+ .\"}}}
+ .\"{{{  time
+ .IP \fItime\fP


Property changes on: sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
___________________________________________________________________
Added: svn:executable
   + *