uci_network: remove /proc/switch references

[web.git] / docs / uci_net.txt

diff --git a/docs/uci_net.txt b/docs/uci_net.txt
index aa338c2734f6dd7882bfeb1dca6081ce67182c6e..a1d5637ec5a3847b09e0bea4020a8adcaccb361b 100644 (file)
--- a/docs/uci_net.txt
+++ b/docs/uci_net.txt
@@ -1,8 +1,8 @@
+---
+---
 Network configuration
 =====================
 
-include::uci_menu.inc[]
-
 == Network configuration
 
 The central network configuration is located in the file **'/etc/config/network'**. This configuration file is responsible for defining _switch VLANs_, _interface configurations_ and _network routes_.
@@ -29,28 +29,6 @@ The 'globals' section contains interface-independent options affecting the netwo
 
 The 'switch' section is responsible for partitioning the switch into several _VLANs_ which appear as independent interfaces in the system although they share the same hardware. **Not every OpenWrt supported device (or architecture, like x86) has a programmable switch**, therefore this section might not be present on some platforms. Please also note, that some switches only support 4Bit-VLANs.
 
-There are currently two different configuration formats in use, one for the legacy '/proc/switch/' API and one for the newer swconfig-based switch configuration.
-
-=== /proc/switch ===
-
-This variant is actually only found on Broadcom devices like the WRT54GL.
-
-A typical configuration for it looks like this:
-
-----
-config 'switch' 'eth0'
-       option 'vlan0' '0 1 2 3 5*'
-       option 'vlan1' '4 5'
-----
-
-The 'eth0' identifier specifies the switch the section is belonging to.
-VLANs are defined by 'vlan#' options with '#' being the VLAN number.
-
-=== swconfig ===
-
-The newer swconfig framework is intended to replace the legacy switch configuration.
-
-Configuration for swconfig have a slightly different structure with one extra section per VLAN.
 The example below shows a typical configuration:
 
 ----
@@ -374,7 +352,7 @@ opkg install ppp kmod-pppoe ppp-mod-pppoe
 
 === Protocol "pptp" (Point-to-Point Tunneling Protocol) ===
 
-*CAUTION*: The package 'pptp' must be installed to use PPtP. You need to have another section to configure the "parent" device, and you might need to add "<vpn>" to your "wan" zone in the firewall (<vpn> being the "logical interface name" of this section).
+*CAUTION*: The package 'ppp-mod-pptp' must be installed to use PPtP. You need to have another section to configure the "parent" device, and you might need to add "<vpn>" to your "wan" zone in the firewall (<vpn> being the "logical interface name" of this section).
 
 [cols="4*1,4",options="header"]
 |====
@@ -382,11 +360,13 @@ opkg install ppp kmod-pppoe ppp-mod-pppoe
 | 'server' | ip address | yes | _(none)_ | Remote PPtP server
 | 'username' | string | no(?) | _(none)_ | Username for PAP/CHAP authentication
 | 'password' | string | no(?) | _(none)_ | Password for PAP/CHAP authentication
-| 'keepalive' | integer | no | ? | Number of attempts to reconnect
-| 'defaultroute' | boolean | no | '1' | Whether to create a default route over the tunnel
-| 'peerdns' | boolean | no | '1' |Use PPTP-provided DNS server(s)
-| 'delegate' | boolean | no | ?  |Use builtin IPv6-management
-| 'iface' | string | no(?) | 'pptp-<vpn>' | Name of the physical interface. Defaults to 'pptp-<vpn>' no matter what you use
+| 'keepalive' | number | no | _(none)_ | Number of unanswered echo requests before considering the peer dead. The interval between echo requests is 5 seconds.
+| 'demand' | number | no | _(none)_ | Number of seconds to wait before closing the connection due to inactivity
+| 'defaultroute' | boolean | no | '1' | Replace existing default route on PPtP connect
+| 'peerdns' | boolean | no | '1' | Use peer-assigned DNS server(s)
+| 'dns' | list of ip addresses | no | _(none)_ | Override peer-assigned DNS server(s)
+| 'ipv6' | boolean | no | '0' | Enable IPv6 on the PPtP link
+| 'pppd_options' | string | no | _(none)_ | Additional command line arguments to pass to the pppd daemon
 |====
 
 === Protocol "6in4" (IPv6-in-IPv4 Tunnel) ===