From ffdbf5ab0f861db24862d44a9d831d3764400b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Tue, 16 Dec 2014 13:00:28 +0100
Subject: [PATCH] man: add description of BOOTPROTO to nm-settings-ifcfg-rh
 manpage (cherry picked from commit a3c52d7a3322c9fbe91503a450de665882074727)

---
 man/nm-settings-ifcfg-rh.xsl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index f76dee759d..e0e3eb9a09 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -243,11 +243,21 @@ DEVICETYPE=TeamPort
                     nameservers to resolv.conf".</para>
                   </listitem>
                   <listitem>
-                  <para><literal>ONBOOT</literal> -
+                    <para><literal>ONBOOT</literal> -
                     initscripts use ONBOOT=yes to mark the devices that are to be activated
                     during boot. NetworkManager extents this to also mean that this profile
                     can be used for auto-connecting at any time.</para>
                   </listitem>
+                  <listitem>
+                    <para><literal>BOOTPROTO</literal> -
+                    NetworkManager supports traditional values <emphasis>none</emphasis> (static),
+                    <emphasis>dhcp</emphasis>. But it also allows additional values to
+                    enable new addressing methods. They are <emphasis>autoip</emphasis> for IPv4
+                    link-local addressing using Avahi daemon and <emphasis>shared</emphasis> for
+                    connection sharing. When <emphasis>shared</emphasis> is used, NetworkManager
+                    assigns the interface 10.42.0.1, or it uses the first static address,
+                    if configured.</para>
+                 </listitem>
                 </itemizedlist>
               </para></listitem>
             </varlistentry>