diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index fb5c0806169..8b538edf779 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -631,7 +631,7 @@
         <command>echo "hello" >&amp;2</command> instead, which is mostly equivalent and avoids this pitfall.</para>
 
         <para>This setting defaults to the value set with
-        <option>DefaultStandardOutput=</option> in
+        <varname>DefaultStandardOutput=</varname> in
         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         which defaults to <option>journal</option>. Note that setting
         this parameter might result in additional dependencies to be
@@ -651,7 +651,7 @@
         <literal>stderr</literal>.</para>
 
         <para>This setting defaults to the value set with
-        <option>DefaultStandardError=</option> in
+        <varname>DefaultStandardError=</varname> in
         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         which defaults to <option>inherit</option>. Note that setting
         this parameter might result in additional dependencies to be
@@ -796,7 +796,7 @@
         <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry> for details on
         the resource limit concept. Resource limits may be specified in two formats: either as single value to set a
         specific soft and hard limit to the same value, or as colon-separated pair <option>soft:hard</option> to set
-        both limits individually (e.g. <literal>LimitAS=4G:16G</literal>).  Use the string <varname>infinity</varname>
+        both limits individually (e.g. <literal>LimitAS=4G:16G</literal>).  Use the string <option>infinity</option>
         to configure no limit on a specific resource. The multiplicative suffixes K, M, G, T, P and E (to the base
         1024) may be used for resource limits measured in bytes (e.g. LimitAS=16G). For the limits referring to time
         values, the usual time units ms, s, min, h and so on may be used (see