Merge commit 'origin/master' into new

This commit is contained in:
Ondrej Zajicek 2010-01-08 22:20:09 +01:00
commit 974363c172

View file

@ -1370,7 +1370,7 @@ protocol ospf <name> {
rx buffer [normal|large|<num>]; rx buffer [normal|large|<num>];
type [broadcast|nonbroadcast|pointopoint]; type [broadcast|nonbroadcast|pointopoint];
strict nonbroadcast <switch>; strict nonbroadcast <switch>;
authentication [none|simple|cryptographics]; authentication [none|simple|cryptographic];
password "<text>"; password "<text>";
password "<text>" { password "<text>" {
id <num>; id <num>;
@ -1390,7 +1390,7 @@ protocol ospf <name> {
wait <num>; wait <num>;
dead count <num>; dead count <num>;
dead <num>; dead <num>;
authentication [none|simple|cryptographics]; authentication [none|simple|cryptographic];
password "<text>"; password "<text>";
}; };
}; };