diff --git a/scripts/base/frameworks/notice/main.bro b/scripts/base/frameworks/notice/main.bro
index 7fb8d6df77..e9b29e7392 100644
--- a/scripts/base/frameworks/notice/main.bro
+++ b/scripts/base/frameworks/notice/main.bro
@@ -78,7 +78,7 @@ export {
 		## or p is specified.
 		proto:          transport_proto &log &optional;
 
-		## The :bro:enum:`Notice::Type` of the notice.
+		## The :bro:type:`Notice::Type` of the notice.
 		note:           Type           &log;
 		## The human readable message for the notice.
 		msg:            string         &log &optional;
diff --git a/scripts/base/protocols/ssl/consts.bro b/scripts/base/protocols/ssl/consts.bro
index e15a8f169a..9d16ab18ba 100644
--- a/scripts/base/protocols/ssl/consts.bro
+++ b/scripts/base/protocols/ssl/consts.bro
@@ -59,8 +59,8 @@ export {
 	
 	## Mapping between numeric codes and human readable strings for SSL/TLS
 	## extensions.
-	## ..note: More information can be found here:
-	##         http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xml
+	# More information can be found here:
+	# http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xml
 	const extensions: table[count] of string = {
 		[0] = "server_name",
 		[1] = "max_fragment_length",
@@ -82,7 +82,7 @@ export {
 		[65281] = "renegotiation_info"
 	} &default=function(i: count):string { return fmt("unknown-%d", i); };
 	
-	## SSLv2
+	# SSLv2
 	const SSLv20_CK_RC4_128_WITH_MD5 = 0x010080;
 	const SSLv20_CK_RC4_128_EXPORT40_WITH_MD5 = 0x020080;
 	const SSLv20_CK_RC2_128_CBC_WITH_MD5 = 0x030080;
@@ -91,7 +91,7 @@ export {
 	const SSLv20_CK_DES_64_CBC_WITH_MD5 = 0x060040;
 	const SSLv20_CK_DES_192_EDE3_CBC_WITH_MD5 = 0x0700C0;
 
-	## TLS
+	# TLS
 	const TLS_NULL_WITH_NULL_NULL = 0x0000;
 	const TLS_RSA_WITH_NULL_MD5 = 0x0001;
 	const TLS_RSA_WITH_NULL_SHA = 0x0002;
@@ -313,7 +313,6 @@ export {
 	## detecting unknown ciphers and for converting the cipher spec constants 
 	## into a human readable format.
 	const cipher_desc: table[count] of string = {
-		# --- sslv20 ---
 		[SSLv20_CK_RC4_128_EXPORT40_WITH_MD5] =
 			"SSLv20_CK_RC4_128_EXPORT40_WITH_MD5",
 		[SSLv20_CK_RC4_128_WITH_MD5] = "SSLv20_CK_RC4_128_WITH_MD5",
@@ -325,7 +324,6 @@ export {
 			"SSLv20_CK_DES_192_EDE3_CBC_WITH_MD5",
 		[SSLv20_CK_DES_64_CBC_WITH_MD5] = "SSLv20_CK_DES_64_CBC_WITH_MD5",
 
-		# --- TLS ---
 		[TLS_NULL_WITH_NULL_NULL] = "TLS_NULL_WITH_NULL_NULL",
 		[TLS_RSA_WITH_NULL_MD5] = "TLS_RSA_WITH_NULL_MD5",
 		[TLS_RSA_WITH_NULL_SHA] = "TLS_RSA_WITH_NULL_SHA",