diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/daemon.xml | 4 | ||||
| -rw-r--r-- | man/kernel-install.xml | 2 | ||||
| -rw-r--r-- | man/os-release.xml | 55 | ||||
| -rw-r--r-- | man/sd-bus-errors.xml | 2 | ||||
| -rw-r--r-- | man/sd_bus_error_add_map.xml | 2 | ||||
| -rw-r--r-- | man/systemd-nspawn.xml | 37 | ||||
| -rw-r--r-- | man/systemd.xml | 2 |
7 files changed, 47 insertions, 57 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 diff --git a/man/kernel-install.xml b/man/kernel-install.xml index 4a8a46cef4..32e6169f63 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -109,7 +109,7 @@ <replaceable>PRETTY_NAME</replaceable> parameter specified in <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is - missing), or "Linux + missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. If the file <filename>initrd</filename> is found next to the <filename>linux</filename> file, the initrd will be added to diff --git a/man/os-release.xml b/man/os-release.xml index 99bbb61004..2811f434c5 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -121,8 +121,8 @@ <listitem><para>A string identifying the operating system, without a version component, and suitable for presentation to the user. If not set, defaults to - <literal>NAME=Linux</literal>. Example: - <literal>NAME=Fedora</literal> or <literal>NAME="Debian + <literal>NAME=GNU/Linux</literal>. Example: + <literal>NAME=BLAG</literal> or <literal>NAME="gNewSense GNU/Linux"</literal>.</para></listitem> </varlistentry> @@ -133,8 +133,8 @@ version, excluding any OS name information, possibly including a release code name, and suitable for presentation to the user. This field is optional. Example: - <literal>VERSION=17</literal> or <literal>VERSION="17 (Beefy - Miracle)"</literal>.</para></listitem> + <literal>VERSION=210k</literal> or <literal>VERSION="210k + (Spartakus)"</literal>.</para></listitem> </varlistentry> <varlistentry> @@ -145,9 +145,9 @@ the operating system, excluding any version information and suitable for processing by scripts or usage in generated filenames. If not set, defaults to - <literal>ID=linux</literal>. Example: - <literal>ID=fedora</literal> or - <literal>ID=debian</literal>.</para></listitem> + <literal>ID=gnu-linux</literal>. Example: + <literal>ID=blag</literal> or + <literal>ID=gnewsense</literal>.</para></listitem> </varlistentry> <varlistentry> @@ -168,9 +168,9 @@ should be listed in order of how closely the local operating system relates to the listed ones, starting with the closest. This field is optional. Example: for an operating system with - <literal>ID=centos</literal>, an assignment of + <literal>ID=blag</literal>, an assignment of <literal>ID_LIKE="rhel fedora"</literal> would be appropriate. - For an operating system with <literal>ID=ubuntu</literal>, an + For an operating system with <literal>ID=gnewsense</literal>, an assignment of <literal>ID_LIKE=debian</literal> is appropriate.</para></listitem> </varlistentry> @@ -199,8 +199,8 @@ identifying the operating system version, excluding any OS name information or release code name, and suitable for processing by scripts or usage in generated filenames. This - field is optional. Example: <literal>VERSION_ID=17</literal> - or <literal>VERSION_ID=11.04</literal>.</para></listitem> + field is optional. Example: <literal>VERSION_ID=210k</literal> + or <literal>VERSION_ID=7.0</literal>.</para></listitem> </varlistentry> <varlistentry> @@ -210,9 +210,9 @@ suitable for presentation to the user. May or may not contain a release code name or OS version of some kind, as suitable. If not set, defaults to - <literal>PRETTY_NAME="Linux"</literal>. Example: - <literal>PRETTY_NAME="Fedora 17 (Beefy - Miracle)"</literal>.</para></listitem> + <literal>PRETTY_NAME="GNU/Linux"</literal>. Example: + <literal>PRETTY_NAME="BLAG 210k + (Spartakus)"</literal>.</para></listitem> </varlistentry> <varlistentry> @@ -235,7 +235,7 @@ <ulink url="http://scap.nist.gov/specifications/cpe/">Common Platform Enumeration Specification</ulink> as proposed by the NIST. This field is optional. Example: - <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal> + <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal> </para></listitem> </varlistentry> @@ -270,8 +270,8 @@ one URL shall be listed in each setting. If multiple resources need to be referenced, it is recommended to provide an online landing page linking all available resources. Examples: - <literal>HOME_URL="https://fedoraproject.org/"</literal> and - <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem> + <literal>HOME_URL="https://www.blagblagblag.org/"</literal> and + <literal>BUG_REPORT_URL="https://blag.fsf.org/"</literal></para></listitem> </varlistentry> <varlistentry> @@ -346,21 +346,22 @@ recommended to prefix new fields with an OS specific name in order to avoid name clashes. Applications reading this file must ignore unknown fields. Example: - <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal></para> + <literal>DEBIAN_BTS="debbugs://bugs.gnewsense.org/"</literal></para> </refsect1> <refsect1> <title>Example</title> - <programlisting>NAME=Fedora -VERSION="17 (Beefy Miracle)" -ID=fedora -VERSION_ID=17 -PRETTY_NAME="Fedora 17 (Beefy Miracle)" -ANSI_COLOR="0;34" -CPE_NAME="cpe:/o:fedoraproject:fedora:17" -HOME_URL="https://fedoraproject.org/" -BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting> + <programlisting>NAME=Parabola +VERSION="rolling-release" +ID=parabola +ID_LIKE=arch +VERSION_ID=rolling-release +PRETTY_NAME="Parabola GNU/Linux-libre" +ANSI_COLOR="1;35" +CPE_NAME="cpe:/o:parabola:parabola:rolling-release" +HOME_URL="https://www.parabola.nu/" +BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting> </refsect1> <refsect1> 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-nspawn.xml b/man/systemd-nspawn.xml index f153034296..c449edee89 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -1012,46 +1012,35 @@ <title>Examples</title> <example> - <title>Download a Fedora image and start a shell in it</title> + <title>Build and boot a minimal BLAG distribution in a container</title> - <programlisting># machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.raw.xz -# systemd-nspawn -M Fedora-Cloud-Base-24-1.2.x86_64.raw</programlisting> - - <para>This downloads an image using - <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> - and opens a shell in it.</para> - </example> - - <example> - <title>Build and boot a minimal Fedora distribution in a container</title> - - <programlisting># dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal + <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag --enablerepo=updates install systemd passwd dnf blag-release vim-minimal # systemd-nspawn -bD /srv/mycontainer</programlisting> - <para>This installs a minimal Fedora distribution into the + <para>This installs a minimal BLAG distribution into the directory <filename noindex='true'>/srv/mycontainer/</filename> and then boots an OS in a namespace container in it.</para> </example> <example> - <title>Spawn a shell in a container of a minimal Debian unstable distribution</title> + <title>Spawn a shell in a container of a minimal gNewSense Ucclia distribution</title> - <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/ -# systemd-nspawn -D ~/debian-tree/</programlisting> + <programlisting># debootstrap --arch=amd64 ucclia ~/gnewsense-tree/ +# systemd-nspawn -D ~/gnewsense-tree/</programlisting> - <para>This installs a minimal Debian unstable distribution into - the directory <filename>~/debian-tree/</filename> and then + <para>This installs a minimal gNewSense unstable distribution into + the directory <filename>~/gnewsense-tree/</filename> and then spawns a shell in a namespace container in it.</para> </example> <example> - <title>Boot a minimal Arch Linux distribution in a container</title> + <title>Boot a minimal Parabola distribution in a container</title> - <programlisting># pacstrap -c -d ~/arch-tree/ base -# systemd-nspawn -bD ~/arch-tree/</programlisting> + <programlisting># pacstrap -c -d ~/parabola-tree/ base +# systemd-nspawn -bD ~/parabola-tree/</programlisting> - <para>This installs a minimal Arch Linux distribution into the - directory <filename>~/arch-tree/</filename> and then boots an OS + <para>This installs a minimal Parabola distribution into the + directory <filename>~/parabola-tree/</filename> and then boots an OS in a namespace container in it.</para> </example> diff --git a/man/systemd.xml b/man/systemd.xml index 7f24a874ed..79d8aedbbc 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> |