Merge commit 'origin/master' into new

2 files changed, 3 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 06c921fe..d1ce33c1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
-Version 1.1.7 (2009-12-21)
+Version 1.1.7 (2009-12-20)
   o Implements BGP Route Refresh (RFC 2918).
-  o Implements route reload feature.
+  o Implements route reload command.
   o Deep changes and bugfixes in pipe protocol.
   o Bugfix in OSPF premature aging of LSA.
   o Bugfix in OSPF next hop calculation.
diff --git a/doc/bird.sgml b/doc/bird.sgml
index e894353a..53d87b6b 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1536,7 +1536,7 @@ Default is <cf/metric of type 2 = 10000/ and <cf/tag = 0/.
 
 <code>
 protocol ospf MyOSPF {
-        rfc1583compatibility yes;
+        rfc1583compat yes;
         tick 2;
 	export filter {
 		if source = RTS_BGP then {