Am 16.05.2012 18:38, schrieb Gergely Nagy: > The available modifiers are masked, equivalent, redirected, overriden, > and unchanged - they should be self explanatory, and the man page > explains them in a little more detail anyway.
You may want to add another d to override the spell checker, though. Follow-up patch attached.
From bb83c8fadbdeed2fe62fa1066512d10431bc0564 Mon Sep 17 00:00:00 2001 From: Nis Martensen <[email protected]> Date: Wed, 16 May 2012 22:49:30 +0200 Subject: [PATCH] delta: fix spelling of overridden --- man/journald.conf.xml | 2 +- man/systemd-delta.xml | 12 ++++++------ src/delta/delta.c | 18 +++++++++--------- src/systemctl/systemctl.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 251e01d..cce945b 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -208,7 +208,7 @@ is running the respective option has no effect. By default only forwarding to syslog is enabled. These settings - may be overriden at boot time with the + may be overridden at boot time with the kernel command line options <literal>systemd_journald.forward_to_syslog=</literal>, <literal>systemd_journald.forward_to_kmsg=</literal> diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 03c7178..523b590 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -67,7 +67,7 @@ <filename>systemd/system</filename>.</para> <para>When no argument is specified a number of - well-known subdirectories are searched for overriden + well-known subdirectories are searched for overridden files.</para> </refsect1> @@ -121,8 +121,8 @@ <varlistentry> <term><varname>equivalent</varname></term> - <listitem><para>Show overriden - files that while overriden, do + <listitem><para>Show overridden + files that while overridden, do not differ in content.</para></listitem> </varlistentry> @@ -134,9 +134,9 @@ </varlistentry> <varlistentry> - <term><varname>overriden</varname></term> + <term><varname>overridden</varname></term> - <listitem><para>Show overriden, + <listitem><para>Show overridden, and changed files.</para></listitem> </varlistentry> @@ -154,7 +154,7 @@ <term><option>--diff=</option></term> <listitem><para>When showing modified - files, when a file is overriden show a + files, when a file is overridden show a diff aswell. This option takes a boolean argument.</para></listitem> </varlistentry> diff --git a/src/delta/delta.c b/src/delta/delta.c index 7b50bce..fa7ab7d 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -38,12 +38,12 @@ enum { SHOW_MASKED = 1 << 0, SHOW_EQUIV = 1 << 1, SHOW_REDIR = 1 << 2, - SHOW_OVERRIDEN = 1 << 3, + SHOW_OVERRIDDEN = 1 << 3, SHOW_UNCHANGED = 1 << 4, SHOW_DIFF = 1 << 5, SHOW_DEFAULTS = - (SHOW_MASKED | SHOW_EQUIV | SHOW_REDIR | SHOW_OVERRIDEN | SHOW_DIFF) + (SHOW_MASKED | SHOW_EQUIV | SHOW_REDIR | SHOW_OVERRIDDEN | SHOW_DIFF) }; static int equivalent(const char *a, const char *b) { @@ -93,8 +93,8 @@ static int notify_override_redir(int flags, const char *top, const char *bottom) return 1; } -static int notify_override_overriden(int flags, const char *top, const char *bottom) { - if (!(flags & SHOW_OVERRIDEN)) +static int notify_override_overridden(int flags, const char *top, const char *bottom) { + if (!(flags & SHOW_OVERRIDDEN)) return 0; printf(ANSI_HIGHLIGHT_ON "[OVERRIDE]" ANSI_HIGHLIGHT_OFF " %s â %s\n", top, bottom); @@ -133,7 +133,7 @@ static int found_override(int flags, const char *top, const char *bottom) { goto finish; } - notify_override_overriden(flags, top, bottom); + notify_override_overridden(flags, top, bottom); if (!(flags & SHOW_DIFF)) goto finish; @@ -326,7 +326,7 @@ static void help(void) { " -h --help Show this help\n" " --version Show package version\n" " --no-pager Do not pipe output into a pager\n" - " --diff[=1|0] Show a diff when overriden files differ\n" + " --diff[=1|0] Show a diff when overridden files differ\n" " -t --type=LIST... Only display a selected set of override types\n", program_invocation_short_name); } @@ -343,7 +343,7 @@ static int parse_flags(int flags, const char *flag_str) { } else if (strncmp("redirected", w, l) == 0) { flags |= SHOW_REDIR; } else if (strncmp("override", w, l) == 0) { - flags |= SHOW_OVERRIDEN; + flags |= SHOW_OVERRIDDEN; } else if (strncmp("unchanged", w, l) == 0) { flags |= SHOW_UNCHANGED; } else if (strncmp("default", w, l) == 0) { @@ -465,7 +465,7 @@ int main(int argc, char *argv[]) { if (flags == 0) flags = SHOW_DEFAULTS; if (flags == SHOW_DIFF) - flags |= SHOW_OVERRIDEN; + flags |= SHOW_OVERRIDDEN; if (!arg_no_pager) pager_open(); @@ -494,7 +494,7 @@ int main(int argc, char *argv[]) { } if (r >= 0) - printf("\n%i overriden configuration files found.\n", n_found); + printf("\n%i overridden configuration files found.\n", n_found); finish: pager_close(); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 0034c55..160e5d7 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4316,7 +4316,7 @@ static int shutdown_help(void) { " -H --halt Halt the machine\n" " -P --poweroff Power-off the machine\n" " -r --reboot Reboot the machine\n" - " -h Equivalent to --poweroff, overriden by --halt\n" + " -h Equivalent to --poweroff, overridden by --halt\n" " -k Don't halt/power-off/reboot, just send warnings\n" " --no-wall Don't send wall message before halt/power-off/reboot\n" " -c Cancel a pending shutdown\n", -- 1.7.2.5
_______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
