summaryrefslogtreecommitdiff
path: root/man/daemon.xml
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-05-06 16:41:34 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-05-06 16:41:34 -0400
commita75bfac699bdc238eedc78dcdb0ee3ce533cd854 (patch)
tree3c7d4a456920dc1191998a235f6957a772a9963d /man/daemon.xml
parent3384b776817808f01979ce192603d0c901391fd4 (diff)
parent98cad0ba37f0123763df77c3f51a6a222026d08b (diff)
Merge tag 'systemd/v232-6.parabola1'systemd/v232-8.parabola2
Diffstat (limited to 'man/daemon.xml')
-rw-r--r--man/daemon.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/man/daemon.xml b/man/daemon.xml
index 485c66225e..a649749683 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -168,7 +168,7 @@
<refsect2>
<title>New-Style Daemons</title>
- <para>Modern services for Linux should be implemented as
+ <para>Modern services for GNU/Linux should be implemented as
new-style daemons. This makes it easier to supervise and control
them at runtime and simplifies their implementation.</para>
@@ -309,7 +309,7 @@
as detailed in the <ulink
url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
Linux Standard Base Core Specification</ulink>. This method of
- activation is supported ubiquitously on Linux init systems, both
+ activation is supported ubiquitously on GNU/Linux init systems, both
old-style and new-style systems. Among other issues, SysV init
scripts have the disadvantage of involving shell scripts in the
boot process. New-style init systems generally employ updated