summaryrefslogtreecommitdiff
path: root/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-07-19 12:38:34 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-07-19 14:27:10 -0400
commit75f76e6b857ae55a55c4a03f96029a9ce3109321 (patch)
tree011a7cb1e951033a1c7c47125edd06d763d78287 /libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
parent087ec1ca43072b28a6e4e0793fe1b3fa7b7042b5 (diff)
downloadabslibre-75f76e6b857ae55a55c4a03f96029a9ce3109321.tar.gz
abslibre-75f76e6b857ae55a55c4a03f96029a9ce3109321.tar.bz2
abslibre-75f76e6b857ae55a55c4a03f96029a9ce3109321.zip
libre/systemd: Re-generate the FSDG patch files
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.patch38
1 files changed, 19 insertions, 19 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 0616b9296..0905e6bad 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
@@ -1,18 +1,18 @@
-From 6998da16c87712adea3e5b49a04aec180178d11a Mon Sep 17 00:00:00 2001
+From 35af892f1dffbb0daa9aa721f908f7c38b064ebe Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Wed, 25 May 2016 12:32:21 -0400
Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples
---
- man/os-release.xml | 49 +++++++++++++++++++++++++------------------------
- man/systemd-nspawn.xml | 48 ++++++++++++++++++++++++++----------------------
- 2 files changed, 51 insertions(+), 46 deletions(-)
+ man/os-release.xml | 49 +++++++++++++++++++++--------------------
+ man/systemd-nspawn.xml | 50 +++++++++++++++++++++++-------------------
+ 2 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/man/os-release.xml b/man/os-release.xml
-index 81f294c7e4..973e19747d 100644
+index 272258b4e1..6cea40cb99 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
-@@ -124,7 +124,7 @@
+@@ -99,7 +99,7 @@
without a version component, and suitable for presentation to
the user. If not set, defaults to
<literal>NAME=GNU/Linux</literal>. Example:
@@ -21,7 +21,7 @@ index 81f294c7e4..973e19747d 100644
GNU/Linux"</literal>.</para></listitem>
</varlistentry>
-@@ -135,8 +135,8 @@
+@@ -110,8 +110,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:
@@ -32,7 +32,7 @@ index 81f294c7e4..973e19747d 100644
</varlistentry>
<varlistentry>
-@@ -148,8 +148,8 @@
+@@ -123,8 +123,8 @@
suitable for processing by scripts or usage in generated
filenames. If not set, defaults to
<literal>ID=gnu-linux</literal>. Example:
@@ -43,7 +43,7 @@ index 81f294c7e4..973e19747d 100644
</varlistentry>
<varlistentry>
-@@ -170,9 +170,9 @@
+@@ -145,9 +145,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
@@ -55,7 +55,7 @@ index 81f294c7e4..973e19747d 100644
assignment of <literal>ID_LIKE=debian</literal> is
appropriate.</para></listitem>
</varlistentry>
-@@ -201,8 +201,8 @@
+@@ -176,8 +176,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 81f294c7e4..973e19747d 100644
</varlistentry>
<varlistentry>
-@@ -213,8 +213,8 @@
+@@ -188,8 +188,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 81f294c7e4..973e19747d 100644
</varlistentry>
<varlistentry>
-@@ -237,7 +237,7 @@
+@@ -212,7 +212,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 81f294c7e4..973e19747d 100644
</para></listitem>
</varlistentry>
-@@ -272,8 +272,8 @@
+@@ -247,8 +247,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 81f294c7e4..973e19747d 100644
</varlistentry>
<varlistentry>
-@@ -348,21 +348,22 @@
+@@ -323,21 +323,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,7 +131,7 @@ index 81f294c7e4..973e19747d 100644
<refsect1>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 633d93938..fd9db974d 100644
+index 284c9b294b..7b3d211161 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1,7 +1,7 @@
@@ -143,7 +143,7 @@ index 633d93938..fd9db974d 100644
<!ENTITY fedora_cloud_release "1.1">
]>
-@@ -1078,11 +1078,12 @@
+@@ -1176,11 +1176,12 @@
<refsect1>
<title>Examples</title>
@@ -157,7 +157,7 @@ index 633d93938..fd9db974d 100644
https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz
# systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting>
-@@ -1090,31 +1091,32 @@
+@@ -1188,31 +1189,32 @@
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
and opens a shell in it.</para>
</example>
@@ -203,7 +203,7 @@ index 633d93938..fd9db974d 100644
spawns a shell in a namespace container in it.</para>
<para><command>debootstrap</command> supports
-@@ -1129,29 +1131,31 @@
+@@ -1227,29 +1229,31 @@
<example>
<title>Boot a minimal
@@ -244,5 +244,5 @@ index 633d93938..fd9db974d 100644
<example>
<title>Boot into an ephemeral snapshot of the host system</title>
--
-2.15.1
+2.18.0