.gitignore: pycharm remote execution update

[mirror_ifupdown2.git] / docs / source / userguide.rst

diff --git a/docs/source/userguide.rst b/docs/source/userguide.rst
index 3e86206897b2a398a74c1a41ed272ac4a59a405e..0d4377026324079e8d18a3c106daa9409de91c30 100644 (file)
--- a/docs/source/userguide.rst
+++ b/docs/source/userguide.rst
@@ -10,7 +10,7 @@ Keep the following points in mind before you start configuring interfaces using
 ``ifupdown2``:
 
 * IPv4 and IPv6 addresses for an interface can be listed in the same ``iface`` 
-  section. For examples, see ``/usr/share/doc/python-ifupdown2/examples/``.
+  section. For examples, see ``/usr/share/doc/ifupdown2/examples/``.
 
 * Do not use a legacy interface alias. They are only supported for backward 
   compatibility with ``ifupdown``. They do get configured, but ``ifquery`` has 
@@ -66,7 +66,7 @@ Man Pages
 Configuration Files
 ===================
 
-* /etc/network/interfaces
+* config file defined in ifupdown2.conf (default /etc/network/interfaces)
 
     
 ifupdown Built-in Interfaces
@@ -109,7 +109,7 @@ following example configuration::
         bond-slaves swp29 swp30
         bond-mode 802.3ad
         bond-miimon 100
-        bond-use-carrier 1
+        bond-use-carrier yes
         bond-lacp-rate 1
         bond-min-links 1
         bond-xmit-hash-policy layer3+4
@@ -120,7 +120,7 @@ following example configuration::
         bond-slaves swp31 swp32
         bond-mode 802.3ad
         bond-miimon 100
-        bond-use-carrier 1
+        bond-use-carrier yes
         bond-lacp-rate 1
         bond-min-links 1
         bond-xmit-hash-policy layer3+4
@@ -298,7 +298,7 @@ The contents of the sourced file used above are::
         bond-slaves swp25 swp26
         bond-mode 802.3ad
         bond-miimon 100
-        bond-use-carrier 1
+        bond-use-carrier yes
         bond-lacp-rate 1
         bond-min-links 1
         bond-xmit-hash-policy layer3+4
@@ -363,7 +363,7 @@ file, run::
         bond-slaves swp25 swp26
         bond-mode 802.3ad
         bond-miimon 100
-        bond-use-carrier 1
+        bond-use-carrier yes
         bond-lacp-rate 1
         bond-min-links 1
         bond-xmit-hash-policy layer3+4
@@ -379,7 +379,7 @@ does not match::
     iface bond0
             bond-mode 802.3ad  (✓)
             bond-miimon 100  (✓)
-            bond-use-carrier 1  (✓)
+            bond-use-carrier yes  (✓)
             bond-lacp-rate 1  (✓)
             bond-min-links 1  (✓)
             bond-xmit-hash-policy layer3+4  (✓)
@@ -417,10 +417,10 @@ the ``interfaces`` file. For complete syntax on the ``interfaces`` file, see
     {
         "auto": true, 
         "config": {
-            "bond-use-carrier": "1", 
+            "bond-use-carrier": "yes",
             "bond-xmit-hash-policy": "layer3+4", 
             "bond-miimon": "100", 
-            "bond-lacp-rate": "1", 
+            "bond-lacp-rate": "1",
             "bond-min-links": "1", 
             "bond-slaves": "swp25 swp26", 
             "bond-mode": "802.3ad",