1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
|
From dec7ae52e9352345e5627d02676b51f2facdd488 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Wed, 25 May 2016 12:19:20 -0400
Subject: [PATCH 1/7] 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.
---
man/daemon.xml | 4 ++--
man/journald.conf.xml | 2 +-
man/machinectl.xml | 2 +-
man/sd-bus-errors.xml | 2 +-
man/sd-login.xml | 2 +-
man/sd_bus_error_add_map.xml | 2 +-
man/sd_uid_get_state.xml | 2 +-
man/systemd-detect-virt.xml | 4 ++--
man/systemd-machine-id-setup.xml | 2 +-
man/systemd-resolved.service.xml | 6 +++---
man/systemd.exec.xml | 2 +-
man/systemd.socket.xml | 2 +-
man/systemd.xml | 6 +++---
13 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/man/daemon.xml b/man/daemon.xml
index 36c7c09db1..730507ed7e 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -144,7 +144,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>
@@ -285,7 +285,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/journald.conf.xml b/man/journald.conf.xml
index ee8e8b7faf..28324ac102 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -111,7 +111,7 @@
<term><varname>SplitMode=</varname></term>
<listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
- <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access
+ <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access
control is managed per file, and the journal daemon will assign users read access to their journal files. If
<literal>uid</literal>, all regular users will each get their own journal files, and system users will log to
the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are
diff --git a/man/machinectl.xml b/man/machinectl.xml
index affca1dec1..278ca8d677 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -867,7 +867,7 @@
<para>The <command>machinectl</command> tool operates on machines
and images whose names must be chosen following strict
rules. Machine names must be suitable for use as host names
- following a conservative subset of DNS and UNIX/Linux
+ following a conservative subset of DNS and GNU/Linux
semantics. Specifically, they must consist of one or more
non-empty label strings, separated by dots. No leading or trailing
dots are allowed. No sequences of multiple dots are allowed. The
diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
index c834bde292..fdd2261fe9 100644
--- a/man/sd-bus-errors.xml
+++ b/man/sd-bus-errors.xml
@@ -102,7 +102,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-login.xml b/man/sd-login.xml
index 83ef0b7307..93fd9ea782 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -244,7 +244,7 @@
<para>
<ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>
- for an introduction to multi-seat support on Linux and the background for this set of APIs.
+ for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs.
</para>
</refsect1>
diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
index 3eacbab660..b4b3b1bd17 100644
--- a/man/sd_bus_error_add_map.xml
+++ b/man/sd_bus_error_add_map.xml
@@ -58,7 +58,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/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 02670e1bce..6f4ff77130 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -163,7 +163,7 @@
<listitem><para>An input parameter was invalid (out of range, or NULL, where that is not
accepted). This is also returned if the passed user ID is <constant>0xFFFF</constant> or
- <constant>0xFFFFFFFF</constant>, which are undefined on Linux.</para></listitem>
+ <constant>0xFFFFFFFF</constant>, which are undefined on GNU/Linux.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index c4763fd561..54bba23666 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -133,12 +133,12 @@
<row>
<entry><varname>lxc</varname></entry>
- <entry>Linux container implementation by LXC</entry>
+ <entry>Container implementation by LXC</entry>
</row>
<row>
<entry><varname>lxc-libvirt</varname></entry>
- <entry>Linux container implementation by libvirt</entry>
+ <entry>Container implementation by libvirt</entry>
</row>
<row>
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 7caf35f8e8..18d9c5a33b 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -55,7 +55,7 @@
and is different for every booted instance of the
VM.</para></listitem>
- <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the
+ <listitem><para>Similarly, if run inside a container environment and a UUID is configured for the
container, this is used to initialize the machine ID. For details, see the documentation of the <ulink
url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem>
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 53c46a1018..a2ccf4fae2 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -44,7 +44,7 @@
<citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined
by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,
including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This
- API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC
+ API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC
validation status information however, and is synchronous only. This API is backed by the glibc Name Service
Switch (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the
glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>
@@ -190,7 +190,7 @@
<itemizedlist>
<listitem><para><command>systemd-resolved</command> maintains the
- <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux
+ <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux
programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53
DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by
systemd-resolved. The list of search domains is always kept up-to-date. Note that
@@ -206,7 +206,7 @@
<command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
<listitem><para><command>systemd-resolved</command> maintains the
- <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux
+ <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux
programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept up-to-date,
containing information about all known DNS servers. Note the file format's limitations: it does not know a
concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 3bd790b485..a532b74a6e 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -191,7 +191,7 @@
which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted
as first character). The user/group name must have at least one character, and at most 31. These restrictions
are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among
- Linux systems.</para>
+ GNU/Linux systems.</para>
<para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is
dynamically allocated at the time the service is started, and released at the time the service is stopped —
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 19c2ca9907..5fd6c1598f 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -280,7 +280,7 @@
<listitem><para>Specifies a POSIX message queue name to listen
on. This expects a valid message queue name (i.e. beginning
with /). Behavior otherwise is very similar to the
- <varname>ListenFIFO=</varname> directive above. On Linux
+ <varname>ListenFIFO=</varname> directive above. On GNU/Linux
message queue descriptors are actually file descriptors and
can be inherited between processes.</para></listitem>
</varlistentry>
diff --git a/man/systemd.xml b/man/systemd.xml
index 28bf49e131..5cfd0de31a 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -37,7 +37,7 @@
<refsect1>
<title>Description</title>
- <para>systemd is a system and service manager for Linux operating systems. When run as first process on
+ <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. Separate
instances are started for logged-in users to start their services.</para>
@@ -703,9 +703,9 @@
<title>Kernel Command Line</title>
<para>When run as the system instance systemd parses a number of options listed below. They can be
- specified as kernel command line arguments<footnote><para>If run inside a Linux container these arguments
+ specified as kernel command line arguments<footnote><para>If run inside a container these arguments
may be passed as command line arguments to systemd itself, next to any of the command line options listed
- in the Options section above. If run outside of Linux containers, these arguments are parsed from
+ in the Options section above. If run outside of containers, these arguments are parsed from
<filename>/proc/cmdline</filename> instead.</para></footnote>, or through the
<literal>SystemdOptions</literal> EFI variable (on EFI systems). The kernel command line has higher
priority. Following variables are understood:</para>
--
2.18.0
|
