13 files changed, 19 insertions, 21 deletions
diff --git a/docs/examples/ethernet-iproute b/docs/examples/ethernet-custom
index 972f5bb..d3a7b14 100644
--- a/docs/examples/ethernet-iproute
+++ b/docs/examples/ethernet-custom
@@ -1,4 +1,4 @@
-Description='A more versatile static ethernet connection using iproute'
+Description='A more versatile static ethernet connection'
 Interface=eth0
 Connection=ethernet
 IP=static
diff --git a/docs/examples/ethernet-dhcp b/docs/examples/ethernet-dhcp
index 5866238..412ff88 100644
--- a/docs/examples/ethernet-dhcp
+++ b/docs/examples/ethernet-dhcp
@@ -1,4 +1,4 @@
-Description='A basic dhcp ethernet connection using iproute'
+Description='A basic dhcp ethernet connection'
 Interface=eth0
 Connection=ethernet
 IP=dhcp
@@ -6,4 +6,3 @@ IP=dhcp
 #IP6=dhcp
 ## for IPv6 autoconfiguration
 #IP6=stateless
-
diff --git a/docs/examples/ethernet-static b/docs/examples/ethernet-static
index 0d6b5a2..b346688 100644
--- a/docs/examples/ethernet-static
+++ b/docs/examples/ethernet-static
@@ -1,8 +1,9 @@
-Description='A basic static ethernet connection using iproute'
+Description='A basic static ethernet connection'
 Interface=eth0
 Connection=ethernet
 IP=static
-Address='192.168.1.23'
+# The netmask in the IPv4 address is optional and defaults to 24
+Address='192.168.1.23/28'
 #Routes=('192.168.0.0/24 via 192.168.1.2')
 Gateway='192.168.1.1'
 DNS=('192.168.1.1')
diff --git a/docs/examples/tuntap b/docs/examples/tuntap
index 8ce78ac..69316a3 100644
--- a/docs/examples/tuntap
+++ b/docs/examples/tuntap
@@ -1,3 +1,4 @@
+Description='Example tuntap connection'
 Interface=tun0
 Connection=tuntap
 Mode='tun'
@@ -7,4 +8,3 @@ Group='nobody'
 ## Example IP configuration
 #IP=static
 #Address='10.10.1.2'
-
diff --git a/docs/examples/vlan-dhcp b/docs/examples/vlan-dhcp
index c412618..237c411 100644
--- a/docs/examples/vlan-dhcp
+++ b/docs/examples/vlan-dhcp
@@ -1,3 +1,4 @@
+Description='Virtual LAN 55 on interface eth0 using DHCP'
 Interface=eth0.55
 Connection=vlan
 # The variable name is plural, but needs precisely one interface
diff --git a/docs/examples/vlan-static b/docs/examples/vlan-static
index f9e1ae5..eb6e82a 100644
--- a/docs/examples/vlan-static
+++ b/docs/examples/vlan-static
@@ -1,3 +1,4 @@
+Description='Virtual LAN 11 on interface eth0'
 Interface=eth0.11
 Connection=vlan
 # The variable name is plural, but needs precisely one interface
diff --git a/docs/examples/wireless-open b/docs/examples/wireless-open
index f4bf9bb..ba6e55c 100644
--- a/docs/examples/wireless-open
+++ b/docs/examples/wireless-open
@@ -1,8 +1,8 @@
-Description='A simple opened wireless connection'
+Description='A simple open wireless connection'
 Interface=wlan0
 Connection=wireless
 Security=none
 ESSID='MyNetwork'
-IP='dhcp'
+IP=dhcp
 # Uncomment this if your ssid is hidden
 #Hidden=yes
diff --git a/docs/examples/wireless-wep b/docs/examples/wireless-wep
index 479b8a3..e881e25 100644
--- a/docs/examples/wireless-wep
+++ b/docs/examples/wireless-wep
@@ -5,7 +5,7 @@ Security=wep
 ESSID='MyNetwork'
 # Prepend hexadecimal keys with \"
 Key=\"1234567890abcdef
-IP='dhcp'
+IP=dhcp
 # Uncomment this if your ssid is hidden
 #Hidden=yes
 # Uncomment if you are using an ad-hoc connection
diff --git a/docs/examples/wireless-wep-string-key b/docs/examples/wireless-wep-string-key
index 12483c0..e4c6af4 100644
--- a/docs/examples/wireless-wep-string-key
+++ b/docs/examples/wireless-wep-string-key
@@ -4,6 +4,6 @@ Connection=wireless
 Security=wep
 ESSID='MyNetwork'
 Key='Wireless Key'
-IP='dhcp'
+IP=dhcp
 # Uncomment this if your ssid is hidden
 #Hidden=yes
diff --git a/docs/examples/wireless-wpa b/docs/examples/wireless-wpa
index 16d17e9..5b8f4ba 100644
--- a/docs/examples/wireless-wpa
+++ b/docs/examples/wireless-wpa
@@ -3,12 +3,11 @@ Interface=wlan0
 Connection=wireless
 Security=wpa
 
+IP=dhcp
+
 ESSID='MyNetwork'
 # Prepend hexadecimal keys with \"
 # If your key starts with ", write it as '"""<key>"'
 Key='WirelessKey'
-
-IP='dhcp' 
-
 # Uncomment this if your ssid is hidden
 #Hidden=yes
diff --git a/docs/examples/wireless-wpa-config b/docs/examples/wireless-wpa-config
index e598dce..cb1face 100644
--- a/docs/examples/wireless-wpa-config
+++ b/docs/examples/wireless-wpa-config
@@ -1,8 +1,6 @@
-Description='A wpa_supplicant configuration based wireless connection'
+Description='A wpa_supplicant configuration file based wireless connection'
 Interface=wlan0
 Connection=wireless
 Security=wpa-config
 WPAConfigFile='/etc/wpa_supplicant.conf'
-IP='dhcp' 
-# Uncomment this if your ssid is hidden
-#Hidden=yes
+IP=dhcp
diff --git a/docs/examples/wireless-wpa-configsection b/docs/examples/wireless-wpa-configsection
index dde9ccd..820ff4b 100644
--- a/docs/examples/wireless-wpa-configsection
+++ b/docs/examples/wireless-wpa-configsection
@@ -1,9 +1,8 @@
+Description='A wireless connection using a custom network block configuration'
 Interface=wlan0
 Connection=wireless
 Security=wpa-configsection
-# Uncomment this if your ssid is hidden
-#Hidden=yes
-IP='dhcp'
+IP=dhcp
 WPAConfigSection=(
     'ssid="University"'
     'key_mgmt=WPA-EAP'
diff --git a/src/wifi-menu b/src/wifi-menu
index 8c8189a..b79eebe 100755
--- a/src/wifi-menu
+++ b/src/wifi-menu
@@ -126,7 +126,7 @@ Interface=$INTERFACE
 Connection=wireless
 Security=$security
 ESSID=$(printf "%q" "$1")
-IP='dhcp'
+IP=dhcp
 ${key+Key=$key}
 EOF
     printf "%s" "$PROFILE"