diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
index 1659ac34d5..76a3dace33 100644
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@@ -11,5 +11,6 @@
+
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 1ac0077d86..3f229908c9 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -408,7 +408,23 @@
LimitXXX= directives and they accept the same parameter syntax,
see systemd.exec5
for details. Note that these resource limits are only defaults
- for units, they are not applied to the service manager process (i.e. PID 1) itself.
+ for units, they are not applied to the service manager process (i.e. PID 1) itself.
+
+ Most of these settings are unset, which means the resource limits are inherited from the kernel or, if
+ invoked in a container, from the container manager. However, the following have defaults:
+
+ DefaultLimitNOFILE= defaults to 1024:&HIGH_RLIMIT_NOFILE;.
+
+
+ DefaultLimitCORE= does not have a default but it is worth mentioning that
+ RLIMIT_CORE is set to infinity by PID 1 which is inherited by its
+ children.
+
+ Note that the service manager internally increases RLIMIT_MEMLOCK for
+ itself, however the limit is reverted to the original value for child processes forked off.
+
+
+