summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:19:20 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:34:59 -0400
commit64713f35b5a75b441ab300813ff5a48b0bffed92 (patch)
tree5809c63714951c319bdd6195dc33d5e0a4bb15aa /man
parented045d8dc960f6e32abd79b16cc7f18304e6bd94 (diff)
FSDG: man/: Refer to the operating system as GNU/Linux.
This is not a blind replacement of "Linux" with "GNU/Linux". In some cases, "Linux" is (correctly) used to refer to just the kernel. In others, it is in a string for which code must also be adjusted; these instances are not included in this commit.
Diffstat (limited to 'man')
-rw-r--r--man/daemon.xml4
-rw-r--r--man/sd-bus-errors.xml2
-rw-r--r--man/sd_bus_error_add_map.xml2
-rw-r--r--man/systemd.xml2
4 files changed, 5 insertions, 5 deletions
diff --git a/man/daemon.xml b/man/daemon.xml
index b6125cb5c7..f74fd35fc5 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>
@@ -311,7 +311,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
diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
index 055af7a682..d2b81f4e4a 100644
--- a/man/sd-bus-errors.xml
+++ b/man/sd-bus-errors.xml
@@ -126,7 +126,7 @@
<para>In addition to this list, in sd-bus, the special error
namespace <literal>System.Error.</literal> is used to map
- arbitrary Linux system errors (as defined by <citerefentry
+ arbitrary GNU/Linux system errors (as defined by <citerefentry
project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
to D-Bus errors and back. For example, the error
<constant>EUCLEAN</constant> is mapped to
diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
index 139bd77d8c..7dc1ef6c90 100644
--- a/man/sd_bus_error_add_map.xml
+++ b/man/sd_bus_error_add_map.xml
@@ -82,7 +82,7 @@
<para>The <function>sd_bus_error_add_map()</function> call may be
used to register additional mappings for converting D-Bus errors
- to Linux <varname>errno</varname>-style errors. The mappings
+ to GNU/Linux <varname>errno</varname>-style errors. The mappings
defined with this call are consulted by calls such as
<citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
or
diff --git a/man/systemd.xml b/man/systemd.xml
index b8d91b8943..e05a9d6e29 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -61,7 +61,7 @@
<refsect1>
<title>Description</title>
- <para>systemd is a system and service manager for Linux operating
+ <para>systemd is a system and service manager for GNU/Linux operating
systems. When run as first process on boot (as PID 1), it acts as
init system that brings up and maintains userspace
services.</para>