diff --git a/man/environment.d.xml b/man/environment.d.xml
index 17c2c505ed..0f53b0fef1 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>
@@ -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>,
@@ -95,7 +94,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