Merge branch 'master' of ssh://git.nic.cz/bird

1 files changed, 23 insertions, 7 deletions

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 3edd6e0e..b43eb263 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1811,7 +1811,7 @@ protocol ospf <name> {
 			summary <switch>;
 			cost <num>;
 		}
-		interface <interface pattern> {
+		interface <interface pattern> [instance <num>] {
 			cost <num>;
 			stub <switch>;
 			hello <num>;
@@ -1825,6 +1825,7 @@ protocol ospf <name> {
 			type [broadcast|bcast|pointopoint|ptp|
 				nonbroadcast|nbma|pointomultipoint|ptmp];
 			strict nonbroadcast <switch>;
+			real broadcast <switch>;
 			check link <switch>;
 			ecmp weight <num>;
 			authentication [none|simple|cryptographic];
@@ -1841,7 +1842,7 @@ protocol ospf <name> {
 				<ip> eligible;
 			};
 		};
-		virtual link <id>	{
+		virtual link <id> [instance <num>] {
 			hello <num>;
 			retransmit <num>;
 			wait <num>;
@@ -1961,14 +1962,19 @@ protocol ospf <name> {
 	 subnetworks of given stub network are suppressed. This might
 	 be used, for example, to aggregate generated stub networks.
 	 
-	<tag>interface <M>pattern</M></tag>
+	<tag>interface <M>pattern</M> [instance <m/num/]</tag>
 	 Defines that the specified interfaces belong to the area being defined.
 	 See <ref id="dsc-iface" name="interface"> common option for detailed description.
+	 In OSPFv3, you can specify instance ID for that interface
+	 description, so it is possible to have several instances of
+	 that interface with different options or even in different areas.
 
-	<tag>virtual link <M>id</M></tag>
-	 Virtual link to router with the router id. Virtual link acts as a
-         point-to-point interface belonging to backbone. The actual area is
-         used as transport area. This item cannot be in the backbone.
+	<tag>virtual link <M>id</M> [instance <m/num/]</tag>
+	 Virtual link to router with the router id. Virtual link acts
+         as a point-to-point interface belonging to backbone. The
+         actual area is used as transport area. This item cannot be in
+         the backbone. In OSPFv3, you could also use several virtual
+         links to one destination with different instance IDs.
 
 	<tag>cost <M>num</M></tag>
 	 Specifies output cost (metric) of an interface. Default value is 10.
@@ -2053,6 +2059,16 @@ protocol ospf &lt;name&gt; {
 	 If set, don't send hello to any undefined neighbor. This switch
 	 is ignored on other than NBMA or PtMP networks. Default value is no.
 
+	<tag>real broadcast <m/switch/</tag>
+	 In <cf/type broadcast/ or <cf/type ptp/ network
+	 configuration, OSPF packets are sent as IP multicast
+	 packets. This option changes the behavior to using
+	 old-fashioned IP broadcast packets. This may be useful as a
+	 workaround if IP multicast for some reason does not work or
+	 does not work reliably. This is a non-standard option and
+	 probably is not interoperable with other OSPF
+	 implementations. Default value is no.
+
 	<tag>check link <M>switch</M></tag>
 	 If set, a hardware link state (reported by OS) is taken into
 	 consideration. When a link disappears (e.g. an ethernet cable is