From d905aa4b83b8ae12e75c469a7b200bb23b51ae45 Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Thu, 21 Nov 2019 18:44:14 +0000 Subject: [PATCH] Fix inconsistencies/typos in help text, man pages --- doc/manpages/dinit.8.m4 | 2 +- doc/manpages/dinitctl.8.m4 | 2 +- doc/manpages/shutdown.8.m4 | 9 ++++++--- src/dinit.cc | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/manpages/dinit.8.m4 b/doc/manpages/dinit.8.m4 index 0da6cdd..5e1222a 100644 --- 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 655953d..14714ca 100644 --- 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 37b15b8..4447934 100644 --- 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 7de6156..4550ddc 100644 --- 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 , -d \n" " set base directory for service description\n" - " files (-d )\n" + " files\n" " --system, -s run as the system service manager\n" " --user, -u run as a user service manager\n" " --socket-path , -p \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 -- 2.25.1