diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-27 17:33:23 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-27 17:37:22 +0300 |
commit | 78ce47f7621ddd68e46a75422051ce6131d3e66d (patch) | |
tree | b489db89691d1679d8d061b537050d7f89b79f19 | |
parent | ee5f5478583d33f0f092909e3bb8d306edc07b45 (diff) | |
download | pies-78ce47f7621ddd68e46a75422051ce6131d3e66d.tar.gz pies-78ce47f7621ddd68e46a75422051ce6131d3e66d.tar.bz2 |
Fix diagnostic and help messages.
1. Option descriptions in `--help' output do not constitute
conceptual sentences. Therefore, they should not begin
with a capital letter, nor end with a final point.
2. According to standards.texi, a diagnostic message in a
non-interactive program "should not begin with a capital letter
when it follows a program name and/or file name, because that
isn't the beginning of a sentence. (The sentence conceptually
starts at the beginning of the line.) Also, it should not end
with a period."
Affected files:
* gacopyz/gacopyz.c
* gacopyz/proc.c
* gacopyz/server.c
* gacopyz/smfi.c
* mfd/bi_db.m4
* mfd/bi_dns.m4
* mfd/bi_io.m4
* mfd/bi_ipaddr.m4
* mfd/bi_mail.m4
* mfd/bi_other.m4
* mfd/bi_poll.m4
* mfd/bi_sa.m4
* mfd/bi_string.m4
* mfd/cache.c
* mfd/db.c
* mfd/dnscache.c
* mfd/drivers.c
* mfd/engine.c
* mfd/gram.y
* mfd/lex.l
* mfd/main.c
* mfd/mu_dbm.c
* mfd/optab.opc
* mfd/prog.c
* mfd/rate.c
* mfd/symtab.c
* mtasim/mtasim.c
* mtasim/openat-die.c
* pies/pies.c
* pies/progman.c
* pmult/pmult.c
* smap/smap.c
* tests/ashadow.at
* tests/bctx00.at
* tests/fctx00.at
* tests/hdr-gete.at
* tests/invcidr.at
* tests/invcidr2.at
* tests/shadow.at
-rw-r--r-- | pies/pies.c | 42 | ||||
-rw-r--r-- | pies/progman.c | 12 |
2 files changed, 27 insertions, 27 deletions
diff --git a/pies/pies.c b/pies/pies.c index 04a5946..5e8151a 100644 --- a/pies/pies.c +++ b/pies/pies.c @@ -1,5 +1,5 @@ /* This file is part of Mailfromd. - Copyright (C) 2008 Sergey Poznyakoff + Copyright (C) 2008, 2009 Sergey Poznyakoff This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -450,7 +450,7 @@ _cb_umask (mu_debug_t debug, void *data, mu_config_value_t *arg) if (*p) { mu_cfg_format_error (debug, MU_DEBUG_ERROR, - _("Invalid octal number")); + _("invalid octal number")); return 1; } *pmode = n; @@ -500,7 +500,7 @@ _cb_facility (mu_debug_t debug, void *data, mu_config_value_t *val) if (mu_string_to_syslog_facility (val->v.string, data)) { mu_cfg_format_error (debug, MU_DEBUG_ERROR, - _("Unknown syslog facility `%s'"), + _("unknown syslog facility `%s'"), val->v.string); return 1; } @@ -531,7 +531,7 @@ _cb_redir (mu_debug_t debug, void *data, mu_config_value_t *arg) if (mu_string_to_syslog_priority (arg->v.string, &rp->v.prio)) { mu_cfg_format_error (debug, MU_DEBUG_ERROR, - _("Unknown syslog priority `%s'"), + _("unknown syslog priority `%s'"), arg); return 0; } @@ -568,7 +568,7 @@ _cb_redir (mu_debug_t debug, void *data, mu_config_value_t *arg) &rp->v.prio)) { mu_cfg_format_error (debug, MU_DEBUG_ERROR, - _("Unknown syslog priority `%s'"), + _("unknown syslog priority `%s'"), arg->v.arg.v[1].v.string); return 0; } @@ -948,7 +948,7 @@ struct mu_cfg_param pies_cfg_param[] = { N_("Force this umask."), N_("arg: number") }, { "limits", mu_cfg_callback, &pies_limits, 0, _cb_limits, - N_("Set global system limits") }, + N_("Set global system limits.") }, { "shutdown-timeout", mu_cfg_uint, &shutdown_timeout, 0, NULL, N_("Wait <n> seconds for all components to shut down."), "n" }, @@ -1014,34 +1014,34 @@ enum { static struct argp_option options[] = { #define GRP 0 - { "foreground", OPT_FOREGROUND, 0, 0, N_("Remain in foreground."), GRP+1}, - { "stderr", OPT_STDERR, NULL, 0, N_("Log to stderr"), }, - { "syslog", OPT_SYSLOG, NULL, 0, N_("Log to syslog"), }, + { "foreground", OPT_FOREGROUND, 0, 0, N_("remain in foreground"), GRP+1}, + { "stderr", OPT_STDERR, NULL, 0, N_("log to stderr"), }, + { "syslog", OPT_SYSLOG, NULL, 0, N_("log to syslog"), }, { "log-tag", OPT_LOG_TAG, N_("STRING"), 0, - N_("Set the identifier used in syslog messages to STRING"), GRP+1 }, + N_("set the identifier used in syslog messages to STRING"), GRP+1 }, { "debug", 'x', N_("LEVEL"), 0, - N_("Set debug verbosity level."), GRP+1 }, + N_("set debug verbosity level"), GRP+1 }, { "force", OPT_FORCE, NULL, 0, - N_("Force startup even if another instance may be running"), GRP+1 }, + N_("force startup even if another instance may be running"), GRP+1 }, #undef GRP #define GRP 10 { "restart-component", OPT_RESTART, NULL, 0, - N_("Restart components named in the command line."), GRP+1 }, + N_("restart components named in the command line"), GRP+1 }, { "reload", OPT_RELOAD, NULL, 0, - N_("Reload the running instance of pies."), GRP+1 }, + N_("reload the running instance of pies "), GRP+1 }, { "hup", 0, NULL, OPTION_ALIAS }, { "status", OPT_STATUS, NULL, 0, - N_("Display info about the running instance."), GRP+1 }, + N_("display info about the running instance "), GRP+1 }, { "stop", OPT_STOP, NULL, 0, - N_("Stop the running instance."), GRP+1 }, + N_("stop the running instance "), GRP+1 }, #undef GRP #define GRP 20 { "dump-prereq", OPT_DUMP_PREREQ, NULL, 0, - N_("Dump prerequisite charts."), GRP+1 }, + N_("dump prerequisite charts"), GRP+1 }, { "dump-depmap", OPT_DUMP_DEPMAP, NULL, 0, - N_("Dump dependency map."), GRP+1 }, + N_("dump dependency map"), GRP+1 }, #undef GRP { NULL } }; @@ -1482,7 +1482,7 @@ main (int argc, char **argv) case pies_status_noresp: if (!force_option) { - mu_error (_("Another pies instance may be running (pid %lu), " + mu_error (_("another pies instance may be running (pid %lu), " "use --force to override"), (unsigned long) pid); exit (EX_USAGE); @@ -1490,7 +1490,7 @@ main (int argc, char **argv) break; case pies_status_running: - mu_error (_("Another pies instance already running (pid %lu)"), + mu_error (_("another pies instance already running (pid %lu)"), (unsigned long) pid); exit (EX_USAGE); } @@ -1506,7 +1506,7 @@ main (int argc, char **argv) rc = mu_daemon_create_pidfile (pidfile); if (rc) - mu_error (_("Cannot create PID file `%s': %s"), + mu_error (_("cannot create PID file `%s': %s"), pidfile, mu_strerror (rc)); if (argv[0][0] != '/') diff --git a/pies/progman.c b/pies/progman.c index 50db913..9383aae 100644 --- a/pies/progman.c +++ b/pies/progman.c @@ -1,5 +1,5 @@ /* This file is part of Mailfromd. - Copyright (C) 2007, 2008 Sergey Poznyakoff + Copyright (C) 2007, 2008, 2009 Sergey Poznyakoff This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -784,7 +784,7 @@ pies_check_acl (mu_acl_t acl, struct sockaddr *s, int salen) if (rc) { char *p = mu_sockaddr_to_astr (s, salen); - mu_error (_("Access from %s blocked: cannot check ACLs: %s"), + mu_error (_("access from %s blocked: cannot check ACLs: %s"), p, mu_strerror (rc)); free (p); return 1; @@ -1379,7 +1379,7 @@ send_msg (mu_address_t rcpt, mu_message_t msg) mu_mailer_get_url_default (&mailer_url); mu_mailer_destroy(&mailer); - mu_error (_("Opening mailer `%s' failed: %s"), + mu_error (_("opening mailer `%s' failed: %s"), mailer_url, mu_strerror (rc)); return; } @@ -1387,7 +1387,7 @@ send_msg (mu_address_t rcpt, mu_message_t msg) rc = mu_mailer_send_message (mailer, msg, NULL, rcpt); mu_mailer_destroy (&mailer); if (rc) - mu_error (_("Cannot send message: %s"), mu_strerror (rc)); + mu_error (_("cannot send message: %s"), mu_strerror (rc)); } static const char default_termination_message[] = @@ -1593,7 +1593,7 @@ progman_cleanup (int expect_term) case action_disable: mu_diag_output (MU_DIAG_NOTICE, - _("Disabling component %s: " + _("disabling component %s: " "exited with code %d"), prog->tag, status); prog->v.p.status = status_disabled; @@ -1726,7 +1726,7 @@ progman_dump_stats (const char *filename) unlink (filename); if (rename (tmpfile, filename)) { - mu_error (_("Cannot rename %s to %s: %s"), tmpfile, filename, + mu_error (_("cannot rename %s to %s: %s"), tmpfile, filename, mu_strerror (errno)); unlink (tmpfile); } |