remove native ifupdown support from bridge-utils, vlan, ifenslave and

mstpctl + some ifupdown2 documentation cleanup

Ticket: CM-1438
Reviewed By:
Testing Done: ifupdown2 sanity testing

diff --git a/man.rst/ifquery.8.rst b/man.rst/ifquery.8.rst
index c5850b88c8ed9e31a0294d6781425e88d613ee24..8a09838be0d1dcb12379ce0c1cda7e44947a9a3d 100644 (file)
--- a/man.rst/ifquery.8.rst
+++ b/man.rst/ifquery.8.rst
@@ -118,12 +118,14 @@ EXAMPLES
 
         **ifquery --print-dependency=dot br2000**
 
-    # Create an image (png) from the dot format.
+    # Create an image (png) from the dot format
 
         **ifquery --print-dependency=dot -a > interfaces.dot**
 
         **dot -Tpng interfaces.dot > interfaces.png**
 
+        (The above command only works on a system with dot installed)
+
 
 SEE ALSO
 ========
@@ -131,4 +133,4 @@ SEE ALSO
     ifdown(8),
     ifreload(8),
     interfaces(5),
-    ifupdownaddons-interfaces(5)
+    ifupdown-addons-interfaces(5)

diff --git a/man.rst/ifreload.8.rst b/man.rst/ifreload.8.rst
index 3945f81081af61d459914398bdd308ee9fcd21e9..41cf3f6378f64a03bbd090f1b0848b3e0e0745de 100644 (file)
--- a/man.rst/ifreload.8.rst
+++ b/man.rst/ifreload.8.rst
@@ -56,4 +56,4 @@ SEE ALSO
     ifdown(8),
     ifquery(8),
     interfaces(5),
-    ifupdownaddons-interfaces(5)
+    ifupdown-addons-interfaces(5)

diff --git a/man.rst/ifup.8.rst b/man.rst/ifup.8.rst
index 7474d3e21130958afee3f269ca9f8b7be425d61f..1e96501937c30624e9ac61140ee60277d7be73da 100644 (file)
--- a/man.rst/ifup.8.rst
+++ b/man.rst/ifup.8.rst
@@ -153,4 +153,4 @@ SEE ALSO
     ifquery(8),
     ifreload(8),
     interfaces(5),
-    ifupdownaddons-interfaces(5)
+    ifupdown-addons-interfaces(5)

diff --git a/man.rst/interfaces.5.rst b/man.rst/interfaces.5.rst
index f21dcfd3c25cd6acf8c05623cb89560d247f4b47..b507faab967a60362d36c09e5c4e6681714e5bc9 100644 (file)
--- a/man.rst/interfaces.5.rst
+++ b/man.rst/interfaces.5.rst
@@ -33,7 +33,7 @@ DESCRIPTION
 
         iface lo inet loopback
 
-        source /etc/network/interfaces.d/machine-dependent
+        source /etc/network/interfaces.d/bridges
 
         iface eth0-home inet static
             address 192.168.1.1/24
@@ -69,14 +69,14 @@ DESCRIPTION
     ipv6. Following that is the name of the method used to configure the
     interface.
 
-    ifupdown2 supports iface stanzas without a family or a method. This enables
+    ifupdown supports iface stanzas without a family or a method. This enables
     using the same stanza for inet and inet6 family addresses.
 
     Interface options can be given on subsequent lines in the iface stanza.
-    These options come from addon modules. see interfaces-addons(5) for
+    These options come from addon modules. see ifupdown-addons-interfaces(5) for
     these options.
 
-    ifupdown2 supports python-mako style templates in the interfaces file.
+    ifupdown supports python-mako style templates in the interfaces file.
     See examples section for details.
 
 METHODS
@@ -97,10 +97,10 @@ METHODS
 BUILTIN INTERFACES
 ==================
     iface sections for some interfaces like physical interfaces or vlan
-    interfaces in dot notation (like eth1.100) are understood by ifupdown2.
-    These kind of interfaces do not need an entry in the interfaces file.
-    However, if these interfaces need extra configuration like addresses, they
-    will need to be specified.
+    interfaces in dot notation (like eth1.100) are understood by ifupdown.
+    These interfaces do not need an entry in the interfaces file if
+    they are dependents of other interfaces and dont need any specific
+    configurations like addresses etc.
 
 EXAMPLES
 ========
@@ -129,7 +129,7 @@ EXAMPLES
                 address 10.20.${v}.3/24
         % endfor
 
-    For additional syntax and examples see **ifupdownaddons-interfaces(5)**
+    For additional syntax and examples see **ifupdown-addons-interfaces(5)**
 
 FILES
 =====
@@ -137,7 +137,7 @@ FILES
 
 SEE ALSO
 ========
-    ifupdownaddons-interfaces(5),
+    ifupdown-addons-interfaces(5),
     ifup(8),
     ifquery(8),
     ifreload(8)