diff options
Diffstat (limited to 'libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch')
| -rw-r--r-- | libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index 82d60ec94..9a8ce15ea 100644 --- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -9,7 +9,7 @@ Subject: [PATCH 6/6] FSDG: man/: Use FSDG operating systems as examples. 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/man/os-release.xml b/man/os-release.xml -index 79eb402..a70ba1a 100644 +index caf60f4..2811f43 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -122,7 +122,7 @@ @@ -55,7 +55,7 @@ index 79eb402..a70ba1a 100644 assignment of <literal>ID_LIKE=debian</literal> is appropriate.</para></listitem> </varlistentry> -@@ -183,8 +183,8 @@ +@@ -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 @@ -66,7 +66,7 @@ index 79eb402..a70ba1a 100644 </varlistentry> <varlistentry> -@@ -195,8 +195,8 @@ +@@ -211,8 +211,8 @@ a release code name or OS version of some kind, as suitable. If not set, defaults to <literal>PRETTY_NAME="GNU/Linux"</literal>. Example: @@ -77,7 +77,7 @@ index 79eb402..a70ba1a 100644 </varlistentry> <varlistentry> -@@ -219,7 +219,7 @@ +@@ -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: @@ -86,7 +86,7 @@ index 79eb402..a70ba1a 100644 </para></listitem> </varlistentry> -@@ -254,8 +254,8 @@ +@@ -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: @@ -97,7 +97,7 @@ index 79eb402..a70ba1a 100644 </varlistentry> <varlistentry> -@@ -330,21 +330,22 @@ +@@ -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: @@ -131,18 +131,18 @@ index 79eb402..a70ba1a 100644 <refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index 86cdb4e..bd7392c 100644 +index cd0a90d..ab35580 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml -@@ -912,46 +912,35 @@ +@@ -1004,46 +1004,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/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz --# systemd-nspawn -M Fedora-Cloud-Base-20141203-21</programlisting> +- <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> @@ -164,11 +164,11 @@ index 86cdb4e..bd7392c 100644 <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 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 unstable ~/gnewsense-tree/ ++ <programlisting># debootstrap --arch=amd64 ucclia ~/gnewsense-tree/ +# systemd-nspawn -D ~/gnewsense-tree/</programlisting> - <para>This installs a minimal Debian unstable distribution into @@ -180,7 +180,7 @@ index 86cdb4e..bd7392c 100644 <example> - <title>Boot a minimal Arch Linux distribution in a container</title> -+ <title>Boot a minimal Parabola GNU/Linux-libre 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> @@ -189,7 +189,7 @@ index 86cdb4e..bd7392c 100644 - <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 GNU/Linux-libre distribution into the ++ <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> |