0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch 12 KB

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