From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 21 May 2009 07:26:59 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: v1.2.0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c84554b671fce473fe333ab3d8b548a0768882b;p=thirdparty%2Fbird.git

Merge branch 'master' into dev
---

6c84554b671fce473fe333ab3d8b548a0768882b
diff --cc doc/bird.sgml
index d0fe47d00,f62881c3e..c73872b7a
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@@ -451,9 -367,12 +451,12 @@@ This argument can be omitted if there e
  	a given filter (<cf>filter <m/name/</cf> or <cf>filter { <m/filter/ }
  	</cf> or matching a given condition (<cf>where <m/condition/</cf>).
  	The <cf/import/ and <cf/preimport/ switches ask for printing of entries
 -        that are imported to the specified protocol. With <cf/preimport/, the
 +	that are imported to the specified protocol. With <cf/preimport/, the
  	import filter of the protocol is skipped.
  
+ 	<p>You can also select just routes added by a specific protocol.
+ 	<cf>protocol <m/p/</cf>.
+ 
  	<p>The <cf/stats/ switch requests showing of route statistics (the
  	number of networks, number of routes before and after filtering). If
  	you use <cf/count/ instead, only the statistics will be printed.