Fix some malformed Broxygen xref roles.

scripts/base/frameworks/control/main.bro

@@ -1,6 +1,6 @@
 ##! This is a utility script that sends the current values of all &redef'able
-##! consts to a remote Bro then sends the :bro:id:`configuration_update` event
-##! and terminates processing.
+##! consts to a remote Bro then sends the
+##! :bro:id:`Control::configuration_update` event and terminates processing.
 ##!
 ##! Intended to be used from the command line like this when starting a controller::
 ##!
@@ -53,7 +53,8 @@ export {
 
 	## Event for requesting the value of an ID (a variable).
 	global id_value_request: event(id: string);
-	## Event for returning the value of an ID after an :bro:id:`id_request` event.
+	## Event for returning the value of an ID after an
+	## :bro:id:`Control::id_value_request` event.
 	global id_value_response: event(id: string, val: string);
 
 	## Requests the current communication status.
@@ -68,7 +69,8 @@ export {
 
 	## Inform the remote Bro instance that it's configuration may have been updated.
 	global configuration_update_request: event();
-	## This event is a wrapper and alias for the :bro:id:`configuration_update_request` event.
+	## This event is a wrapper and alias for the
+	## :bro:id:`Control::configuration_update_request` event.
 	## This event is also a primary hooking point for the control framework.
 	global configuration_update: event();
 	## Message in response to a configuration update request.

scripts/base/frameworks/intel/main.bro

@@ -76,8 +76,8 @@ export {
 		and_tags:    set[string] &optional; 
 		
 		## The predicate can be given when searching for a match.  It will
-		## be tested against every :bro:type:`MetaData` item associated with 
-		## the data being matched on.  If it returns T a single time, the 
+		## be tested against every :bro:type:`Intel::MetaData` item associated
+		## with the data being matched on.  If it returns T a single time, the 
 		## matcher will consider that the item has matched.
 		pred:    function(meta: Intel::MetaData): bool &optional;
 	};

scripts/base/frameworks/metrics/cluster.bro

@@ -40,12 +40,12 @@ export {
 	global cluster_index_request: event(uid: string, id: ID, filter_name: string, index: Index);
 
 	## This event is sent by nodes in response to a 
-	## :bro:id:`cluster_index_request` event.
+	## :bro:id:`Metrics::cluster_index_request` event.
 	global cluster_index_response: event(uid: string, id: ID, filter_name: string, index: Index, val: count);
 
 	## This is sent by workers to indicate that they crossed the percent of the 
 	## current threshold by the percentage defined globally in 
-	## :bro:id:`cluster_request_global_view_percent`
+	## :bro:id:`Metrics::cluster_request_global_view_percent`
 	global cluster_index_intermediate_response: event(id: Metrics::ID, filter_name: string, index: Metrics::Index, val: count);
 
 	## This event is scheduled internally on workers to send result chunks.

scripts/base/frameworks/metrics/main.bro

@@ -86,6 +86,8 @@ export {
 		## threshold in every break interval.
 		notice_freq:       interval                &optional;
 	};
+
+	type MetricTable: table[Index] of count &default=0;
 	
 	global add_filter: function(id: ID, filter: Filter);
 	global add_data: function(id: ID, index: Index, increment: count);
@@ -105,7 +107,6 @@ redef record Notice::Info += {
 global metric_filters: table[ID] of vector of Filter = table();
 global filter_store: table[ID, string] of Filter = table();
 
-type MetricTable: table[Index] of count &default=0;
 # This is indexed by metric ID and stream filter name.
 global store: table[ID, string] of MetricTable = table() &default=table();
 

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

@@ -11,8 +11,8 @@ module Notice;
 export {
 	redef enum Action += {
 		## Indicate that the generated email should be addressed to the 
-		## appropriate email addresses as found in the 
-		## :bro:id:`Site::addr_to_emails` variable based on the relevant 
+		## appropriate email addresses as found by the
+		## :bro:id:`Site::get_emails` function based on the relevant 
 		## address or addresses indicated in the notice.
 		ACTION_EMAIL_ADMIN
 	};

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

@@ -7,7 +7,7 @@ module Notice;
 export {
 	redef enum Action += {
 		## Indicates that the notice should be sent to the pager email address
-		## configured in the :bro:id:`mail_page_dest` variable.
+		## configured in the :bro:id:`Notice::mail_page_dest` variable.
 		ACTION_PAGE
 	};
 	

scripts/base/frameworks/software/main.bro

@@ -81,9 +81,9 @@ export {
 	global cmp_versions: function(v1: Version, v2: Version): int;
 	
 	## This type represents a set of software.  It's used by the 
-	## :bro:id:`tracked` variable to store all known pieces of software
-	## for a particular host.  It's indexed with the name of a piece of 
-	## software such as "Firefox" and it yields a 
+	## :bro:id:`Software::tracked` variable to store all known pieces of
+	## software for a particular host.  It's indexed with the name of a piece
+	## of software such as "Firefox" and it yields a 
 	## :bro:type:`Software::Info` record with more information about the 
 	## software.
 	type SoftwareSet: table[string] of Info;

scripts/base/init-bare.bro

@@ -75,7 +75,7 @@ type conn_id: record {
 } &log;
 
 ## Specifics about an ICMP conversation. ICMP events typically pass this in
-## addition to :bro:id:`conn_id`.
+## addition to :bro:type:`conn_id`.
 ##
 ## .. bro:see:: icmp_echo_reply icmp_echo_request icmp_redirect icmp_sent
 ##    icmp_time_exceeded icmp_unreachable
@@ -331,7 +331,7 @@ type script_id: record {
 	exported: bool;	##< True if the identifier is exported.
 	constant: bool;	##< True if the identifier is a constant.
 	enum_constant: bool;	##< True if the identifier is an enum value.
-	redefinable: bool;	##< True if the identifier is declared with the :bro:attr:`redef` attribute.
+	redefinable: bool;	##< True if the identifier is declared with the :bro:attr:`&redef` attribute.
 	value: any &optional;	##< The current value of the identifier.
 };
 
@@ -350,11 +350,11 @@ type id_table: table[string] of script_id;
 ## .. bro:see:: record_fields record_field_table
 type record_field: record {
 	type_name: string;	##< The name of the field's type.
-	log: bool;	##< True of the field is declared with :bro:attr:`log` attribute.
+	log: bool;	##< True of the field is declared with :bro:attr:`&log` attribute.
 	## The current value of the field in the record instance passed into
 	## :bro:see:`record_fields` (if it has one).
 	value: any &optional;
-	default_val: any &optional;	##< The value of the :bro:attr:`default` attribute if defined.
+	default_val: any &optional;	##< The value of the :bro:attr:`&default` attribute if defined.
 };
 
 ## Table type used to map record field declarations to meta-information describing
@@ -384,9 +384,10 @@ type record_field_table: table[string] of record_field;
 global capture_filters: table[string] of string &redef;
 
 ## Set of BPF filters to restrict capturing, indexed by a user-definable ID (which
-## must be unique). If Bro is *not* configured to examine :bro:id:`all_packets`,
-## only packets matching *all* of the filters in this table (and
-## any in :bro:id:`capture_filters`) will be analyzed.
+## must be unique). If Bro is *not* configured to examine
+## :bro:id:`PacketFilter::all_packets`, only packets matching *all* of the
+## filters in this table (and any in :bro:id:`capture_filters`) will be
+## analyzed.
 ##
 ## .. bro:see:: PacketFilter PacketFilter::all_packets
 ##    PacketFilter::unrestricted_filter capture_filters
@@ -555,7 +556,7 @@ global log_file_name: function(tag: string): string &redef;
 global open_log_file: function(tag: string): file &redef;
 
 ## Specifies a directory for Bro store its persistent state. All globals can
-## be declared persistent via the :bro:attr:`persistent` attribute.
+## be declared persistent via the :bro:attr:`&persistent` attribute.
 const state_dir = ".state" &redef;
 
 ## Length of the delays inserted when storing state incrementally. To avoid

scripts/base/protocols/irc/main.bro

@@ -1,8 +1,8 @@
 ##! This is the script that implements the core IRC analysis support.  It only
 ##! logs a very limited subset of the IRC protocol by default.  The points
 ##! that it logs at are NICK commands, USER commands, and JOIN commands.  It 
-##! log various bits of meta data as indicated in the :bro:type:`Info` record
-##! along with the command at the command arguments.
+##! log various bits of meta data as indicated in the :bro:type:`IRC::Info`
+##! record along with the command at the command arguments.
 
 module IRC;
 

scripts/base/utils/site.bro

@@ -18,7 +18,7 @@ export {
 	const local_nets: set[subnet] &redef;
 	
 	## This is used for retrieving the subnet when you multiple 
-	## :bro:id:`local_nets`.  A membership query can be done with an 
+	## :bro:id:`Site::local_nets`.  A membership query can be done with an 
 	## :bro:type:`addr` and the table will yield the subnet it was found 
 	## within.
 	global local_nets_table: table[subnet] of subnet = {};