summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-09-13 13:31:20 +0900
committerGitHub <noreply@github.com>2019-09-13 13:31:20 +0900
commit5dcd46dd53a42f75a86056b749e3f83b140ae0c7 (patch)
tree2d104b1f49e307a82a2aab1e8f17f7df0ec17402
parentd7cf4984b0e3255ef9d6872c96a210271b0c949a (diff)
parentea2552639b22004c89df26f2374e3d3f1d2acace (diff)
downloadsystemd-5dcd46dd53a42f75a86056b749e3f83b140ae0c7.tar.gz
Merge pull request #13538 from keszybz/doc-tweaks
Various minor tweaks that don't deserve seperate pull requests
-rw-r--r--TODO5
-rw-r--r--man/systemd.netdev.xml4
-rw-r--r--man/systemd.unit.xml2
-rw-r--r--po/ja.po2
-rw-r--r--po/pl.po2
-rw-r--r--src/network/org.freedesktop.network1.policy4
-rw-r--r--src/resolve/org.freedesktop.resolve1.policy2
7 files changed, 13 insertions, 8 deletions
diff --git a/TODO b/TODO
index c5b5b86057..4679be1e65 100644
--- a/TODO
+++ b/TODO
@@ -1107,6 +1107,11 @@ External:
- <command> <verb> -<TAB> should complete options, but currently does not
- systemctl add-wants,add-requires
+* systemctl status foo.service should say that it is trigger by foo.timer
+* systemctl status should know about 'systemd-analyze calendar ... --iterations='
+* systemctl list-timers foo should use .timer suffix by default
+* If timer has just OnInactiveSec=..., it should fire after a specified time
+ after being started.
Regularly:
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 0775e00bd2..43133559b3 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1742,8 +1742,8 @@
<varlistentry>
<term><varname>ARPIntervalSec=</varname></term>
<listitem>
- <para>Specifies the ARP link monitoring frequency in milliseconds.
- A value of 0 disables ARP monitoring. The default value is 0.
+ <para>Specifies the ARP link monitoring frequency. A value of 0 disables ARP monitoring. The
+ default value is 0, and the default unit seconds.
</para>
</listitem>
</varlistentry>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index acb09d005d..d812108d3c 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -163,7 +163,7 @@
<varname>Wants=</varname>, see below. The preferred way to create symlinks in the
<filename>.wants/</filename> or <filename>.requires/</filename> directory of a unit file is by embedding
the dependency in [Install] section of the target unit, and creating the symlink in the file system with
- the with the <command>enable</command> or <command>preset</command> commands of
+ the <command>enable</command> or <command>preset</command> commands of
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
<para>Along with a unit file <filename>foo.service</filename>, a "drop-in" directory
diff --git a/po/ja.po b/po/ja.po
index db493bb65c..6b550b17dd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -700,7 +700,7 @@ msgid "Revert name resolution settings"
msgstr "名前解決の設定の破棄"
#: src/resolve/org.freedesktop.resolve1.policy:133
-msgid "Authentication is required to revert name resolution settings."
+msgid "Authentication is required to reset name resolution settings."
msgstr "名前解決の設定を破棄するには認証が必要です。"
#: src/timedate/org.freedesktop.timedate1.policy:22
diff --git a/po/pl.po b/po/pl.po
index 7d095ba577..1d0622f370 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -760,7 +760,7 @@ msgid "Revert name resolution settings"
msgstr "Przywrócenie ustawień rozwiązywania nazw"
#: src/resolve/org.freedesktop.resolve1.policy:133
-msgid "Authentication is required to revert name resolution settings."
+msgid "Authentication is required to reset name resolution settings."
msgstr ""
"Wymagane jest uwierzytelnienie, aby przywrócić ustawienia rozwiązywania nazw."
diff --git a/src/network/org.freedesktop.network1.policy b/src/network/org.freedesktop.network1.policy
index 07091bffe5..9babae89a5 100644
--- a/src/network/org.freedesktop.network1.policy
+++ b/src/network/org.freedesktop.network1.policy
@@ -119,7 +119,7 @@
<action id="org.freedesktop.network1.revert-ntp">
<description gettext-domain="systemd">Revert NTP settings</description>
- <message gettext-domain="systemd">Authentication is required to revert NTP settings.</message>
+ <message gettext-domain="systemd">Authentication is required to reset NTP settings.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -130,7 +130,7 @@
<action id="org.freedesktop.network1.revert-dns">
<description gettext-domain="systemd">Revert DNS settings</description>
- <message gettext-domain="systemd">Authentication is required to revert DNS settings.</message>
+ <message gettext-domain="systemd">Authentication is required to reset DNS settings.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
diff --git a/src/resolve/org.freedesktop.resolve1.policy b/src/resolve/org.freedesktop.resolve1.policy
index 592c4eb8b0..dc46987adf 100644
--- a/src/resolve/org.freedesktop.resolve1.policy
+++ b/src/resolve/org.freedesktop.resolve1.policy
@@ -130,7 +130,7 @@
<action id="org.freedesktop.resolve1.revert">
<description gettext-domain="systemd">Revert name resolution settings</description>
- <message gettext-domain="systemd">Authentication is required to revert name resolution settings.</message>
+ <message gettext-domain="systemd">Authentication is required to reset name resolution settings.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>