shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

delta: fix spelling of overridden

Browse Source
This commit is contained in:
Nis Martensen 2012-05-16 22:49:30 +02:00 committed by Lennart Poettering
parent 4d768ced49
commit 386da8589b
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/journald.conf.xml
View File

@ -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>

12
man/systemd-delta.xml
View File

@ -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>

24
src/delta/delta.c
View File

@ -39,11 +39,11 @@ static enum {
SHOW_MASKED = 1 << 0,
SHOW_EQUIVALENT = 1 << 1,
SHOW_REDIRECTED = 1 << 2,
SHOW_OVERRIDEN = 1 << 3,
SHOW_OVERRIDDEN = 1 << 3,
SHOW_UNCHANGED = 1 << 4,
SHOW_DEFAULTS =
(SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDEN)
(SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN)
} arg_flags = 0;
static int equivalent(const char *a, const char *b) {
@ -91,11 +91,11 @@ static int notify_override_redirected(const char *top, const char *bottom) {
return 1;
}
static int notify_override_overriden(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_OVERRIDEN))
static int notify_override_overridden(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_OVERRIDDEN))
return 0;
printf(ANSI_HIGHLIGHT_ON "[OVERRIDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
printf(ANSI_HIGHLIGHT_ON "[OVERRIDDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
return 1;
}
@ -131,7 +131,7 @@ static int found_override(const char *top, const char *bottom) {
goto finish;
}
notify_override_overriden(top, bottom);
notify_override_overridden(top, bottom);
if (!arg_diff)
goto finish;
@ -324,7 +324,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);
}
@ -340,8 +340,8 @@ static int parse_flags(const char *flag_str, int flags) {
flags |= SHOW_EQUIVALENT;
else if (strncmp("redirected", w, l) == 0)
flags |= SHOW_REDIRECTED;
else if (strncmp("overriden", w, l) == 0)
flags |= SHOW_OVERRIDEN;
else if (strncmp("overridden", w, l) == 0)
flags |= SHOW_OVERRIDDEN;
else if (strncmp("unchanged", w, l) == 0)
flags |= SHOW_UNCHANGED;
else if (strncmp("default", w, l) == 0)
@ -472,9 +472,9 @@ int main(int argc, char *argv[]) {
arg_flags = SHOW_DEFAULTS;
if (arg_diff < 0)
arg_diff = !!(arg_flags & SHOW_OVERRIDEN);
arg_diff = !!(arg_flags & SHOW_OVERRIDDEN);
else if (arg_diff)
arg_flags |= SHOW_OVERRIDEN;
arg_flags |= SHOW_OVERRIDDEN;
if (!arg_no_pager)
pager_open();
@ -503,7 +503,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();

2
src/systemctl/systemctl.c
View File

@ -4304,7 +4304,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",