From 7621fe4e1a6da7d61fe9e9398937bc5dd536c8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Lavi=C3=B3s=20Gomis?= <adrian@lavios.eu>
Date: Sun, 18 Feb 2018 09:49:26 +0100
Subject: [PATCH] man: update NetworkManager.conf man page to account for
 stub-resolv.conf (#68)

NetworkManager checks if /etc/resolv.conf is a symlink to
/run/systemd/resolve/stub-resolv.conf since commit
e09503dcc43039905018b26304bfe94287211aa6. This should be
documented in the corresponding section of NetworkManager.conf(5).

https://github.com/NetworkManager/NetworkManager/pull/68
---
 man/NetworkManager.conf.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 9151b2414d..bbd9bf8fc0 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -312,6 +312,7 @@ no-auto-default=*
         <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.
         If the key is unspecified, <literal>default</literal> is used,
         unless <filename>/etc/resolv.conf</filename> is a symlink to
+        <filename>/run/systemd/resolve/stub-resolv.conf</filename>,
         <filename>/run/systemd/resolve/resolv.conf</filename>,
         <filename>/lib/systemd/resolv.conf</filename> or
         <filename>/usr/lib/systemd/resolv.conf</filename>.