From a449b7198cd49330ce62f7bcfa72e521096cab98 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 16 Jul 2020 09:25:22 +0200
Subject: [PATCH 1/3] man: don't claim environment.d/ was about sessions

This only sets the environment for user *services*, it has no effect on
sessions, as those get an env block set up by whatever program sets them
up and not systemd.
---
 man/environment.d.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/environment.d.xml b/man/environment.d.xml
index 17c2c505ed..d272ec305b 100644
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -22,7 +22,7 @@
 
   <refnamediv>
     <refname>environment.d</refname>
-    <refpurpose>Definition of user session environment</refpurpose>
+    <refpurpose>Definition of user service environment</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>

From d320bfa558d671eccd65e7a0f29bd14b592f7bb9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 16 Jul 2020 09:26:38 +0200
Subject: [PATCH 2/3] man: GNOME is usually capitalized

---
 man/environment.d.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/environment.d.xml b/man/environment.d.xml
index d272ec305b..b7b0dcaa82 100644
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -95,7 +95,7 @@
     <para>Environment variables exported by the user manager (<command>systemd --user</command> instance
     started in the <filename>user@<replaceable>uid</replaceable>.service</filename> system service) apply to
     any services started by that manager. In particular, this may include services which run user shells. For
-    example in the Gnome environment, the graphical terminal emulator runs as the
+    example in the GNOME environment, the graphical terminal emulator runs as the
     <filename>gnome-terminal-server.service</filename> user unit, which in turn runs the user shell, so that
     shell will inherit environment variables exported by the user manager. For other instances of the shell,
     not launched by the user manager, the environment they inherit is defined by the program that starts

From 3f13f9159f27ce2859ee64443a3eaf9be1351b01 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 16 Jul 2020 09:26:55 +0200
Subject: [PATCH 3/3] man: configuration files contain assignments, no
 directories

---
 man/environment.d.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/man/environment.d.xml b/man/environment.d.xml
index b7b0dcaa82..0f53b0fef1 100644
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -36,8 +36,8 @@
   <refsect1>
     <title>Description</title>
 
-    <para>The <filename>environment.d</filename> directories contain a list of environment variable
-    assignments for services started by the systemd user instance.
+    <para>Configuration files in the <filename>environment.d/</filename> directories contain lists of
+    environment variable assignments for services started by the systemd user instance.
     <citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     parses them and updates the environment exported by the systemd user instance. See below for an
     discussion of which processes inherit those variables.</para>
@@ -58,7 +58,6 @@
     variable assignments, separated by newlines. The right hand side of these assignments may
     reference previously defined environment variables, using the <literal>${OTHER_KEY}</literal>
     and <literal>$OTHER_KEY</literal> format. It is also possible to use
-
     <literal>${<replaceable>FOO</replaceable>:-<replaceable>DEFAULT_VALUE</replaceable>}</literal>
     to expand in the same way as <literal>${<replaceable>FOO</replaceable>}</literal> unless the
     expansion would be empty, in which case it expands to <replaceable>DEFAULT_VALUE</replaceable>,