Merge pull request #13365 from keszybz/fix-commits-from-pr-13246

[thirdparty/systemd.git] / man / sysctl.d.xml

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 2e0e78255bec1c23519a76dc157827077a73ad5b..493294817882371d17e9e7a1cdf06892a3a8c069 100644 (file)
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -1,27 +1,13 @@
 <?xml version="1.0"?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!--
-  SPDX-License-Identifier: LGPL-2.1+
-
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
--->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!-- SPDX-License-Identifier: LGPL-2.1+ -->
 <refentry id="sysctl.d"
     xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>sysctl.d</title>
     <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
   </refentryinfo>
 
   <refmeta>
@@ -73,6 +59,12 @@
     <filename>/proc/sys/net/ipv4/conf/enp3s0.200/forwarding</filename>.
     </para>
 
+    <para>Any access permission errors and attempts to write variables not defined on the local system are
+    logged, but do not cause the the service to fail. Moreover, if a variable assignment is prefixed with a
+    single <literal>-</literal> character, failure to set the variable will be logged, but will not cause the
+    service to fail. All other errors when setting variables cause the service to return failure at the end
+    (other variables are still processed).</para>
+
     <para>The settings configured with <filename>sysctl.d</filename>
     files will be applied early on boot. The network
     interface-specific options will also be applied individually for