From ea5cb54ccbd2e165d135a01a1c0351eb6b994b82 Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Mon, 18 Jun 2018 14:01:36 +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 | 8 ++++----

 man/NetworkManager.conf.5              | 8 ++++----

 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html

index 0069f1e4164f..88f8b72e8597 100644

--- a/docs/api/html/NetworkManager.conf.html

+++ b/docs/api/html/NetworkManager.conf.html

@@ -193,7 +193,7 @@ plugins-=remove-me

         clients to be installed. The internal

         option uses a built-in DHCP client which is not currently as

         featureful as the external clients.

-
If this key is missing, it defaults to internal.

+
If this key is missing, it defaults to dhclient.

         It the chosen plugin is not available, clients are looked for

         in this order: dhclient, dhcpcd,

         internal.

@@ -359,7 +359,7 @@ no-auto-default=*

 
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".

+        "file".

         Regardless of this setting, NetworkManager will

         always write resolv.conf to its runtime state directory

         /var/run/NetworkManager/resolv.conf.

@@ -675,7 +675,7 @@ ipv6.ip6-privacy=0

 
ethernet.cloned-mac-address

-
If left unspecified, it defaults to "preserve".

+
If left unspecified, it defaults to "permanent".

 
ethernet.generate-mac-address-mask

@@ -771,7 +771,7 @@ ipv6.ip6-privacy=0

 
wifi.cloned-mac-address

-
If left unspecified, it defaults to "preserve".

+
If left unspecified, it defaults to "permanent".

 
wifi.generate-mac-address-mask

diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5

index 63959c9fb14b..73ccd7073e27 100644

--- a/man/NetworkManager.conf.5

+++ b/man/NetworkManager.conf.5

@@ -155,7 +155,7 @@ internal

 option uses a built\-in DHCP client which is not currently as featureful as the external clients\&.

 .sp

 If this key is missing, it defaults to

-internal\&. It the chosen plugin is not available, clients are looked for in this order:

+dhclient\&. It the chosen plugin is not available, clients are looked for in this order:

 dhclient,

 dhcpcd,

 internal\&.

@@ -281,7 +281,7 @@ that contains the original name servers pushed to the DNS plugin\&.

 .RS 4

 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

+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

 /var/run/NetworkManager/resolv\&.conf\&.

 .sp

 symlink: If

@@ -668,7 +668,7 @@ If left unspecified, the default value is 3 tries before failing the connection\

 .PP

 \fIethernet\&.cloned\-mac\-address\fR

 .RS 4

-If left unspecified, it defaults to "preserve"\&.

+If left unspecified, it defaults to "permanent"\&.

 .RE

 .PP

 \fIethernet\&.generate\-mac\-address\-mask\fR

@@ -768,7 +768,7 @@ If left unspecified, default value of 60 seconds is used\&.

 .PP

 \fIwifi\&.cloned\-mac\-address\fR

 .RS 4

-If left unspecified, it defaults to "preserve"\&.

+If left unspecified, it defaults to "permanent"\&.

 .RE

 .PP

 \fIwifi\&.generate\-mac\-address\-mask\fR

-- 

2.21.0