diff options
| author | Ronny Chevalier <chevalier.ronny@gmail.com> | 2015-11-02 23:27:49 +0100 |
|---|---|---|
| committer | Ronny Chevalier <chevalier.ronny@gmail.com> | 2015-11-02 23:27:49 +0100 |
| commit | 3342582deb95b6e364541435654eb8f6fa320f40 (patch) | |
| tree | 53d393ef55771fdd71662c5c433720016dd71cb7 | |
| parent | 5732a7dbb0efa79cc36c6864a4af2e98685b53d6 (diff) | |
| parent | 859fdd1eeab7f403c761dde79e168805f43fcf89 (diff) | |
Merge pull request #1757 from phomes/minor-fixes
Minor fixes
| -rw-r--r-- | man/journalctl.xml | 8 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 2 | ||||
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml index 9784b9f2a8..ea319ba373 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -395,7 +395,7 @@ <para>If the boot ID is omitted, a positive <replaceable>offset</replaceable> will look up the boots - starting from the beginning of the journal, and a + starting from the beginning of the journal, and an equal-or-less-than zero <replaceable>offset</replaceable> will look up boots starting from the end of the journal. Thus, <constant>1</constant> means the first boot found in the @@ -413,7 +413,7 @@ <replaceable>offset</replaceable> which identifies the boot relative to the one given by boot <replaceable>ID</replaceable>. Negative values mean earlier - boots and a positive values mean later boots. If + boots and positive values mean later boots. If <replaceable>offset</replaceable> is not specified, a value of zero is assumed, and the logs for the boot given by <replaceable>ID</replaceable> are shown.</para> @@ -520,7 +520,7 @@ <listitem><para>Start showing entries from the location in the journal <emphasis>after</emphasis> the location specified by - the this cursor. The cursor is shown when the + the passed cursor. The cursor is shown when the <option>--show-cursor</option> option is used.</para> </listitem> </varlistentry> @@ -666,7 +666,7 @@ remain. Note that running <option>--vacuum-size=</option> has only indirect effect on the output shown by <option>--disk-usage</option> as the latter includes active - journal files, while the the vacuuming operation only operates + journal files, while the vacuuming operation only operates on archived journal files. Similar, <option>--vacuum-files=</option> might not actually reduce the number of journal files to below the specified number, as it diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 5f99fa875e..c0ecf92419 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -994,7 +994,7 @@ <listitem><para>Takes a <option>SMACK64</option> security label as argument. The process executed by the unit will be started under this label and SMACK will decide whether the - processes is allowed to run or not based on it. The process + process is allowed to run or not based on it. The process will continue to run under the label specified here unless the executable has its own <option>SMACK64EXEC</option> label, in which case the process will transition to run under that diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index b2d53d3b4f..042be97840 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -530,7 +530,7 @@ static int load_sysv(SysvStub *s) { if (startswith_no_case(t, "description:")) { size_t k; - const const char *j; + const char *j; k = strlen(t); if (k > 0 && t[k-1] == '\\') { |