From 39b1b6a7881447f7d023ddbf391cc4ee80793f48 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 19 Aug 2016 10:58:53 +0200
Subject: [PATCH 1/1] patch documentation for default logging backend in `man 5
NetworkManager.conf`
The default logging backend is generated via man/common.ent and during
`make dist` "journal" is embedded in the pre-generated documentation.
As we don't regenerate the documentation for RHEL, patch it.
---
man/NetworkManager.conf.5 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index f1d3d75..9b57053 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -218,7 +218,7 @@ rc\-manager\ \&unmanaged
.RS 4
Set the
resolv\&.conf
-management mode\&. The default value depends on how NetworkManager was built, whereas 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\&.
+management mode\&. The default value depends on NetworkManager build options, and this version of NetworkManager was build with a default of "file"\&. Regardless of this setting, NetworkManager will always write resolv\&.conf to its runtime state directory\&.
.sp
symlink: NetworkManager will symlink
/etc/resolv\&.conf
@@ -492,7 +492,7 @@ INFO\&.
.PP
\fIbackend\fR
.RS 4
-The logging backend\&. Supported values are "debug", "syslog", "journal"\&. "debug" uses syslog and logs to standard error\&. If NetworkManager is started in debug mode (\-\-debug) this option is ignored and "debug" is always used\&. Otherwise, the default is "journal"\&.
+The logging backend\&. Supported values are "debug", "syslog", "journal"\&. "debug" uses syslog and logs to standard error\&. If NetworkManager is started in debug mode (\-\-debug) this option is ignored and "debug" is always used\&. Otherwise, the default is "syslog"\&.
.RE
.PP
\fIaudit\fR
@@ -500,7 +500,7 @@ The logging backend\&. Supported values are "debug", "syslog", "journal"\&. "deb
Whether the audit records are delivered to auditd, the audit daemon\&. If
false, audit records will be sent only to the NetworkManager logging system\&. If set to
true, they will be also sent to auditd\&. The default value is
-true\&.
+false\&.
.RE
.SH "CONNECTION SECTION"
.PP
--
2.7.4