summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/examples/bonding9
-rw-r--r--docs/examples/wireless-wpa5
-rw-r--r--docs/netcfg-profiles.txt21
-rw-r--r--docs/netcfg.txt4
4 files changed, 34 insertions, 5 deletions
diff --git a/docs/examples/bonding b/docs/examples/bonding
new file mode 100644
index 0000000..7b70d46
--- /dev/null
+++ b/docs/examples/bonding
@@ -0,0 +1,9 @@
+CONNECTION="bond"
+DESCRIPTION='Bond Interface'
+INTERFACE='bond0'
+IP='static'
+ADDR="10.0.0.1"
+NETMASK="255.0.0.0"
+BOND_INTERFACES=("eth0" "eth2")
+SKIPNOCARRIER="yes"
+
diff --git a/docs/examples/wireless-wpa b/docs/examples/wireless-wpa
index 20f5509..e2511f3 100644
--- a/docs/examples/wireless-wpa
+++ b/docs/examples/wireless-wpa
@@ -2,8 +2,13 @@ CONNECTION='wireless'
DESCRIPTION='A simple WPA encrypted wireless connection'
INTERFACE='wlan0'
SECURITY='wpa'
+
ESSID='MyNetwork'
+## Uncomment if the supplied ESSID is hexadecimal
+#ESSID_TYPE='hex'
KEY='WirelessKey'
+
IP='dhcp'
+
# Uncomment this if your ssid is hidden
#HIDDEN=yes
diff --git a/docs/netcfg-profiles.txt b/docs/netcfg-profiles.txt
index 5e11076..2aa7653 100644
--- a/docs/netcfg-profiles.txt
+++ b/docs/netcfg-profiles.txt
@@ -1,7 +1,7 @@
-% NETCFG-PROFILES(5) netcfg 2.6.7 | Arch Linux
+% NETCFG-PROFILES(5) netcfg 2.6.8 | Arch Linux
% Rémy Oudompheng <remy@archlinux.org>
James Rayner <james@archlinux.org>
-% 8 August 2011
+% 14 August 2011
NAME
====
@@ -42,6 +42,8 @@ ethernet
wireless
: Wireless connection, with **wpa_supplicant**(1) as configuration
back-end.
+bond
+: Bonded network interfaces using **ifenslave**.
bridge
: Network bridge setup using **brctl**(8).
tuntap
@@ -159,7 +161,12 @@ SECURITY (required for security of 'wep', 'wpa', 'wpa-configsection' or 'wpa-con
KEY (required for SECURITY of 'wpa' or 'wep' only)
: Wireless encryption key.
ESSID (this or AP is required)
-: Name of network to connect to.
+: Name of network to connect to, or hexadecimal digits (see
+ 'ESSID_TYPE')
+ESSID_TYPE (optional, defaults to 'ascii')
+: Set to 'ascii' or 'hex', if set to 'hex', ESSID will be interpreted
+ as an hexadecimal SSID and written unquoted to the wpa_supplicant
+ configuration file.
AP (this or ESSID is required)
: AP (BSSID) of the network to connect to.
HIDDEN (optional)
@@ -257,6 +264,14 @@ LOCAL
REMOTE
: The address of the remote end of the tunnel.
+Options for 'bond' connections
+==============================
+
+Standard 'ethernet' options apply for IP configuration.
+
+SLAVE_INTERFACES (Bash array)
+: An array of names of interfaces to be bound together.
+
Options for 'openvpn' connections
================================
diff --git a/docs/netcfg.txt b/docs/netcfg.txt
index e85abd8..0cb4408 100644
--- a/docs/netcfg.txt
+++ b/docs/netcfg.txt
@@ -1,7 +1,7 @@
-% NETCFG(8) netcfg 2.6.7 | Arch Linux
+% NETCFG(8) netcfg 2.6.8 | Arch Linux
% Rémy Oudompheng <remy@archlinux.org>
James Rayner <james@archlinux.org>
-% July 2011
+% 2011-08-14
NAME
====