Merge remote-tracking branch 'origin/topic/jsiwek/autodoc-fixes'

* origin/topic/jsiwek/autodoc-fixes:
  Update doc sources and touch up a few script comments.
  Fixes for script auto-documentation.

Conflicts:
	scripts/base/frameworks/logging/main.bro

scripts/base/frameworks/cluster/nodes/manager.bro

@@ -10,7 +10,7 @@
 
 @prefixes += cluster-manager
 
-## Load the script for local site configuration for the manager node.
+# Load the script for local site configuration for the manager node.
 @load site/local-manager
 
 ## Turn off remote logging since this is the manager and should only log here.

scripts/base/frameworks/cluster/nodes/proxy.bro

@@ -1,7 +1,7 @@
 
 @prefixes += cluster-proxy
 
-## Load the script for local site configuration for proxy nodes.
+# Load the script for local site configuration for proxy nodes.
 @load site/local-proxy
 
 ## The proxy only syncs state; does not forward events.

scripts/base/frameworks/cluster/nodes/worker.bro

@@ -1,7 +1,7 @@
 
 @prefixes += cluster-worker
 
-## Load the script for local site configuration for the worker nodes.
+# Load the script for local site configuration for the worker nodes.
 @load site/local-worker
 
 ## Don't do any local logging.

scripts/base/frameworks/cluster/setup-connections.bro

@@ -1,3 +1,5 @@
+@load ./main
+@load base/frameworks/communication/main
 
 module Cluster;
 

scripts/base/frameworks/communication/__load__.bro

@@ -1 +1 @@
-@load ./main
+@load ./main

scripts/base/frameworks/notice/actions/email_admin.bro

@@ -1,4 +1,3 @@
-
 module Notice;
 
 export {
@@ -25,4 +24,4 @@ event notice(n: Notice::Info) &priority=-5
 		if ( email != "" )
 			email_notice_to(n, email, T);
 		}
-	}
+	}

scripts/base/frameworks/notice/extend-email/hostnames.bro

@@ -37,4 +37,4 @@ event Notice::notice(n: Notice::Info) &priority=10
 	
 	if ( output != "" )
 		n$email_body_sections[|n$email_body_sections|] = output;
-	}
+	}

scripts/base/frameworks/notice/weird.bro

@@ -1,4 +1,3 @@
-
 module Weird;
 
 export {

scripts/base/protocols/mime/base.bro

@@ -1,7 +1,7 @@
 ##! The mime script does analysis of MIME encoded messages seen in certain
 ##! protocols (only SMTP and POP3 at the moment).
 
-@load utils/strings
+@load base/utils/strings
 
 module MIME;
 

scripts/base/protocols/mime/file-extract.bro

@@ -1,5 +1,5 @@
-@load protocols/mime/file-ident
-@load utils/files
+@load ./file-ident
+@load base/utils/files
 
 module MIME;
 

scripts/base/protocols/mime/file-hash.bro

@@ -1,4 +1,4 @@
-@load protocols/mime/file-ident
+@load ./file-ident
 
 module MIME;
 
@@ -75,4 +75,4 @@ event mime_end_entity(c: connection) &priority=-3
 		NOTICE([$note=MD5, $msg=fmt("Calculated a hash for a MIME entity from %s", c$id$orig_h),
 		        $sub=c$mime$md5, $conn=c]);
 		}
-	}
+	}

scripts/base/protocols/mime/file-ident.bro

@@ -1,4 +1,4 @@
-@load protocols/mime/base
+@load ./base
 
 module MIME;