--- gvpe/doc/gvpe.conf.5.pod 2013/07/16 16:44:36 1.32 +++ gvpe/doc/gvpe.conf.5.pod 2013/07/18 13:35:19 1.33 @@ -33,10 +33,29 @@ All settings are applied "in order", that is, later settings of the same variable overwrite earlier ones. -The only exceptions to the above are the "on" and "include" directives: +The only exceptions to the above are the following directives: =over 4 +=item node nodename + +Introduces a node section. The nodename is used to select the right +configuration section and is the same string as is passed as an argument +to the gvpe daemon. + +Multiple C statements with the same node name are supported and will +be merged together. + +=item global + +This statement switches back to the global section, which is mainly +useful if you want to include a second config file, e..g for local +customisations. To do that, simply include this at the very end of your +config file: + + global + include local.conf + =item on nodename ... =item on !nodename ... @@ -386,12 +405,6 @@ ip rule add not fwmark 1000 lookup 99 -=item node = nickname - -Not really a config setting but introduces a node section. The nickname is -used to select the right configuration section and must be passed as an -argument to the gvpe daemon. - =item node-up = relative-or-absolute-path Sets a command (default: none) that should be called whenever a connection