Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fix some warnings from sphinx when building docs.

CHANGES

@@ -1,4 +1,8 @@
 
+2.1-169 | 2012-11-23 18:21:32 -0800
+
+  * Fix some warnings from sphinx when building docs. (Jon Siwek)
+
 2.1-167 | 2012-11-14 13:19:17 -0800
 
   * Add a new BIF "bytestring_to_double" for converting from a binary

VERSION

@@ -1 +1 @@
-2.1-167
+2.1-169

scripts/base/frameworks/intel/main.bro

@@ -59,7 +59,7 @@ export {
 	};
 	
 	## Enum to represent where data came from when it was discovered.
-	## The convenction is to prefix the name with "IN_".
+	## The convention is to prefix the name with ``IN_``.
 	type Where: enum {
 		## A catchall value to represent data of unknown provenance.
 		IN_ANYWHERE,

scripts/policy/integration/collective-intel/README

@@ -1,6 +1,4 @@
-Collective Intelligence Framework Integration
-=============================================
-
-The scripts in this module are for deeper integration with the Collective Intelligence
-Framework (CIF) since Bro's Intel framework doesn't natively behave the same as CIF nor
-does it store and maintain the same data in all cases.
+The scripts in this module are for deeper integration with the
+Collective Intelligence Framework (CIF) since Bro's Intel framework
+doesn't natively behave the same as CIF nor does it store and maintain
+the same data in all cases.

scripts/policy/protocols/modbus/track-memmap.bro

@@ -2,11 +2,12 @@
 ##! changes as they are discovered.
 ##!
 ##! .. todo: Not all register reads and write functions are being supported yet.
-module Modbus;
 
 @load base/protocols/modbus
 @load base/utils/directions-and-hosts
 
+module Modbus;
+
 export {
 	redef enum Log::ID += { Modbus::REGISTER_CHANGE_LOG };