diff --git a/src/sbbs3/js_bbs.cpp b/src/sbbs3/js_bbs.cpp
index 6570e5d669eddd90a834ab7533b992799fbb30dd..df23fd0b99da05852c6d90f5c2b3a23223bfd01f 100644
--- a/src/sbbs3/js_bbs.cpp
+++ b/src/sbbs3/js_bbs.cpp
@@ -156,8 +156,8 @@ enum {
 
 #ifdef BUILD_JSDOCS
 	static const char* bbs_prop_desc[] = {
-	 "System status bitfield (see <tt>SS_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions)"
-	,"Startup options bitfield (see <tt>BBS_OPT_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions)"
+	 "System status bit-flags (see <tt>SS_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions)"
+	,"Startup options bit-flags (see <tt>BBS_OPT_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions)"
 	,"Answer time, in <i>time_t</i> format"
 	,"Logon time, in <i>time_t</i> format"
 	,"Time from which user's time left is calculated, in <i>time_t</i> format"
@@ -172,7 +172,7 @@ enum {
 	,"Last node number (of this instance of Synchronet)"
 
 	,"Current node number"
-	,"Current node settings bitfield (see <tt>NM_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions)"
+	,"Current node settings bit-flags (see <tt>NM_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions)"
 	,"Current node status value (see <tt>nodedefs.js</tt> for valid values)"
 	,"Current node error counter"
 	,"Current node action (see <tt>nodedefs.js</tt> for valid values)"
@@ -4594,7 +4594,7 @@ static jsSyncMethodSpec js_bbs_functions[] = {
 	{"list_files",		js_listfiles,		1,	JSTYPE_NUMBER,	JSDOCSTR("[directory=<i>current</i>] [,filespec=<tt>\"*.*\"</tt> or search_string] [,mode=<tt>FL_NONE</tt>]")
 	,JSDOCSTR("List files in the specified file directory, "
 		"optionally specifying a file specification (wildcards) or a description search string, "
-		"and <i>mode</i> (bitfield)")
+		"and <i>mode</i> (bit-flags)")
 	,310
 	},
 	{"list_file_info",	js_listfileinfo,	1,	JSTYPE_NUMBER,	JSDOCSTR("[directory=<i>current</i>] [,filespec=<tt>\"*.*\"</tt>] [,mode=<tt>FI_INFO</tt>]")
@@ -4603,7 +4603,7 @@ static jsSyncMethodSpec js_bbs_functions[] = {
 	},
 	{"post_msg",		js_post_msg,		1,	JSTYPE_BOOLEAN,	JSDOCSTR("[sub-board=<i>current</i>] [,mode=<tt>WM_NONE</tt>] [,object reply_header]")
 	,JSDOCSTR("Post a message in the specified message sub-board (number or internal code) "
-		"with optional <i>mode</i> (bitfield)<br>"
+		"with optional <i>mode</i> (bit-flags)<br>"
 		"If <i>reply_header</i> is specified (a header object returned from <i>MsgBase.get_msg_header()</i>), that header "
 		"will be used for the in-reply-to header fields.")
 	,313
@@ -4617,7 +4617,7 @@ static jsSyncMethodSpec js_bbs_functions[] = {
 	,31802
 	},
 	{"show_msg",		js_show_msg,		1,	JSTYPE_BOOLEAN,	JSDOCSTR("object header [,mode=<tt>P_NONE</tt>] ")
-	,JSDOCSTR("Show a message's header and body (text) with optional print <i>mode</i> (bitfield)<br>"
+	,JSDOCSTR("Show a message's header and body (text) with optional print <i>mode</i> (bit-flags)<br>"
 		"<i>header</i> must be a header object returned from <i>MsgBase.get_msg_header()</i>)")
 	,31702
 	},
diff --git a/src/sbbs3/js_file_area.c b/src/sbbs3/js_file_area.c
index 5df2bccee8e4f155f681fee8a505b13f164c3e47..53e12cb6b538e5d93f1a315177baaf06f4805504 100644
--- a/src/sbbs3/js_file_area.c
+++ b/src/sbbs3/js_file_area.c
@@ -26,7 +26,7 @@
 
 static char* file_area_prop_desc[] = {
 	 "Minimum amount of available disk space (in bytes) required for user uploads to be allowed"
-	,"File area settings (bitfield) - see <tt>FM_*</tt> in <tt>sbbsdefs.js</tt> for details"
+	,"File area settings (bit-flags) - see <tt>FM_*</tt> in <tt>sbbsdefs.js</tt> for details"
 	,"Web file virtual path prefix <i>(introduced in v3.19c)</i>"
 	,NULL
 };
@@ -63,7 +63,7 @@ static char* dir_prop_desc[] = {
 	,"Allowed file extensions (comma delimited)"
 	,"Upload semaphore file"
 	,"Directory data storage location"
-	,"Toggle options (bitfield)"
+	,"Toggle options (bit-flags)"
 	,"Sequential (slow storage) device number"
 	,"Sort order (see <tt>FileBase.SORT</tt> for valid values)"
 	,"Configured maximum number of files"
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 797e0a1b62108709c57662b793a9d5ffd81d9a68..0c685455e3f9bfef2dcd546a0f22623a3335ac80 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -5055,7 +5055,7 @@ static jsSyncMethodSpec js_global_functions[] = {
 	{"directory",		js_directory,		1,	JSTYPE_ARRAY,	JSDOCSTR("path/pattern [,flags=<tt>GLOB_MARK</tt>]")
 	,JSDOCSTR("Returns an array of directory entries, "
 		"<i>pattern</i> is the path and filename or wildcards to search for (e.g. '/subdir/*.txt'), "
-		"<i>flags</i> is a bitfield of optional <tt>glob</tt> flags (default is <tt>GLOB_MARK</tt>)")
+		"<i>flags</i> is a set of optional <tt>glob</tt> bit-flags (default is <tt>GLOB_MARK</tt>)")
 	,310
 	},
 	{"dir_freespace",	js_freediskspace,	2,	JSTYPE_NUMBER,	JSDOCSTR("directory [,unit_size=<tt>1</tt>]")
diff --git a/src/sbbs3/js_msg_area.c b/src/sbbs3/js_msg_area.c
index 5eaa4e4db36630869c0d637b39466e20b879ca56..bc9f087e5bd764d72fedd59a59de422d21592c4a 100644
--- a/src/sbbs3/js_msg_area.c
+++ b/src/sbbs3/js_msg_area.c
@@ -26,9 +26,9 @@
 #ifdef BUILD_JSDOCS
 
 static char* msg_area_prop_desc[] = {
-	  "Message area settings (bitfield) - see <tt>MM_*</tt> in <tt>sbbsdefs.js</tt> for details"
-	 ,"FidoNet NetMail settings (bitfield) - see <tt>NMAIL_*</tt> in <tt>sbbsdefs.js</tt> for details"
-	 ,"Internet NetMail settings (bitfield) - see <tt>NMAIL_*</tt> in <tt>sbbsdefs.js</tt> for details"
+	  "Message area settings (bit-flags) - see <tt>MM_*</tt> in <tt>sbbsdefs.js</tt> for details"
+	 ,"FidoNet NetMail settings (bit-flags) - see <tt>NMAIL_*</tt> in <tt>sbbsdefs.js</tt> for details"
+	 ,"Internet NetMail settings (bit-flags) - see <tt>NMAIL_*</tt> in <tt>sbbsdefs.js</tt> for details"
 	,NULL
 };
 
@@ -65,7 +65,7 @@ static char* msg_sub_prop_desc[] = {
 	,"FidoNet node address"
 	,"FidoNet origin line"
 	,"QWK Network tagline"
-	,"Toggle options (bitfield) - see <tt>SUB_*</tt> in <tt>sbbsdefs.js</tt> for details"
+	,"Toggle options (bit-flags) - see <tt>SUB_*</tt> in <tt>sbbsdefs.js</tt> for details"
 	,"Index into message scan configuration/pointer file"
 	,"QWK conference number"
 	,"Configured maximum number of message CRCs to store (for dupe checking)"
@@ -80,7 +80,7 @@ static char* msg_sub_prop_desc[] = {
 	,"User has operator access to this sub-board"
 	,"User's posts are moderated"
 	,"User's current new message scan pointer (highest-read message number)"
-	,"User's message scan configuration (bitfield) - see <tt>SCAN_CFG_*</tt> in <tt>sbbsdefs.js</tt> for details"
+	,"User's message scan configuration (bit-flags) - see <tt>SCAN_CFG_*</tt> in <tt>sbbsdefs.js</tt> for details"
 	,"User's last-read message number"
 	,"Number of messages currently posted to this sub-board <i>(introduced in v3.18c)</i>"
 	,NULL
diff --git a/src/sbbs3/js_msgbase.c b/src/sbbs3/js_msgbase.c
index 1eca0b08dca126336be2b23f43492ecde0410d47..fc96fa2218cead173476dafc0ecc4a2f672add1b 100644
--- a/src/sbbs3/js_msgbase.c
+++ b/src/sbbs3/js_msgbase.c
@@ -3149,7 +3149,7 @@ static jsSyncMethodSpec js_msgbase_functions[] = {
 	,JSDOCSTR("Returns a specific message index record, <i>null</i> on failure. "
 	"The index object will contain the following properties:<br>"
 	"<table>"
-	"<tr><td align=top><tt>attr</tt><td>Attribute bitfield"
+	"<tr><td align=top><tt>attr</tt><td>Attribute bit-flags"
 	"<tr><td align=top><tt>time</tt><td>Date/time imported (in time_t format)"
 	"<tr><td align=top><tt>number</tt><td>Message number"
 	"<tr><td align=top><tt>offset</tt><td>Record number in index file"
@@ -3228,9 +3228,9 @@ static jsSyncMethodSpec js_msgbase_functions[] = {
 	"<tr><td align=top><tt>ftn_tid</tt><td>FidoNet FSC-46 Tosser Identifier"
 	"<tr><td align=top><tt>ftn_charset</tt><td>FidoNet FTS-5003 Character Set Identifier"
 	"<tr><td align=top><tt>date</tt><td>RFC-822 formatted date/time"
-	"<tr><td align=top><tt>attr</tt><td>Attribute bitfield"
-	"<tr><td align=top><tt>auxattr</tt><td>Auxillary attribute bitfield"
-	"<tr><td align=top><tt>netattr</tt><td>Network attribute bitfield"
+	"<tr><td align=top><tt>attr</tt><td>Attribute bit-flags"
+	"<tr><td align=top><tt>auxattr</tt><td>Auxiliary attribute bit-flags"
+	"<tr><td align=top><tt>netattr</tt><td>Network attribute bit-flags"
 	"<tr><td align=top><tt>when_written_time</tt><td>Date/time (in time_t format)"
 	"<tr><td align=top><tt>when_written_zone</tt><td>Time zone (in SMB format)"
 	"<tr><td align=top><tt>when_written_zone_offset</tt><td>Time zone in minutes east of UTC"
diff --git a/src/sbbs3/js_user.c b/src/sbbs3/js_user.c
index 133729e67c5d49577d0ba0d5e5e26bfd00db813b..d4f59ce6a0c4a9b8c7ad1943fe96f95a97157adb 100644
--- a/src/sbbs3/js_user.c
+++ b/src/sbbs3/js_user.c
@@ -867,10 +867,10 @@ static char* user_prop_desc[] = {
 	,"Current/last external program (internal code) run"
 	,"External message editor (internal code) or <i>blank</i> if none"
 	,"Command shell (internal code)"
-	,"Settings bitfield - see <tt>USER_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
-	,"QWK packet settings bitfield - see <tt>QWK_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
-	,"Chat settings bitfield - see <tt>CHAT_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
-	,"Mail settings bitfield - see <tt>MAIL_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
+	,"Settings bit-flags - see <tt>USER_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
+	,"QWK packet settings bit-flags - see <tt>QWK_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
+	,"Chat settings bit-flags - see <tt>CHAT_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
+	,"Mail settings bit-flags - see <tt>MAIL_*</tt> in <tt>sbbsdefs.js</tt> for bit definitions"
 	,"Temporary file type (extension)"
 	,"New file scan date/time (time_t format)"
 	,"File transfer protocol (command key)"
@@ -909,12 +909,12 @@ static char* user_security_prop_desc[] = {
 	 "Password"
 	,"Date password last modified (time_t format)"
 	,"Security level (0-99)"
-	,"Flag set #1 (bitfield) can use +/-[A-?] notation"
-	,"Flag set #2 (bitfield) can use +/-[A-?] notation"
-	,"Flag set #3 (bitfield) can use +/-[A-?] notation"
-	,"Flag set #4 (bitfield) can use +/-[A-?] notation"
-	,"Exemption flags (bitfield) can use +/-[A-?] notation"
-	,"Restriction flags (bitfield) can use +/-[A-?] notation"
+	,"Flag set #1 (bit-flags) can use +/-[A-?] notation"
+	,"Flag set #2 (bit-flags) can use +/-[A-?] notation"
+	,"Flag set #3 (bit-flags) can use +/-[A-?] notation"
+	,"Flag set #4 (bit-flags) can use +/-[A-?] notation"
+	,"Exemption flags (bit-flags) can use +/-[A-?] notation"
+	,"Restriction flags (bit-flags) can use +/-[A-?] notation"
 	,"Credits"
 	,"Free credits (for today only)"
 	,"Extra minutes (time bank)"
diff --git a/src/sbbs3/js_xtrn_area.c b/src/sbbs3/js_xtrn_area.c
index b86d6f755ffcca03a41743ba46737628650c9e74..49ed22a93ec26667deaf28b249de0b21bfb11ca9 100644
--- a/src/sbbs3/js_xtrn_area.c
+++ b/src/sbbs3/js_xtrn_area.c
@@ -50,7 +50,7 @@ static char* xtrn_prog_prop_desc[] = {
 	,"Startup directory"
 	,"Access requirements"
 	,"Execution requirements"
-	,"Toggle options (bitfield)"
+	,"Toggle options (bit-flags)"
 	,"Drop file type"
 	,"Event type (0=none)"
 	,"Extra time given to users running this program"
@@ -69,13 +69,13 @@ static char* event_prop_desc[] = {
 	,"Node number"
 	,"Time to execute (minutes since midnight)"
 	,"Frequency to execute"
-	,"Days of week to execute (bitfield)"
-	,"Days of month to execute (bitfield)"
-	,"Months of year to execute (bitfield)"
+	,"Days of week to execute (bit-flags)"
+	,"Days of month to execute (bit-flags)"
+	,"Months of year to execute (bit-flags)"
 	,"Date/time of last run (in time_t format)"
 	,"Date/time of next run (in time_t format)"
 	,"Error log level"
-	,"Toggle options (bitfield)"
+	,"Toggle options (bit-flags)"
 	,NULL
 };
 
@@ -84,7 +84,7 @@ static char* xedit_prop_desc[] = {
 	 "Name"
 	,"Command-line"
 	,"Access requirements"
-	,"Toggle options (bitfield)"
+	,"Toggle options (bit-flags)"
 	,"Drop file type"
 	,NULL
 };