Fix inconsistencies/typos in help text, man pages

diff --git a/doc/manpages/dinit.8.m4 b/doc/manpages/dinit.8.m4
index 0da6cdde79a86e3b700e77a6413838364cbb0e1b..5e1222a6f826b183810ede2b207690d2f920cc22 100644 (file)
--- a/doc/manpages/dinit.8.m4
+++ b/doc/manpages/dinit.8.m4
@@ -77,7 +77,7 @@ Run with no output to the terminal/console. This disables service status message
 and sets the log level for the console log to \fBNONE\fR.
 .TP
 \fB\-\-help\fR
-display this help and exit
+Display brief help text and then exit.
 .TP
 \fIservice-name\fR
 Specifies the name of a service that should be started (along with its

diff --git a/doc/manpages/dinitctl.8.m4 b/doc/manpages/dinitctl.8.m4
index 655953db3cd51e85a53831988aeca5107e131532..14714ca4634a1479ce5635a61a3f55b3d972e211 100644 (file)
--- a/doc/manpages/dinitctl.8.m4
+++ b/doc/manpages/dinitctl.8.m4
@@ -54,7 +54,7 @@ via a control socket.
 .SH GENERAL OPTIONS
 .TP
 \fB\-\-help\fR
-display this help and exit
+Display brief help text and then exit.
 .TP
 \fB\-s\fR, \fB\-\-system\fR
 Control the system init process (this is the default unless run as a non-root user). This option

diff --git a/doc/manpages/shutdown.8.m4 b/doc/manpages/shutdown.8.m4
index 37b15b83814c73b1025b7c9eb5f57ff9fc9292ec..444793410b03b159c0ccdf66ac3ef7c862401ad5 100644 (file)
--- a/doc/manpages/shutdown.8.m4
+++ b/doc/manpages/shutdown.8.m4
@@ -23,11 +23,14 @@ manager daemon to perform a service rollback and then to shutdown the
 system. They can also perform shutdown directly, without service rollback.
 
 Note that for consistency with other packages a "halt" alias is provided,
-however it has no special significance. Note that the default action is to
-power down the system.
+however it has no special significance. The default action is to power down
+the system if called as either "shutdown" or "halt".
 .\"
 .SH OPTIONS
 .TP
+\fB\-\-help\fR
+Display brief help text and then exit.
+.TP
 \fB\-r\fP
 Request a shutdown followed by restart. This is the default if executed as
 \fBreboot\fR.
@@ -42,7 +45,7 @@ as \fBreboot\fR.
 \fB\-\-use\-passed\-cfd\fR
 Instead of attempting to open a socket connection to the service daemon,
 use a pre-opened connection that has been passed to the process from its parent
-via an open file descriptor. The file descriptor with the connection is identifed
+via an open file descriptor. The file descriptor with the connection is identified
 by the DINIT_CS_FD environment variable.
 .TP
 \fB\-\-system\fR

diff --git a/src/dinit.cc b/src/dinit.cc
index 7de61560c0b0942fa26e37098595df17367f4138..4550ddcb269b2a5c4795ec2549af6c664421e35a 100644 (file)
--- a/src/dinit.cc
+++ b/src/dinit.cc
@@ -256,7 +256,7 @@ int dinit_main(int argc, char **argv)
                             "                              environment variable initialisation file\n"
                             " --services-dir <dir>, -d <dir>\n"
                             "                              set base directory for service description\n"
-                            "                              files (-d <dir>)\n"
+                            "                              files\n"
                             " --system, -s                 run as the system service manager\n"
                             " --user, -u                   run as a user service manager\n"
                             " --socket-path <path>, -p <path>\n"
@@ -392,7 +392,7 @@ int dinit_main(int argc, char **argv)
 
     init_log(services, log_is_syslog);
     if (am_system_init) {
-        log(loglevel_t::INFO, false, "starting system");
+        log(loglevel_t::INFO, false, "Starting system");
     }
     
     // Only try to set up the external log now if we aren't the system init. (If we are the