From 5047287246d166152c7a383ea3d88de4c1aa05ed Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 27 Aug 2019 15:47:32 +0200
Subject: [PATCH] patch documentation with the proper default values

We don't regenerate the documentation for RHEL builds, but
the docs from the tarball are generated with a certain set
of defaults.

Patch the man pages with the proper values.
---
 docs/api/html/NetworkManager.conf.html | 10 +++++-----
 man/NetworkManager.conf.5              | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index e669367e2260..26d6b344eb77 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -320,10 +320,10 @@ no-auto-default=*
         <code class="literal">rc-manager</code> <code class="literal">unmanaged</code></p>
 <p>Note that the plugins <code class="literal">dnsmasq</code>, <code class="literal">systemd-resolved</code>
         and <code class="literal">unbound</code> are caching local nameservers.
-        Hence, when NetworkManager writes <code class="filename">/var/run/NetworkManager/resolv.conf</code>
+        Hence, when NetworkManager writes <code class="filename">/run/NetworkManager/resolv.conf</code>
         and <code class="filename">/etc/resolv.conf</code> (according to <code class="literal">rc-manager</code>
         setting below), the name server there will be localhost only.
-        NetworkManager also writes a file <code class="filename">/var/run/NetworkManager/no-stub-resolv.conf</code>
+        NetworkManager also writes a file <code class="filename">/run/NetworkManager/no-stub-resolv.conf</code>
         that contains the original name servers pushed to the DNS plugin.</p>
 </td>
 </tr>
@@ -336,12 +336,12 @@ no-auto-default=*
         "<code class="literal">symlink</code>".
         Regardless of this setting, NetworkManager will
         always write resolv.conf to its runtime state directory
-        <code class="filename">/var/run/NetworkManager/resolv.conf</code>.</p>
+        <code class="filename">/run/NetworkManager/resolv.conf</code>.</p>
 <p><code class="literal">symlink</code>: If <code class="filename">/etc/resolv.conf</code> is
         a regular file, NetworkManager will replace the file on update. If
         <code class="filename">/etc/resolv.conf</code> is instead a symlink, NetworkManager
         will leave it alone. Unless the symlink points to the internal file
-        <code class="filename">/var/run/NetworkManager/resolv.conf</code>,
+        <code class="filename">/run/NetworkManager/resolv.conf</code>,
         in which case the symlink will be updated to emit an inotify notification.
         This allows the user to conveniently instruct NetworkManager not
         to manage <code class="filename">/etc/resolv.conf</code> by replacing it with
@@ -566,7 +566,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
           are "<code class="literal">syslog</code>" and "<code class="literal">journal</code>".
           When NetworkManager is started with "<code class="literal">--debug</code>"
           in addition all messages will be printed to stderr.
-          If unspecified, the default is "<code class="literal">syslog</code>".
+          If unspecified, the default is "<code class="literal">journal</code>".
           </p></td>
 </tr>
 <tr>
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 63ea02745f40..c5092e878fac 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -257,13 +257,13 @@ systemd\-resolved
 and
 unbound
 are caching local nameservers\&. Hence, when NetworkManager writes
-/var/run/NetworkManager/resolv\&.conf
+/run/NetworkManager/resolv\&.conf
 and
 /etc/resolv\&.conf
 (according to
 rc\-manager
 setting below), the name server there will be localhost only\&. NetworkManager also writes a file
-/var/run/NetworkManager/no\-stub\-resolv\&.conf
+/run/NetworkManager/no\-stub\-resolv\&.conf
 that contains the original name servers pushed to the DNS plugin\&.
 .RE
 .PP
@@ -272,14 +272,14 @@ that contains the original name servers pushed to the DNS plugin\&.
 Set the
 resolv\&.conf
 management mode\&. The default value depends on NetworkManager build options, and this version of NetworkManager was build with a default of "symlink"\&. Regardless of this setting, NetworkManager will always write resolv\&.conf to its runtime state directory
-/var/run/NetworkManager/resolv\&.conf\&.
+/run/NetworkManager/resolv\&.conf\&.
 .sp
 symlink: If
 /etc/resolv\&.conf
 is a regular file, NetworkManager will replace the file on update\&. If
 /etc/resolv\&.conf
 is instead a symlink, NetworkManager will leave it alone\&. Unless the symlink points to the internal file
-/var/run/NetworkManager/resolv\&.conf, in which case the symlink will be updated to emit an inotify notification\&. This allows the user to conveniently instruct NetworkManager not to manage
+/run/NetworkManager/resolv\&.conf, in which case the symlink will be updated to emit an inotify notification\&. This allows the user to conveniently instruct NetworkManager not to manage
 /etc/resolv\&.conf
 by replacing it with a symlink\&.
 .sp
@@ -588,7 +588,7 @@ INFO\&.
 .PP
 \fIbackend\fR
 .RS 4
-The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "syslog"\&.
+The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "journal"\&.
 .RE
 .PP
 \fIaudit\fR
-- 
2.21.0