Merge pull request #6053 from keszybz/doc-tweaks

Man page and unit file and mailmap and meson tweaks

.mailmap

@@ -104,3 +104,5 @@ Tibor Nagy <xnagytibor@gmail.com>
 Stuart McLaren <stuart.mclaren@hp.com>
 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> <glaubitz@suse.com>
+Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Neil Brown <neil@brown.name>

man/systemd.exec.xml

@@ -1656,8 +1656,8 @@
         <citerefentry><refentrytitle>mprotect</refentrytitle><manvolnum>2</manvolnum></citerefentry> system calls with
         <constant>PROT_EXEC</constant> set and
         <citerefentry><refentrytitle>shmat</refentrytitle><manvolnum>2</manvolnum></citerefentry> system calls with
-        <constant>SHM_EXEC</constant> set. Note that this option is incompatible with programs that generate program
-        code dynamically at runtime, such as JIT execution engines, or programs compiled making use of the code
+        <constant>SHM_EXEC</constant> set. Note that this option is incompatible with programs and libraries that
+        generate program code dynamically at runtime, including JIT execution engines, executable stacks, and code
         "trampoline" feature of various C compilers. This option improves service security, as it makes harder for
         software exploits to change running code dynamically. Note that this feature is fully available on x86-64, and
         partially on x86. Specifically, the <function>shmat()</function> protection is not available on x86. Note that

man/systemd.service.xml

@@ -928,10 +928,9 @@
     result in a warning. In particular, any backslashes should be doubled. Finally, a trailing
     backslash (<literal>\</literal>) may be used to merge lines.</para>
 
-    <para>This syntax is intended to be very similar to shell syntax,
-    but only the meta-characters and expansions described in the
-    following paragraphs are understood. Specifically, redirection
-    using
+    <para>This syntax is inspired by shell syntax, but only the meta-characters and expansions
+    described in the following paragraphs are understood, and the expansion of variables is
+    different. Specifically, redirection using
     <literal>&lt;</literal>,
     <literal>&lt;&lt;</literal>,
     <literal>&gt;</literal>, and

meson.build

@@ -2325,11 +2325,10 @@ if git.found() and etags.found()
                  ':/*.[ch]'])
         all_files = files(all_files.stdout().split())
 
-        custom_target(
+        run_target(
                 'TAGS',
-                output : 'TAGS',
                 input : all_files,
-                command : [etags, '-o', '@OUTPUT@'] + all_files)
+                command : [etags, '-o', '@0@/TAGS'.format(meson.source_root())] + all_files)
 endif
 
 if git.found()

src/sulogin-shell/systemd-sulogin-shell.in

@@ -4,11 +4,9 @@ if [ -x /bin/plymouth ]; then
     /bin/plymouth --wait quit
 fi
 
-cat <<EOF
-You are in $1 mode. After logging in, type "journalctl -xb" to view
-system logs, "systemctl reboot" to reboot, "systemctl default" or ^D to
-boot into default mode.
-EOF
+echo "You are in $1 mode. After logging in, type \"journalctl -xb\" to view"
+echo "system logs, \"systemctl reboot\" to reboot, \"systemctl default\" or ^D to boot"
+echo "into default mode."
 
 @SULOGIN@
 @SYSTEMCTL@ --job-mode=fail --no-block default