|
 |
52f25a |
From 7c94c0568e3c4a4db49f2a99ff297f7b3efe84e4 Mon Sep 17 00:00:00 2001
|
|
|
52f25a |
From: Thomas Haller <thaller@redhat.com>
|
|
|
52f25a |
Date: Mon, 18 Jun 2018 14:01:36 +0200
|
|
|
c48088 |
Subject: [PATCH] patch documentation with the proper default values
|
|
|
c48088 |
|
|
|
c48088 |
We don't regenerate the documentation for RHEL builds, but
|
|
|
c48088 |
the docs from the tarball are generated with a certain set
|
|
|
c48088 |
of defaults.
|
|
|
c48088 |
|
|
|
c48088 |
Patch the man pages with the proper values.
|
|
|
c48088 |
---
|
|
|
52f25a |
docs/api/html/NetworkManager.conf.html | 8 ++++----
|
|
|
52f25a |
man/NetworkManager.conf.5 | 8 ++++----
|
|
|
52f25a |
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
c48088 |
|
|
|
c48088 |
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
|
|
|
52f25a |
index ae2b1081e..6e5282b2a 100644
|
|
|
c48088 |
--- a/docs/api/html/NetworkManager.conf.html
|
|
|
c48088 |
+++ b/docs/api/html/NetworkManager.conf.html
|
|
|
52f25a |
@@ -180,7 +180,7 @@ plugins-=remove-me
|
|
|
c48088 |
clients to be installed. The internal
|
|
|
c48088 |
option uses a built-in DHCP client which is not currently as
|
|
|
c48088 |
featureful as the external clients.
|
|
|
c48088 |
-If this key is missing, it defaults to internal.
|
|
|
c48088 |
+If this key is missing, it defaults to dhclient.
|
|
|
c48088 |
It the chosen plugin is not available, clients are looked for
|
|
|
c48088 |
in this order: dhclient, dhcpcd,
|
|
|
c48088 |
internal.
|
|
|
52f25a |
@@ -339,7 +339,7 @@ no-auto-default=*
|
|
|
c48088 |
Set the resolv.conf
|
|
|
c48088 |
management mode. The default value depends on NetworkManager build
|
|
|
c48088 |
options, and this version of NetworkManager was build with a default of
|
|
|
c48088 |
- "symlink".
|
|
|
c48088 |
+ "file".
|
|
|
c48088 |
Regardless of this setting, NetworkManager will
|
|
|
c48088 |
always write resolv.conf to its runtime state directory
|
|
|
c48088 |
/var/run/NetworkManager/resolv.conf.
|
|
|
52f25a |
@@ -625,7 +625,7 @@ ipv6.ip6-privacy=0
|
|
|
c48088 |
|
|
|
c48088 |
|
|
|
c48088 |
ethernet.cloned-mac-address
|
|
|
c48088 |
-If left unspecified, it defaults to "preserve".
|
|
|
c48088 |
+If left unspecified, it defaults to "permanent".
|
|
|
c48088 |
|
|
|
c48088 |
|
|
|
c48088 |
ethernet.generate-mac-address-mask
|
|
|
52f25a |
@@ -703,7 +703,7 @@ ipv6.ip6-privacy=0
|
|
|
c48088 |
|
|
|
c48088 |
|
|
|
c48088 |
wifi.cloned-mac-address
|
|
|
c48088 |
-If left unspecified, it defaults to "preserve".
|
|
|
c48088 |
+If left unspecified, it defaults to "permanent".
|
|
|
c48088 |
|
|
|
c48088 |
|
|
|
c48088 |
wifi.generate-mac-address-mask
|
|
|
c48088 |
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
|
|
|
52f25a |
index 26b31e1bd..058177719 100644
|
|
|
c48088 |
--- a/man/NetworkManager.conf.5
|
|
|
c48088 |
+++ b/man/NetworkManager.conf.5
|
|
|
52f25a |
@@ -145,7 +145,7 @@ internal
|
|
|
c48088 |
option uses a built\-in DHCP client which is not currently as featureful as the external clients\&.
|
|
|
c48088 |
.sp
|
|
|
c48088 |
If this key is missing, it defaults to
|
|
|
c48088 |
-internal\&. It the chosen plugin is not available, clients are looked for in this order:
|
|
|
c48088 |
+dhclient\&. It the chosen plugin is not available, clients are looked for in this order:
|
|
|
c48088 |
dhclient,
|
|
|
c48088 |
dhcpcd,
|
|
|
c48088 |
internal\&.
|
|
|
52f25a |
@@ -254,7 +254,7 @@ rc\-manager\ \&unmanaged
|
|
|
c48088 |
.RS 4
|
|
|
c48088 |
Set the
|
|
|
c48088 |
resolv\&.conf
|
|
|
c48088 |
-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
|
|
|
c48088 |
+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
|
|
|
c48088 |
/var/run/NetworkManager/resolv\&.conf\&.
|
|
|
c48088 |
.sp
|
|
|
c48088 |
symlink: If
|
|
|
52f25a |
@@ -607,7 +607,7 @@ If left unspecified, the default value is 3 tries before failing the connection\
|
|
|
c48088 |
.PP
|
|
|
c48088 |
\fIethernet\&.cloned\-mac\-address\fR
|
|
|
c48088 |
.RS 4
|
|
|
c48088 |
-If left unspecified, it defaults to "preserve"\&.
|
|
|
c48088 |
+If left unspecified, it defaults to "permanent"\&.
|
|
|
c48088 |
.RE
|
|
|
c48088 |
.PP
|
|
|
c48088 |
\fIethernet\&.generate\-mac\-address\-mask\fR
|
|
|
52f25a |
@@ -688,7 +688,7 @@ If left unspecified, default value of 60 seconds is used\&.
|
|
|
c48088 |
.PP
|
|
|
c48088 |
\fIwifi\&.cloned\-mac\-address\fR
|
|
|
c48088 |
.RS 4
|
|
|
c48088 |
-If left unspecified, it defaults to "preserve"\&.
|
|
|
c48088 |
+If left unspecified, it defaults to "permanent"\&.
|
|
|
c48088 |
.RE
|
|
|
c48088 |
.PP
|
|
|
c48088 |
\fIwifi\&.generate\-mac\-address\-mask\fR
|
|
|
c48088 |
--
|
|
|
52f25a |
2.17.0
|
|
|
c48088 |
|