diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2013-09-10 12:54:57 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2013-09-10 12:54:57 +0200 |
| commit | d27e127aa996d500fed21be2bbbe888cafecb830 (patch) | |
| tree | e388432615334c4e12302cfb4097b66ecde2ee5e | |
| parent | bff9ce5130d16af2fd802d42bdb2bff00980c9ae (diff) | |
| parent | b0a8c7fc8547eef21ede33887580b5e867ee742c (diff) | |
Merge commit 'origin/master'
| -rw-r--r-- | conf/cf-lex.l | 2 | ||||
| -rw-r--r-- | doc/bird.sgml | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l index 50f390e0..b1bbeae2 100644 --- a/conf/cf-lex.l +++ b/conf/cf-lex.l @@ -172,7 +172,7 @@ else: { return ELSECOL; } -({ALPHA}{ALNUM}*|[']({ALNUM}|[-]|[\.])*[']) { +({ALPHA}{ALNUM}*|[']({ALNUM}|[-]|[\.]|[:])*[']) { if(*yytext == '\'') { yytext[yyleng-1] = 0; yytext++; diff --git a/doc/bird.sgml b/doc/bird.sgml index 3cd80c32..b3f6a85c 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -477,7 +477,7 @@ to zero to disable it. An empty <cf><m/switch/</cf> is equivalent to <cf/on/ using <cf/show route filtered/. Note that this option does not work for the pipe protocol. Default: off. - <tag>import limit [<m/number/ | off ] [action warn | block | restart | disable]</tag> + <tag><label id="import-limit">import limit [<m/number/ | off ] [action warn | block | restart | disable]</tag> Specify an import route limit (a maximum number of routes imported from the protocol) and optionally the action to be taken when the limit is hit. Warn action just prints warning @@ -1509,8 +1509,9 @@ for each neighbor using the following configuration parameters: <tag>route limit <m/number/</tag> The maximal number of routes that may be imported from the protocol. If the route limit is - exceeded, the connection is closed with error. Limit is currently implemented as - <cf/import limit number exceed restart/. Default: no limit. + exceeded, the connection is closed with an error. Limit is currently implemented as + <cf/import limit <m/number/ action restart/. This option is obsolete and it is + replaced by <ref id="import-limit" name="import limit option">. Default: no limit. <tag>disable after error <m/switch/</tag> When an error is encountered (either locally or by the other side), disable the instance automatically |