diff --git a/NEWS b/NEWS index baf5a7afd..40c517326 100644 --- a/NEWS +++ b/NEWS @@ -791,7 +791,7 @@ This is a new stable release of NetworkManager. Notable changes include: * The libnm-glib library, deprecated in favor of libnm since NetworkManager 1.0, and disabled by default since NetworkManager 1.12, has now been removed. -* The DHCP client now defaults to "internal". The default can be overriden +* The DHCP client now defaults to "internal". The default can be overridden at build time by using the --with-config-dhcp-default option of the configure script or at run time by setting the main.dhcp option in the configuration file. diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index d86523c13..36e10061d 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -492,7 +492,7 @@ no-auto-default=* files without preserving their contents. - The path can also be overriden by pointing to a specific + The path can also be overridden by pointing to a specific existing and writable directory. On the other hand setting this to an empty string or any other value disables the profile conversion mechanism.